/home/cvs/httpd-2.0/ no longer tracks makefiles. But at least incorporate

  all the new proxy modules into BaseAddr.ref for win32.

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

diff --git a/modules/proxy/mod_proxy.mak b/modules/proxy/mod_proxy.mak
deleted file mode 100644 (file)
index 435796b..0000000
--- a/modules/proxy/mod_proxy.mak
+++ /dev/null
@@ -1,573 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on mod_proxy.dsp
-!IF "$(CFG)" == ""
-CFG=mod_proxy - Win32 Release
-!MESSAGE No configuration specified. Defaulting to mod_proxy - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "mod_proxy - Win32 Release" && "$(CFG)" !=\
- "mod_proxy - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!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.mak" CFG="mod_proxy - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mod_proxy - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_proxy - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "mod_proxy - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\mod_proxy.so"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Release" "libhttpd - Win32 Release"\
- "libapr - Win32 Release" "$(OUTDIR)\mod_proxy.so"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\
- "libaprutil - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-       -@erase "$(INTDIR)\mod_proxy.idb"
-       -@erase "$(INTDIR)\mod_proxy.obj"
-       -@erase "$(INTDIR)\proxy_connect.obj"
-       -@erase "$(INTDIR)\proxy_ftp.obj"
-       -@erase "$(INTDIR)\proxy_http.obj"
-       -@erase "$(INTDIR)\proxy_util.obj"
-       -@erase "$(OUTDIR)\mod_proxy.exp"
-       -@erase "$(OUTDIR)\mod_proxy.lib"
-       -@erase "$(OUTDIR)\mod_proxy.map"
-       -@erase "$(OUTDIR)\mod_proxy.so"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\srclib\apr\include" /I\
- "../../srclib/apr-util/include" /I "..\..\include" /I "..\..\os\win32" /D\
- "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD\
- /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" 
-BSC32_SBRS= \
-       
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows\
- /dll /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb"\
- /map:"$(INTDIR)\mod_proxy.map" /machine:I386 /out:"$(OUTDIR)\mod_proxy.so"\
- /implib:"$(OUTDIR)\mod_proxy.lib" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy 
-LINK32_OBJS= \
-       "$(INTDIR)\mod_proxy.obj" \
-       "$(INTDIR)\proxy_connect.obj" \
-       "$(INTDIR)\proxy_ftp.obj" \
-       "$(INTDIR)\proxy_http.obj" \
-       "$(INTDIR)\proxy_util.obj" \
-       "..\..\Release\libhttpd.lib" \
-       "..\..\srclib\apr-util\Release\libaprutil.lib" \
-       "..\..\srclib\apr\Release\libapr.lib"
-
-"$(OUTDIR)\mod_proxy.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "mod_proxy - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\mod_proxy.so"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Debug" "libhttpd - Win32 Debug"\
- "libapr - Win32 Debug" "$(OUTDIR)\mod_proxy.so"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\
- "libaprutil - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-       -@erase "$(INTDIR)\mod_proxy.idb"
-       -@erase "$(INTDIR)\mod_proxy.obj"
-       -@erase "$(INTDIR)\proxy_connect.obj"
-       -@erase "$(INTDIR)\proxy_ftp.obj"
-       -@erase "$(INTDIR)\proxy_http.obj"
-       -@erase "$(INTDIR)\proxy_util.obj"
-       -@erase "$(OUTDIR)\mod_proxy.exp"
-       -@erase "$(OUTDIR)\mod_proxy.lib"
-       -@erase "$(OUTDIR)\mod_proxy.map"
-       -@erase "$(OUTDIR)\mod_proxy.pdb"
-       -@erase "$(OUTDIR)\mod_proxy.so"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\srclib\apr\include" /I\
- "../../srclib/apr-util/include" /I "..\..\include" /I "..\..\os\win32" /D\
- "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD\
- /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" 
-BSC32_SBRS= \
-       
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows\
- /dll /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb"\
- /map:"$(INTDIR)\mod_proxy.map" /debug /machine:I386\
- /out:"$(OUTDIR)\mod_proxy.so" /implib:"$(OUTDIR)\mod_proxy.lib"\
- /base:@..\..\os\win32\BaseAddr.ref,mod_proxy 
-LINK32_OBJS= \
-       "$(INTDIR)\mod_proxy.obj" \
-       "$(INTDIR)\proxy_connect.obj" \
-       "$(INTDIR)\proxy_ftp.obj" \
-       "$(INTDIR)\proxy_http.obj" \
-       "$(INTDIR)\proxy_util.obj" \
-       "..\..\Debug\libhttpd.lib" \
-       "..\..\srclib\apr-util\Debug\libaprutil.lib" \
-       "..\..\srclib\apr\Debug\libapr.lib"
-
-"$(OUTDIR)\mod_proxy.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "mod_proxy - Win32 Release" || "$(CFG)" ==\
- "mod_proxy - Win32 Debug"
-SOURCE=.\mod_proxy.c
-DEP_CPP_MOD_P=\
-       "..\..\include\ap_config.h"\
-       "..\..\include\ap_mmn.h"\
-       "..\..\include\http_config.h"\
-       "..\..\include\http_log.h"\
-       "..\..\include\http_protocol.h"\
-       "..\..\include\http_request.h"\
-       "..\..\include\http_vhost.h"\
-       "..\..\include\httpd.h"\
-       "..\..\include\pcreposix.h"\
-       "..\..\include\util_cfgtree.h"\
-       "..\..\include\util_date.h"\
-       "..\..\include\util_filter.h"\
-       "..\..\os\win32\os.h"\
-       "..\..\srclib\apr-util\include\apr_buckets.h"\
-       "..\..\srclib\apr-util\include\apr_hooks.h"\
-       "..\..\srclib\apr-util\include\apr_ring.h"\
-       "..\..\srclib\apr-util\include\apr_uri.h"\
-       "..\..\srclib\apr\include\apr.h"\
-       "..\..\srclib\apr\include\apr_compat.h"\
-       "..\..\srclib\apr\include\apr_dso.h"\
-       "..\..\srclib\apr\include\apr_errno.h"\
-       "..\..\srclib\apr\include\apr_file_io.h"\
-       "..\..\srclib\apr\include\apr_general.h"\
-       "..\..\srclib\apr\include\apr_lib.h"\
-       "..\..\srclib\apr\include\apr_lock.h"\
-       "..\..\srclib\apr\include\apr_mmap.h"\
-       "..\..\srclib\apr\include\apr_network_io.h"\
-       "..\..\srclib\apr\include\apr_pools.h"\
-       "..\..\srclib\apr\include\apr_portable.h"\
-       "..\..\srclib\apr\include\apr_strings.h"\
-       "..\..\srclib\apr\include\apr_tables.h"\
-       "..\..\srclib\apr\include\apr_thread_proc.h"\
-       "..\..\srclib\apr\include\apr_time.h"\
-       "..\..\srclib\apr\network_io\os2\os2nerrno.h"\
-       ".\mod_proxy.h"\
-       
-NODEP_CPP_MOD_P=\
-       "..\..\include\ap_config_auto.h"\
-       "..\..\include\ap_config_path.h"\
-       ".\ap_cache.h"\
-       ".\buff.h"\
-       
-
-"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)"
-
-
-SOURCE=.\proxy_connect.c
-DEP_CPP_PROXY=\
-       "..\..\include\ap_config.h"\
-       "..\..\include\ap_mmn.h"\
-       "..\..\include\http_config.h"\
-       "..\..\include\http_log.h"\
-       "..\..\include\http_main.h"\
-       "..\..\include\http_protocol.h"\
-       "..\..\include\httpd.h"\
-       "..\..\include\pcreposix.h"\
-       "..\..\include\util_cfgtree.h"\
-       "..\..\include\util_filter.h"\
-       "..\..\os\win32\os.h"\
-       "..\..\srclib\apr-util\include\apr_buckets.h"\
-       "..\..\srclib\apr-util\include\apr_hooks.h"\
-       "..\..\srclib\apr-util\include\apr_ring.h"\
-       "..\..\srclib\apr-util\include\apr_uri.h"\
-       "..\..\srclib\apr\include\apr.h"\
-       "..\..\srclib\apr\include\apr_compat.h"\
-       "..\..\srclib\apr\include\apr_dso.h"\
-       "..\..\srclib\apr\include\apr_errno.h"\
-       "..\..\srclib\apr\include\apr_file_io.h"\
-       "..\..\srclib\apr\include\apr_general.h"\
-       "..\..\srclib\apr\include\apr_lib.h"\
-       "..\..\srclib\apr\include\apr_lock.h"\
-       "..\..\srclib\apr\include\apr_mmap.h"\
-       "..\..\srclib\apr\include\apr_network_io.h"\
-       "..\..\srclib\apr\include\apr_pools.h"\
-       "..\..\srclib\apr\include\apr_portable.h"\
-       "..\..\srclib\apr\include\apr_strings.h"\
-       "..\..\srclib\apr\include\apr_tables.h"\
-       "..\..\srclib\apr\include\apr_thread_proc.h"\
-       "..\..\srclib\apr\include\apr_time.h"\
-       "..\..\srclib\apr\network_io\os2\os2nerrno.h"\
-       ".\mod_proxy.h"\
-       
-NODEP_CPP_PROXY=\
-       "..\..\include\ap_config_auto.h"\
-       "..\..\include\ap_config_path.h"\
-       ".\ap_cache.h"\
-       ".\buff.h"\
-       
-
-"$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)"
-
-
-SOURCE=.\proxy_ftp.c
-DEP_CPP_PROXY_=\
-       "..\..\include\ap_config.h"\
-       "..\..\include\ap_mmn.h"\
-       "..\..\include\http_config.h"\
-       "..\..\include\http_core.h"\
-       "..\..\include\http_log.h"\
-       "..\..\include\http_main.h"\
-       "..\..\include\http_protocol.h"\
-       "..\..\include\httpd.h"\
-       "..\..\include\pcreposix.h"\
-       "..\..\include\util_cfgtree.h"\
-       "..\..\include\util_filter.h"\
-       "..\..\os\win32\os.h"\
-       "..\..\srclib\apr-util\include\apr_buckets.h"\
-       "..\..\srclib\apr-util\include\apr_hooks.h"\
-       "..\..\srclib\apr-util\include\apr_ring.h"\
-       "..\..\srclib\apr-util\include\apr_uri.h"\
-       "..\..\srclib\apr\include\apr.h"\
-       "..\..\srclib\apr\include\apr_compat.h"\
-       "..\..\srclib\apr\include\apr_dso.h"\
-       "..\..\srclib\apr\include\apr_errno.h"\
-       "..\..\srclib\apr\include\apr_file_io.h"\
-       "..\..\srclib\apr\include\apr_general.h"\
-       "..\..\srclib\apr\include\apr_lib.h"\
-       "..\..\srclib\apr\include\apr_lock.h"\
-       "..\..\srclib\apr\include\apr_mmap.h"\
-       "..\..\srclib\apr\include\apr_network_io.h"\
-       "..\..\srclib\apr\include\apr_pools.h"\
-       "..\..\srclib\apr\include\apr_portable.h"\
-       "..\..\srclib\apr\include\apr_strings.h"\
-       "..\..\srclib\apr\include\apr_tables.h"\
-       "..\..\srclib\apr\include\apr_thread_proc.h"\
-       "..\..\srclib\apr\include\apr_time.h"\
-       "..\..\srclib\apr\network_io\os2\os2nerrno.h"\
-       ".\mod_proxy.h"\
-       
-NODEP_CPP_PROXY_=\
-       "..\..\include\ap_config_auto.h"\
-       "..\..\include\ap_config_path.h"\
-       ".\ap_cache.h"\
-       ".\buff.h"\
-       
-
-"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)"
-
-
-SOURCE=.\proxy_http.c
-DEP_CPP_PROXY_H=\
-       "..\..\include\ap_config.h"\
-       "..\..\include\ap_mmn.h"\
-       "..\..\include\http_config.h"\
-       "..\..\include\http_connection.h"\
-       "..\..\include\http_core.h"\
-       "..\..\include\http_log.h"\
-       "..\..\include\http_main.h"\
-       "..\..\include\http_protocol.h"\
-       "..\..\include\httpd.h"\
-       "..\..\include\pcreposix.h"\
-       "..\..\include\util_cfgtree.h"\
-       "..\..\include\util_date.h"\
-       "..\..\include\util_filter.h"\
-       "..\..\os\win32\os.h"\
-       "..\..\srclib\apr-util\include\apr_buckets.h"\
-       "..\..\srclib\apr-util\include\apr_hooks.h"\
-       "..\..\srclib\apr-util\include\apr_ring.h"\
-       "..\..\srclib\apr-util\include\apr_uri.h"\
-       "..\..\srclib\apr\include\apr.h"\
-       "..\..\srclib\apr\include\apr_compat.h"\
-       "..\..\srclib\apr\include\apr_dso.h"\
-       "..\..\srclib\apr\include\apr_errno.h"\
-       "..\..\srclib\apr\include\apr_file_io.h"\
-       "..\..\srclib\apr\include\apr_general.h"\
-       "..\..\srclib\apr\include\apr_lib.h"\
-       "..\..\srclib\apr\include\apr_lock.h"\
-       "..\..\srclib\apr\include\apr_mmap.h"\
-       "..\..\srclib\apr\include\apr_network_io.h"\
-       "..\..\srclib\apr\include\apr_pools.h"\
-       "..\..\srclib\apr\include\apr_portable.h"\
-       "..\..\srclib\apr\include\apr_strings.h"\
-       "..\..\srclib\apr\include\apr_tables.h"\
-       "..\..\srclib\apr\include\apr_thread_proc.h"\
-       "..\..\srclib\apr\include\apr_time.h"\
-       "..\..\srclib\apr\network_io\os2\os2nerrno.h"\
-       ".\mod_proxy.h"\
-       
-NODEP_CPP_PROXY_H=\
-       "..\..\include\ap_config_auto.h"\
-       "..\..\include\ap_config_path.h"\
-       ".\ap_cache.h"\
-       ".\buff.h"\
-       
-
-"$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)"
-
-
-SOURCE=.\proxy_util.c
-DEP_CPP_PROXY_U=\
-       "..\..\include\ap_config.h"\
-       "..\..\include\ap_mmn.h"\
-       "..\..\include\http_config.h"\
-       "..\..\include\http_core.h"\
-       "..\..\include\http_log.h"\
-       "..\..\include\http_main.h"\
-       "..\..\include\http_protocol.h"\
-       "..\..\include\httpd.h"\
-       "..\..\include\pcreposix.h"\
-       "..\..\include\util_cfgtree.h"\
-       "..\..\include\util_date.h"\
-       "..\..\include\util_filter.h"\
-       "..\..\os\win32\os.h"\
-       "..\..\srclib\apr-util\include\apr_buckets.h"\
-       "..\..\srclib\apr-util\include\apr_hooks.h"\
-       "..\..\srclib\apr-util\include\apr_ring.h"\
-       "..\..\srclib\apr-util\include\apr_uri.h"\
-       "..\..\srclib\apr\include\apr.h"\
-       "..\..\srclib\apr\include\apr_compat.h"\
-       "..\..\srclib\apr\include\apr_dso.h"\
-       "..\..\srclib\apr\include\apr_errno.h"\
-       "..\..\srclib\apr\include\apr_file_io.h"\
-       "..\..\srclib\apr\include\apr_general.h"\
-       "..\..\srclib\apr\include\apr_lib.h"\
-       "..\..\srclib\apr\include\apr_lock.h"\
-       "..\..\srclib\apr\include\apr_md5.h"\
-       "..\..\srclib\apr\include\apr_mmap.h"\
-       "..\..\srclib\apr\include\apr_network_io.h"\
-       "..\..\srclib\apr\include\apr_pools.h"\
-       "..\..\srclib\apr\include\apr_portable.h"\
-       "..\..\srclib\apr\include\apr_strings.h"\
-       "..\..\srclib\apr\include\apr_tables.h"\
-       "..\..\srclib\apr\include\apr_thread_proc.h"\
-       "..\..\srclib\apr\include\apr_time.h"\
-       "..\..\srclib\apr\include\apr_xlate.h"\
-       "..\..\srclib\apr\network_io\os2\os2nerrno.h"\
-       ".\mod_proxy.h"\
-       
-NODEP_CPP_PROXY_U=\
-       "..\..\include\ap_config_auto.h"\
-       "..\..\include\ap_config_path.h"\
-       ".\ap_cache.h"\
-       ".\buff.h"\
-       
-
-"$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY_U) "$(INTDIR)"
-
-
-!IF  "$(CFG)" == "mod_proxy - Win32 Release"
-
-"libapr - Win32 Release" : 
-   cd "\test\httpd-2.0\srclib\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
-   cd "..\..\modules\proxy"
-
-"libapr - Win32 ReleaseCLEAN" : 
-   cd "\test\httpd-2.0\srclib\apr"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1 
-   cd "..\..\modules\proxy"
-
-!ELSEIF  "$(CFG)" == "mod_proxy - Win32 Debug"
-
-"libapr - Win32 Debug" : 
-   cd "\test\httpd-2.0\srclib\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
-   cd "..\..\modules\proxy"
-
-"libapr - Win32 DebugCLEAN" : 
-   cd "\test\httpd-2.0\srclib\apr"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1 
-   cd "..\..\modules\proxy"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "mod_proxy - Win32 Release"
-
-"libhttpd - Win32 Release" : 
-   cd "\test\httpd-2.0"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
-   cd ".\modules\proxy"
-
-"libhttpd - Win32 ReleaseCLEAN" : 
-   cd "\test\httpd-2.0"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
- CFG="libhttpd - Win32 Release" RECURSE=1 
-   cd ".\modules\proxy"
-
-!ELSEIF  "$(CFG)" == "mod_proxy - Win32 Debug"
-
-"libhttpd - Win32 Debug" : 
-   cd "\test\httpd-2.0"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
-   cd ".\modules\proxy"
-
-"libhttpd - Win32 DebugCLEAN" : 
-   cd "\test\httpd-2.0"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
- RECURSE=1 
-   cd ".\modules\proxy"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "mod_proxy - Win32 Release"
-
-"libaprutil - Win32 Release" : 
-   cd "\test\httpd-2.0\srclib\apr-util"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
- 
-   cd "..\..\modules\proxy"
-
-"libaprutil - Win32 ReleaseCLEAN" : 
-   cd "\test\httpd-2.0\srclib\apr-util"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
- CFG="libaprutil - Win32 Release" RECURSE=1 
-   cd "..\..\modules\proxy"
-
-!ELSEIF  "$(CFG)" == "mod_proxy - Win32 Debug"
-
-"libaprutil - Win32 Debug" : 
-   cd "\test\httpd-2.0\srclib\apr-util"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
-   cd "..\..\modules\proxy"
-
-"libaprutil - Win32 DebugCLEAN" : 
-   cd "\test\httpd-2.0\srclib\apr-util"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
- CFG="libaprutil - Win32 Debug" RECURSE=1 
-   cd "..\..\modules\proxy"
-
-!ENDIF 
-
-
-!ENDIF 
-

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 94dea710866fe59d7fcb3cbdbb6503f470ab4c7f..6f38106687c418f676068706d28f3162580b1319 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -19,10 +19,12 @@ mod_rewrite          0x6FE70000    0x00020000
 mod_speling          0x6FE60000    0x00010000
 mod_status           0x6FE50000    0x00010000
 mod_usertrack        0x6FE40000    0x00010000
-mod_proxy            0x6FE20000    0x00020000
-mod_file_cache       0x6FE00000    0x00020000
-mod_auth_dbm         0x6FDF0000    0x00010000
+mod_file_cache       0x6FE20000    0x00020000
+mod_auth_dbm         0x6FE10000    0x00010000
 mod_dav_fs           0x6FDE0000    0x00010000
 mod_dav              0x6FDC0000    0x00020000
-mod_tls              0x6FD80000    0x00040000
+mod_proxy            0x6FDB0000    0x00010000
+proxy_connect        0x6FDA0000    0x00010000
+proxy_ftp            0x6FD90000    0x00010000
+proxy_http           0x6FD80000    0x00010000
 mod_ssl              0x6FD00000    0x00080000