httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1004734 - in /httpd/httpd/branches/2.2.x: Apache.dsw CHANGES Makefile.win build/installwinconf.awk modules/proxy/mod_proxy_scgi.dsp os/win32/BaseAddr.ref
Date Tue, 05 Oct 2010 17:49:41 GMT
Author: wrowe
Date: Tue Oct  5 17:49:41 2010
New Revision: 1004734

URL: http://svn.apache.org/viewvc?rev=1004734&view=rev
Log:
This really didn't need a backport vote per say, is already built 
for other platforms, and for Windows in trunk.

mod_proxy_scgi: Add module to build on Windows.

Submitted by: rjung
Reviewed by: wrowe


Added:
    httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_scgi.dsp   (with props)
Modified:
    httpd/httpd/branches/2.2.x/Apache.dsw
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/Makefile.win
    httpd/httpd/branches/2.2.x/build/installwinconf.awk
    httpd/httpd/branches/2.2.x/os/win32/BaseAddr.ref

Modified: httpd/httpd/branches/2.2.x/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/Apache.dsw?rev=1004734&r1=1004733&r2=1004734&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/Apache.dsw (original)
+++ httpd/httpd/branches/2.2.x/Apache.dsw Tue Oct  5 17:49:41 2010
@@ -249,6 +249,9 @@ Package=<4>
     Project_Dep_Name mod_proxy_http
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_proxy_scgi
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_reqtimeout
     End Project Dependency
     Begin Project Dependency
@@ -2184,6 +2187,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_proxy_scgi"=.\modules\proxy\mod_proxy_scgi.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_reqtimeout"=.\modules\filters\mod_reqtimeout.dsp - Package Owner=<4>
 
 Package=<5>

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1004734&r1=1004733&r2=1004734&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Oct  5 17:49:41 2010
@@ -10,6 +10,11 @@ Changes with Apache 2.2.17
   *) mod_headers: Enable multi-match-and-replace edit option
      PR 46594 [Nick Kew]
 
+  *) mod_reqtimeout: Do not wrongly enforce timeouts for mod_proxy's backend
+     connections and other protocol handlers (like mod_ftp). Enforce the
+     timeout for AP_MODE_GETLINE. If there is a timeout, shorten the lingering
+     close time from 30 to 2 seconds. [Stefan Fritsch]
+
   *) mod_log_config: Make ${cookie}C correctly match whole cookie names
      instead of substrings. PR 28037. [Dan Franklin <dan dan-franklin.com>,
      Stefan Fritsch]

Modified: httpd/httpd/branches/2.2.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/Makefile.win?rev=1004734&r1=1004733&r2=1004734&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/Makefile.win (original)
+++ httpd/httpd/branches/2.2.x/Makefile.win Tue Oct  5 17:49:41 2010
@@ -403,6 +403,7 @@ _build:
 	 $(MAKE) $(MAKEOPT) -f mod_proxy_connect.mak CFG="mod_proxy_connect - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_proxy_ftp.mak   CFG="mod_proxy_ftp - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_proxy_http.mak  CFG="mod_proxy_http - Win32 $(LONG)" RECURSE=0
$(CTARGET)
+	 $(MAKE) $(MAKEOPT) -f mod_proxy_scgi.mak  CFG="mod_proxy_scgi - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	cd ..\..
 !IF EXIST("srclib\openssl")
 	cd modules\ssl
@@ -580,6 +581,7 @@ _copybin:
 	copy modules\proxy\$(LONG)\mod_proxy_connect.$(src_so) 	"$(inst_so)" <.y
 	copy modules\proxy\$(LONG)\mod_proxy_ftp.$(src_so) 	"$(inst_so)" <.y
 	copy modules\proxy\$(LONG)\mod_proxy_http.$(src_so) 	"$(inst_so)" <.y
