Follow our Unix bretherens' conventions, and name the sub-proxy modules

  with the mod_ prefix (al la mod_dav_fs as a sub-dav module.)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92876 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache.dsw b/Apache.dsw
index afd4d190532d9b0f7bf6cd298ecae90b9af247e0..e8a335f113a9875fca53f7d81e9cd62e517d20d6 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -117,13 +117,13 @@ Package=<4>
     Project_Dep_Name mod_vhost_alias
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name proxy_connect
+    Project_Dep_Name mod_proxy_connect
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name proxy_ftp
+    Project_Dep_Name mod_proxy_ftp
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name proxy_http
+    Project_Dep_Name mod_proxy_http
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name ab
@@ -1192,7 +1192,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "proxy_connect"=".\modules\proxy\proxy_connect.dsp" - Package Owner=<4>
+Project: "mod_proxy_connect"=".\modules\proxy\mod_proxy_connect.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1216,7 +1216,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "proxy_ftp"=".\modules\proxy\proxy_ftp.dsp" - Package Owner=<4>
+Project: "mod_proxy_ftp"=".\modules\proxy\mod_proxy_ftp.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1240,7 +1240,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "proxy_http"=".\modules\proxy\proxy_http.dsp" - Package Owner=<4>
+Project: "mod_proxy_http"=".\modules\proxy\mod_proxy_http.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{

diff --git a/Makefile.win b/Makefile.win
index 56113011a03cec969db7afb10ad032a153c9f39d..522e2f785ace75dafd36b6c459c5a47a74d53cdc 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -213,9 +213,9 @@ _build:
        cd ..\..
        cd modules\proxy
         $(MAKE) $(MAKEOPT) -f mod_proxy.mak       CFG="mod_proxy - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f proxy_connect.mak   CFG="proxy_connect - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f proxy_ftp.mak       CFG="proxy_ftp - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f proxy_http.mak      CFG="proxy_http - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(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)
        cd ..\..
 !IF EXIST("srclib\openssl")
        cd modules\ssl
@@ -297,9 +297,9 @@ _build:
                "mod_userdir - Win32 $(LONG)"\
                "mod_usertrack - Win32 $(LONG)"\
                "mod_vhost_alias - Win32 $(LONG)"\
-               "proxy_connect - Win32 $(LONG)"\
-               "proxy_ftp - Win32 $(LONG)"\
-               "proxy_http - Win32 $(LONG)"\
+               "mod_proxy_connect - Win32 $(LONG)"\
+               "mod_proxy_ftp - Win32 $(LONG)"\
+               "mod_proxy_http - Win32 $(LONG)"\
                "ab - Win32 $(LONG)"\
                "htdbm - Win32 $(LONG)"\
                "htdigest - Win32 $(LONG)"\
@@ -388,9 +388,9 @@ _install:
        copy modules\metadata\$(LONG)\mod_unique_id.so "$(INSTDIR)\modules"
        copy modules\metadata\$(LONG)\mod_usertrack.so "$(INSTDIR)\modules"
        copy modules\proxy\$(LONG)\mod_proxy.so "$(INSTDIR)\modules"
-       copy modules\proxy\$(LONG)\proxy_connect.so "$(INSTDIR)\modules"
-       copy modules\proxy\$(LONG)\proxy_ftp.so "$(INSTDIR)\modules"
-       copy modules\proxy\$(LONG)\proxy_http.so "$(INSTDIR)\modules"
+       copy modules\proxy\$(LONG)\mod_proxy_connect.so "$(INSTDIR)\modules"
+       copy modules\proxy\$(LONG)\mod_proxy_ftp.so "$(INSTDIR)\modules"
+       copy modules\proxy\$(LONG)\mod_proxy_http.so "$(INSTDIR)\modules"
 !IF EXIST("srclib\openssl")
        -copy modules\ssl\$(LONG)\mod_ssl.so "$(INSTDIR)\modules"
        -copy srclib\openssl\$(SSLBIN)\openssl.exe "$(INSTDIR)\bin"

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 7697f4ec2aa6107f54f5ce2be44c3ff9c7bd3778..e3e7bdeb60b4760ff8d6cc34a14fa8b8c1d12343 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -155,9 +155,9 @@ LoadModule log_config_module modules/mod_log_config.so
 LoadModule mime_module modules/mod_mime.so
 #LoadModule mime_magic_module modules/mod_mime_magic.so
 #LoadModule proxy_module modules/mod_proxy.so
