Handle the pathological case of a connect

[apache] / libhttpd.dsp

diff --git a/libhttpd.dsp b/libhttpd.dsp
index 98daabc0979b0ee245b4e090af8876f756e8cd7b..13a5b1da59a632238623bfad982a3b0fe8734934 100644 (file)
--- a/libhttpd.dsp
+++ b/libhttpd.dsp
@@ -43,21 +43,24 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /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" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd_cl" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/libhttpd.res" /i "./include" /i "./srclib/apr/include" /d "NDEBUG" /d BIN_NAME="libhttpd.dll" /d LONG_NAME="Apache HTTP Server Core"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Release\buildmark.obj" /nologo /subsystem:windows /dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll
+# ADD LINK32 pcre.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Release\buildmark.obj" /nologo /subsystem:windows /dll /debug /libpath:"./srclib/pcre" /base:@"os\win32\BaseAddr.ref",libhttpd.dll /opt:ref
 # Begin Special Build Tool
+TargetPath=.\Release\libhttpd.dll
 SOURCE="$(InputPath)"
 PreLink_Desc=Compiling buildmark
-PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" /FD /c server\buildmark.c /Fo"Release\buildmark.obj"
+PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" /FD /c server\buildmark.c /Fo"Release\buildmark.obj"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
@@ -73,22 +76,25 @@ PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /I "./include" /I "./srclib/apr/include"
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /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" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd_cl" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"Debug/libhttpd.res" /i "./include" /i "./srclib/apr/include" /d "_DEBUG" /d BIN_NAME="libhttpd.dll" /d LONG_NAME="Apache HTTP Server Core"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Debug\buildmark.obj" /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",libhttpd
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 pcred.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Debug\buildmark.obj" /nologo /subsystem:windows /dll /incremental:no /debug /libpath:"./srclib/pcre" /base:@"os\win32\BaseAddr.ref",libhttpd.dll
 # Begin Special Build Tool
+TargetPath=.\Debug\libhttpd.dll
 SOURCE="$(InputPath)"
 PreLink_Desc=Compiling buildmark
-PreLink_Cmds=cl.exe /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /c server\buildmark.c /Fo"Debug\buildmark.obj"
+PreLink_Cmds=cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /c server\buildmark.c /Fo"Debug\buildmark.obj"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 # End Special Build Tool
 
 !ENDIF 
@@ -110,6 +116,10 @@ SOURCE=.\include\ap_config.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\ap_expr.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\ap_mmn.h
 # End Source File
 # Begin Source File
@@ -183,32 +193,7 @@ InputPath=.\modules\generators\mod_cgi.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\modules\http\mod_core.h
-
-!IF  "$(CFG)" == "libhttpd - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mod_core.h
-InputPath=.\modules\http\mod_core.h
-
-".\include\mod_core.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       type .\modules\http\mod_core.h > .\include\mod_core.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mod_core.h
-InputPath=.\modules\http\mod_core.h
-
-".\include\mod_core.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       type .\modules\http\mod_core.h > .\include\mod_core.h
-
-# End Custom Build
-
-!ENDIF 
-
+SOURCE=.\include\mod_core.h
 # End Source File
 # Begin Source File
 
@@ -299,6 +284,35 @@ InputPath=.\modules\proxy\mod_proxy.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\modules\core\mod_so.h
+
+!IF  "$(CFG)" == "libhttpd - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating include/mod_so.h
+InputPath=.\modules\core\mod_so.h
+
+".\include\mod_so.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\modules\core\mod_so.h > .\include\mod_so.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating include/mod_so.h
+InputPath=.\modules\core\mod_so.h
+
+".\include\mod_so.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       type .\modules\core\mod_so.h > .\include\mod_so.h
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\os\win32\os.h
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
@@ -341,6 +355,14 @@ SOURCE=.\server\buildmark.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\modules\http\byterange_filter.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\modules\http\chunk_filter.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\server\config.c
 # End Source File
 # Begin Source File
@@ -353,10 +375,22 @@ SOURCE=.\server\core.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\server\core_filters.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\modules\http\http_core.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\modules\http\http_etag.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\modules\http\http_filters.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\modules\http\http_protocol.c
 # End Source File
 # Begin Source File
@@ -385,7 +419,7 @@ SOURCE=.\server\vhost.c
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\modules\mappers\mod_so.c
+SOURCE=.\modules\core\mod_so.c
 # End Source File
 # Begin Source File
 
@@ -401,15 +435,19 @@ SOURCE=.\os\win32\modules.c
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\server\error_bucket.c
+SOURCE=.\include\ap_regex.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\rfc1413.c
+SOURCE=.\server\eoc_bucket.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\rfc1413.h
+SOURCE=.\server\eor_bucket.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\error_bucket.c
 # End Source File
 # Begin Source File
 
@@ -429,10 +467,22 @@ SOURCE=.\include\util_charset.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\server\util_cookies.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\util_cookies.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\util_ebcdic.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\server\util_expr.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\server\util_filter.c
 # End Source File
 # Begin Source File
@@ -449,6 +499,18 @@ SOURCE=.\include\util_md5.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\server\util_mutex.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\util_mutex.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\util_pcre.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\server\util_script.c
 # End Source File
 # Begin Source File
@@ -489,7 +551,7 @@ SOURCE=.\include\ap_regkey.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\ap_mpm.h
+SOURCE=.\server\mpm\winnt\child.c
 # End Source File
 # Begin Source File
 
@@ -497,35 +559,6 @@ SOURCE=.\server\listen.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\mpm\winnt\mpm.h
-
-!IF  "$(CFG)" == "libhttpd - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mpm.h
-InputPath=.\server\mpm\winnt\mpm.h
-
-".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       type .\server\mpm\winnt\mpm.h > .\include\mpm.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/mpm.h
-InputPath=.\server\mpm\winnt\mpm.h
-
-".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       type .\server\mpm\winnt\mpm.h > .\include\mpm.h
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\server\mpm_common.c
 # End Source File
 # Begin Source File
@@ -575,7 +608,7 @@ SOURCE=.\server\mpm\winnt\nt_eventlog.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\mpm\winnt\service.c
+SOURCE=.\server\provider.c
 # End Source File
 # Begin Source File
 
@@ -585,6 +618,10 @@ SOURCE=.\server\scoreboard.c
 
 SOURCE=.\include\scoreboard.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\server\mpm\winnt\service.c
+# End Source File
 # End Group
 # Begin Source File
 
@@ -619,36 +656,7 @@ InputPath=.\server\gen_test_char.exe
 # End Source File
 # Begin Source File
 
-SOURCE=.\build\win32\libhttpd.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\build\win32\win32ver.awk
-
-!IF  "$(CFG)" == "libhttpd - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=.\build\win32\win32ver.awk
-
-".\build\win32\libhttpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ./build/win32/win32ver.awk libhttpd "Apache HTTP Server Core"  ./include/ap_release.h > .\build\win32\libhttpd.rc
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=.\build\win32\win32ver.awk
-
-".\build\win32\libhttpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ./build/win32/win32ver.awk libhttpd "Apache HTTP Server Core"  ./include/ap_release.h > .\build\win32\libhttpd.rc
-
-# End Custom Build
-
-!ENDIF 
-
+SOURCE=.\build\win32\httpd.rc
 # End Source File
 # End Target
 # End Project