+	copy modules\proxy\$(LONG)\mod_proxy_scgi.$(src_so) 	"$(inst_so)" <.y
 !IF EXIST("srclib\openssl")
 	copy modules\ssl\$(LONG)\mod_ssl.$(src_so) 		"$(inst_so)" <.y
 	-copy srclib\openssl\$(SSLBIN)\libeay32.$(src_dll) 	"$(inst_dll)" <.y

Modified: httpd/httpd/branches/2.2.x/build/installwinconf.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/installwinconf.awk?rev=1004734&r1=1004733&r2=1004734&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/installwinconf.awk (original)
+++ httpd/httpd/branches/2.2.x/build/installwinconf.awk Tue Oct  5 17:49:41 2010
@@ -147,6 +147,7 @@ BEGIN { 
 	  print "#LoadModule proxy_connect_module modules/mod_proxy_connect.so" > dstfl;
 	  print "#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so" > dstfl;
 	  print "#LoadModule proxy_http_module modules/mod_proxy_http.so" > dstfl;
+	  print "#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so" > dstfl;
 	  print "#LoadModule reqtimeout_module modules/mod_reqtimeout.so" > dstfl;
 	  print "#LoadModule rewrite_module modules/mod_rewrite.so" > dstfl;
 	  print "LoadModule setenvif_module modules/mod_setenvif.so" > dstfl;

Added: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_scgi.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_scgi.dsp?rev=1004734&view=auto
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_scgi.dsp (added)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_scgi.dsp Tue Oct  5 17:49:41 2010
@@ -0,0 +1,123 @@
+# Microsoft Developer Studio Project File - Name="mod_proxy_scgi" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=mod_proxy_scgi - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mod_proxy_scgi.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mod_proxy_scgi.mak" CFG="mod_proxy_scgi - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mod_proxy_scgi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_proxy_scgi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mod_proxy_scgi - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I
"../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_proxy_scgi_src"
/FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/mod_proxy_scgi.res" /i "../../include" /i "../../srclib/apr/include"
/d "NDEBUG" /d BIN_NAME="mod_proxy_scgi.so" /d LONG_NAME="proxy_scgi_module for Apache"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /out:".\Release\mod_proxy_scgi.so"
/base:@..\..\os\win32\BaseAddr.ref,mod_proxy_scgi.so
+# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no
/debug /out:".\Release\mod_proxy_scgi.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_scgi.so
/opt:ref
+# Begin Special Build Tool
+TargetPath=.\Release\mod_proxy_scgi.so
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "mod_proxy_scgi - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../../srclib/apr/include"
/I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_proxy_scgi_src"
/FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"Debug/mod_proxy_scgi.res" /i "../../include" /i "../../srclib/apr/include"
/d "_DEBUG" /d BIN_NAME="mod_proxy_scgi.so" /d LONG_NAME="proxy_scgi_module for Apache"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no
/debug /out:".\Debug\mod_proxy_scgi.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_scgi.so
+# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no
/debug /out:".\Debug\mod_proxy_scgi.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_scgi.so
+# Begin Special Build Tool
+TargetPath=.\Debug\mod_proxy_scgi.so
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mod_proxy_scgi - Win32 Release"
+# Name "mod_proxy_scgi - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=.\mod_proxy_scgi.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ".h"
+# Begin Source File
+
+SOURCE=.\mod_proxy.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\build\win32\httpd.rc
+# End Source File
+# End Target
+# End Project

Propchange: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_scgi.dsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: httpd/httpd/branches/2.2.x/os/win32/BaseAddr.ref
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/os/win32/BaseAddr.ref?rev=1004734&r1=1004733&r2=1004734&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/os/win32/BaseAddr.ref (original)
+++ httpd/httpd/branches/2.2.x/os/win32/BaseAddr.ref Tue Oct  5 17:49:41 2010
@@ -82,3 +82,4 @@ mod_filter.so           0x6F9A0000    0x
 mod_dav_lock.so         0x6F990000    0x00010000
 mod_substitute.so       0x6F980000    0x00010000
 mod_reqtimeout.so       0x6F970000    0x00010000
+mod_proxy_scgi.so       0x6F960000    0x00010000



Mime
View raw message