-#LoadModule proxy_connect_module modules/proxy_connect.so
-#LoadModule proxy_http_module modules/proxy_http.so
-#LoadModule proxy_ftp_module modules/proxy_ftp.so
+#LoadModule proxy_connect_module modules/mod_proxy_connect.so
+#LoadModule proxy_http_module modules/mod_proxy_http.so
+#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
 LoadModule negotiation_module modules/mod_negotiation.so
 #LoadModule rewrite_module modules/mod_rewrite.so
 LoadModule setenvif_module modules/mod_setenvif.so

diff --git a/modules/proxy/.cvsignore b/modules/proxy/.cvsignore
index 15511e830f934b93385cd48b1e6ee7e56f6ed351..b5f6aab78b60aacbf8a12920d232125edfab2224 100644 (file)
--- a/modules/proxy/.cvsignore
+++ b/modules/proxy/.cvsignore
@@ -6,6 +6,7 @@ Makefile
 *.slo
 *.la
 *.so
+*.rc
 modules.mk
 .deps
 .libs

diff --git a/modules/proxy/proxy_ftp.dsp b/modules/proxy/mod_proxy_connect.dsp
similarity index 65%
rename from modules/proxy/proxy_ftp.dsp
rename to modules/proxy/mod_proxy_connect.dsp
index 48fc8fb5c64c9be921acabc8c53b39eda62eb1cd..c6b9d5f650e2131680d58f5f1d979bbc96c3b7e4 100644 (file)
--- a/modules/proxy/proxy_ftp.dsp
+++ b/modules/proxy/mod_proxy_connect.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="proxy_ftp" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="mod_proxy_connect" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=proxy_ftp - Win32 Release
+CFG=mod_proxy_connect - 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 "proxy_ftp.mak".
+!MESSAGE NMAKE /f "mod_proxy_connect.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 "proxy_ftp.mak" CFG="proxy_ftp - Win32 Release"
+!MESSAGE NMAKE /f "mod_proxy_connect.mak" CFG="mod_proxy_connect - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "proxy_ftp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "proxy_ftp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_proxy_connect - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_proxy_connect - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "proxy_ftp - Win32 Release"
+!IF  "$(CFG)" == "mod_proxy_connect - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -43,7 +43,7 @@ RSC=rc.exe
 # 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 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\proxy_ftp" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_proxy_connect" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -52,10 +52,10 @@ 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 /map /machine:I386 /out:"Release/proxy_ftp.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_ftp
-# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/proxy_ftp.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_ftp
+# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_proxy_connect.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_connect
+# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_proxy_connect.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_connect
 
-!ELSEIF  "$(CFG)" == "proxy_ftp - Win32 Debug"
+!ELSEIF  "$(CFG)" == "mod_proxy_connect - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\proxy_ftp" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_proxy_connect" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -78,21 +78,21 @@ 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 /map /debug /machine:I386 /out:"Debug/proxy_ftp.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_ftp
-# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/proxy_ftp.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_ftp
+# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_proxy_connect.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_connect
+# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_proxy_connect.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_connect
 
 !ENDIF 
 
 # Begin Target
 
-# Name "proxy_ftp - Win32 Release"
-# Name "proxy_ftp - Win32 Debug"
+# Name "mod_proxy_connect - Win32 Release"
+# Name "mod_proxy_connect - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
 
-SOURCE=.\proxy_ftp.c
+SOURCE=.\proxy_connect.c
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -107,25 +107,25 @@ SOURCE=.\mod_proxy.h
 
 SOURCE=..\..\build\win32\win32ver.awk
 
-!IF  "$(CFG)" == "proxy_ftp - Win32 Release"
+!IF  "$(CFG)" == "mod_proxy_connect - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
 # Begin Custom Build - Creating Version Resource
 InputPath=..\..\build\win32\win32ver.awk
 
-".\proxy_ftp.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ../../build/win32/win32ver.awk proxy_ftp  "proxy_ftp_module for Apache" ../../include/ap_release.h > .\proxy_ftp.rc
+".\mod_proxy_connect.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       awk -f ../../build/win32/win32ver.awk mod_proxy_connect  "proxy_connect_module for Apache" ../../include/ap_release.h > .\mod_proxy_connect.rc
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "proxy_ftp - Win32 Debug"
+!ELSEIF  "$(CFG)" == "mod_proxy_connect - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
 # Begin Custom Build - Creating Version Resource
 InputPath=..\..\build\win32\win32ver.awk
 
-".\proxy_ftp.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ../../build/win32/win32ver.awk proxy_ftp  "proxy_ftp_module for Apache" ../../include/ap_release.h > .\proxy_ftp.rc
+".\mod_proxy_connect.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       awk -f ../../build/win32/win32ver.awk mod_proxy_connect  "proxy_connect_module for Apache" ../../include/ap_release.h > .\mod_proxy_connect.rc
 
 # End Custom Build
 

diff --git a/modules/proxy/proxy_connect.dsp b/modules/proxy/mod_proxy_ftp.dsp
similarity index 68%
rename from modules/proxy/proxy_connect.dsp
rename to modules/proxy/mod_proxy_ftp.dsp
index 812243096b280e334fc276d522128f764fff2d4d..9a232fbb4db03d265937a7f310e4c19a9123d964 100644 (file)
--- a/modules/proxy/proxy_connect.dsp
+++ b/modules/proxy/mod_proxy_ftp.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="proxy_connect" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="mod_proxy_ftp" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=proxy_connect - Win32 Release
+CFG=mod_proxy_ftp - 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 "proxy_connect.mak".
+!MESSAGE NMAKE /f "mod_proxy_ftp.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 "proxy_connect.mak" CFG="proxy_connect - Win32 Release"
+!MESSAGE NMAKE /f "mod_proxy_ftp.mak" CFG="mod_proxy_ftp - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "proxy_connect - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "proxy_connect - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_proxy_ftp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_proxy_ftp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "proxy_connect - Win32 Release"
+!IF  "$(CFG)" == "mod_proxy_ftp - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -43,7 +43,7 @@ RSC=rc.exe
 # 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 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\proxy_connect" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_proxy_ftp" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -52,10 +52,10 @@ 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 /map /machine:I386 /out:"Release/proxy_connect.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_connect
-# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/proxy_connect.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_connect
+# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_proxy_ftp.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_ftp
+# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_proxy_ftp.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_ftp
 
-!ELSEIF  "$(CFG)" == "proxy_connect - Win32 Debug"
+!ELSEIF  "$(CFG)" == "mod_proxy_ftp - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\proxy_connect" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_proxy_ftp" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -78,21 +78,21 @@ 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 /map /debug /machine:I386 /out:"Debug/proxy_connect.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_connect
-# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/proxy_connect.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_connect
+# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_proxy_ftp.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_ftp
+# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_proxy_ftp.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_ftp
 
 !ENDIF 
 
 # Begin Target
 
-# Name "proxy_connect - Win32 Release"
-# Name "proxy_connect - Win32 Debug"
+# Name "mod_proxy_ftp - Win32 Release"
+# Name "mod_proxy_ftp - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
 
-SOURCE=.\proxy_connect.c
+SOURCE=.\proxy_ftp.c
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -107,25 +107,25 @@ SOURCE=.\mod_proxy.h
 
 SOURCE=..\..\build\win32\win32ver.awk
 
-!IF  "$(CFG)" == "proxy_connect - Win32 Release"
+!IF  "$(CFG)" == "mod_proxy_ftp - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
 # Begin Custom Build - Creating Version Resource
 InputPath=..\..\build\win32\win32ver.awk
 
-".\proxy_connect.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ../../build/win32/win32ver.awk proxy_connect  "proxy_connect_module for Apache" ../../include/ap_release.h > .\proxy_connect.rc
+".\mod_proxy_ftp.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       awk -f ../../build/win32/win32ver.awk mod_proxy_ftp  "proxy_ftp_module for Apache" ../../include/ap_release.h > .\mod_proxy_ftp.rc
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "proxy_connect - Win32 Debug"
+!ELSEIF  "$(CFG)" == "mod_proxy_ftp - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
 # Begin Custom Build - Creating Version Resource
 InputPath=..\..\build\win32\win32ver.awk
 
-".\proxy_connect.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ../../build/win32/win32ver.awk proxy_connect  "proxy_connect_module for Apache" ../../include/ap_release.h > .\proxy_connect.rc
+".\mod_proxy_ftp.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       awk -f ../../build/win32/win32ver.awk mod_proxy_ftp  "proxy_ftp_module for Apache" ../../include/ap_release.h > .\mod_proxy_ftp.rc
 
 # End Custom Build
 

diff --git a/modules/proxy/proxy_http.dsp b/modules/proxy/mod_proxy_http.dsp
similarity index 67%
rename from modules/proxy/proxy_http.dsp
rename to modules/proxy/mod_proxy_http.dsp
index 3b4a6ebbd9c82684bf951a0d54f6c877f5c59cc8..8764b548ee518b734314567f723b6b6dbab401b4 100644 (file)
--- a/modules/proxy/proxy_http.dsp
+++ b/modules/proxy/mod_proxy_http.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="proxy_http" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="mod_proxy_http" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=proxy_http - Win32 Release
+CFG=mod_proxy_http - 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 "proxy_http.mak".
+!MESSAGE NMAKE /f "mod_proxy_http.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 "proxy_http.mak" CFG="proxy_http - Win32 Release"
+!MESSAGE NMAKE /f "mod_proxy_http.mak" CFG="mod_proxy_http - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "proxy_http - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "proxy_http - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_proxy_http - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_proxy_http - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "proxy_http - Win32 Release"
+!IF  "$(CFG)" == "mod_proxy_http - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -43,7 +43,7 @@ RSC=rc.exe
 # 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 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\proxy_http" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_proxy_http" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -52,10 +52,10 @@ 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 /map /machine:I386 /out:"Release/proxy_http.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_http
-# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/proxy_http.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_http
+# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_proxy_http.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_http
+# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_proxy_http.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_http
 
-!ELSEIF  "$(CFG)" == "proxy_http - Win32 Debug"
+!ELSEIF  "$(CFG)" == "mod_proxy_http - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\proxy_http" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_proxy_http" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -78,15 +78,15 @@ 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 /map /debug /machine:I386 /out:"Debug/proxy_http.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_http
-# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/proxy_http.so" /base:@..\..\os\win32\BaseAddr.ref,proxy_http
+# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_proxy_http.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_http
+# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_proxy_http.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_http
 
 !ENDIF 
 
 # Begin Target
 
-# Name "proxy_http - Win32 Release"
-# Name "proxy_http - Win32 Debug"
+# Name "mod_proxy_http - Win32 Release"
+# Name "mod_proxy_http - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -107,25 +107,25 @@ SOURCE=.\mod_proxy.h
 
 SOURCE=..\..\build\win32\win32ver.awk
 
-!IF  "$(CFG)" == "proxy_http - Win32 Release"
+!IF  "$(CFG)" == "mod_proxy_http - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
 # Begin Custom Build - Creating Version Resource
 InputPath=..\..\build\win32\win32ver.awk
 
-".\proxy_http.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ../../build/win32/win32ver.awk proxy_http  "proxy_http_module for Apache" ../../include/ap_release.h > .\proxy_http.rc
+".\mod_proxy_http.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       awk -f ../../build/win32/win32ver.awk mod_proxy_http  "proxy_http_module for Apache" ../../include/ap_release.h > .\mod_proxy_http.rc
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "proxy_http - Win32 Debug"
+!ELSEIF  "$(CFG)" == "mod_proxy_http - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
 # Begin Custom Build - Creating Version Resource
 InputPath=..\..\build\win32\win32ver.awk
 
-".\proxy_http.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ../../build/win32/win32ver.awk proxy_http  "proxy_http_module for Apache" ../../include/ap_release.h > .\proxy_http.rc
+".\mod_proxy_http.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       awk -f ../../build/win32/win32ver.awk mod_proxy_http  "proxy_http_module for Apache" ../../include/ap_release.h > .\mod_proxy_http.rc
 
 # End Custom Build
 

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 9ac5a266a770243dc6129913aaff4682fc12bc4e..bd79385883ebfd93db66501e2a7b2065170a4ccf 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -27,9 +27,9 @@ mod_mime_magic       0x6FDE0000    0x00010000
 mod_dav              0x6FDC0000    0x00020000
 mod_dav_fs           0x6FDB0000    0x00010000
 mod_proxy            0x6FDA0000    0x00010000
-proxy_connect        0x6FD90000    0x00010000
-proxy_ftp            0x6FD80000    0x00010000
-proxy_http           0x6FD70000    0x00010000
+mod_proxy_connect    0x6FD90000    0x00010000
+mod_proxy_ftp        0x6FD80000    0x00010000
+mod_proxy_http       0x6FD70000    0x00010000
 mod_ssl              0x6FD00000    0x00070000
 mod_access           0x6FCF0000    0x00010000
 mod_actions          0x6FCE0000    0x00010000