diff options
-rw-r--r-- | Apache.dsp | 8 | ||||
-rw-r--r-- | Apache.dsw | 52 | ||||
-rw-r--r-- | ApacheCore.def | 26 | ||||
-rw-r--r-- | ApacheCore.dsp | 88 | ||||
-rw-r--r-- | ApacheCoreDll.dsp | 100 | ||||
-rw-r--r-- | Makefile.win | 2 | ||||
-rw-r--r-- | httpd.dsp | 88 | ||||
-rw-r--r-- | libhttpd.def | 26 | ||||
-rw-r--r-- | libhttpd.dsp | 100 |
9 files changed, 357 insertions, 133 deletions
diff --git a/Apache.dsp b/Apache.dsp index 90405e0ac3..7a3b272f0f 100644 --- a/Apache.dsp +++ b/Apache.dsp @@ -41,8 +41,8 @@ RSC=rc.exe # PROP Intermediate_Dir ".\ApacheR" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "SHARED_MODULE" /FD /YX /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "SHARED_MODULE" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" @@ -66,8 +66,8 @@ LINK32=link.exe # PROP Intermediate_Dir ".\ApacheD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /YX /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "SHARED_MODULE" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" diff --git a/Apache.dsw b/Apache.dsw index a2379cb308..8a10cb2980 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -15,7 +15,7 @@ Package=<4> Project_Dep_Name aprlibdll End Project Dependency Begin Project Dependency - Project_Dep_Name ApacheCore + Project_Dep_Name ApacheCoreDll End Project Dependency }}} @@ -30,20 +30,35 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name aprlibdll - End Project Dependency - Begin Project Dependency Project_Dep_Name gen_test_char End Project Dependency Begin Project Dependency Project_Dep_Name gen_uri_delims End Project Dependency +}}} + +############################################################################### + +Project: "ApacheCoreDll"=".\ApacheCoreDll.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ Begin Project Dependency - Project_Dep_Name pcreposix + Project_Dep_Name aprlibdll End Project Dependency Begin Project Dependency Project_Dep_Name pcre End Project Dependency + Begin Project Dependency + Project_Dep_Name pcreposix + End Project Dependency + Begin Project Dependency + Project_Dep_Name ApacheCore + End Project Dependency }}} ############################################################################### @@ -60,7 +75,7 @@ Package=<4> Project_Dep_Name aprlibdll End Project Dependency Begin Project Dependency - Project_Dep_Name ApacheCore + Project_Dep_Name ApacheCoreDll End Project Dependency }}} @@ -78,7 +93,7 @@ Package=<4> Project_Dep_Name aprlibdll End Project Dependency Begin Project Dependency - Project_Dep_Name ApacheCore + Project_Dep_Name ApacheCoreDll End Project Dependency }}} @@ -96,7 +111,7 @@ Package=<4> Project_Dep_Name aprlibdll End Project Dependency Begin Project Dependency - Project_Dep_Name ApacheCore + Project_Dep_Name ApacheCoreDll End Project Dependency }}} @@ -114,7 +129,7 @@ Package=<4> Project_Dep_Name aprlibdll End Project Dependency Begin Project Dependency - Project_Dep_Name ApacheCore + Project_Dep_Name ApacheCoreDll End Project Dependency }}} @@ -132,7 +147,7 @@ Package=<4> Project_Dep_Name aprlibdll End Project Dependency Begin Project Dependency - Project_Dep_Name ApacheCore + Project_Dep_Name ApacheCoreDll End Project Dependency }}} @@ -150,7 +165,7 @@ Package=<4> Project_Dep_Name aprlibdll End Project Dependency Begin Project Dependency - Project_Dep_Name ApacheCore + Project_Dep_Name ApacheCoreDll End Project Dependency }}} @@ -168,7 +183,7 @@ Package=<4> Project_Dep_Name aprlibdll End Project Dependency Begin Project Dependency - Project_Dep_Name ApacheCore + Project_Dep_Name ApacheCoreDll End Project Dependency }}} @@ -186,7 +201,7 @@ Package=<4> Project_Dep_Name aprlibdll End Project Dependency Begin Project Dependency - Project_Dep_Name ApacheCore + Project_Dep_Name ApacheCoreDll End Project Dependency }}} @@ -204,7 +219,7 @@ Package=<4> Project_Dep_Name aprlibdll End Project Dependency Begin Project Dependency - Project_Dep_Name ApacheCore + Project_Dep_Name ApacheCoreDll End Project Dependency }}} @@ -222,7 +237,7 @@ Package=<4> Project_Dep_Name aprlibdll End Project Dependency Begin Project Dependency - Project_Dep_Name ApacheCore + Project_Dep_Name ApacheCoreDll End Project Dependency }}} @@ -240,7 +255,7 @@ Package=<4> Project_Dep_Name aprlibdll End Project Dependency Begin Project Dependency - Project_Dep_Name ApacheCore + Project_Dep_Name ApacheCoreDll End Project Dependency }}} @@ -258,7 +273,7 @@ Package=<4> Project_Dep_Name aprlibdll End Project Dependency Begin Project Dependency - Project_Dep_Name ApacheCore + Project_Dep_Name ApacheCoreDll End Project Dependency }}} @@ -326,6 +341,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name ab End Project Dependency + Begin Project Dependency + Project_Dep_Name ApacheCoreDll + End Project Dependency }}} ############################################################################### diff --git a/ApacheCore.def b/ApacheCore.def index 837810f489..8bdc2defd3 100644 --- a/ApacheCore.def +++ b/ApacheCore.def @@ -107,7 +107,7 @@ EXPORTS ap_get_server_built @100 ap_get_server_name @101 ap_get_server_port @102 - ;ap_get_server_version @103 + ap_get_server_version @103 ; ap_get_time @104 ap_get_token @105 ap_getparents @106 @@ -401,12 +401,18 @@ EXPORTS ap_bwrite_core @396 ; Exclusively provided for http_main.c - ap_register_hooks @398 - ap_prelinked_modules @399 - ap_preloaded_modules @400 - ap_post_config_hook @401 - ap_run_pre_config @402 - ap_run_rewrite_args @403 - ap_show_directives @404 - ap_show_modules @405 - ap_util_uri_init @406 + ap_register_hooks @398 NONAME + ap_prelinked_modules @399 NONAME + ap_preloaded_modules @400 NONAME + ap_post_config_hook @401 NONAME + ap_run_pre_config @402 NONAME + ap_run_rewrite_args @403 NONAME + ap_show_directives @404 NONAME + ap_show_modules @405 NONAME + ap_util_uri_init @406 NONAME + ap_mpm_run @407 NONAME + ap_hook_deregister_all @408 NONAME + ap_run_open_logs @409 NONAME + ap_process_config_tree @410 NONAME + ap_server_config_defines @411 NONAME DATA + diff --git a/ApacheCore.dsp b/ApacheCore.dsp index e087cb38f4..a807f6e0a8 100644 --- a/ApacheCore.dsp +++ b/ApacheCore.dsp @@ -2,9 +2,9 @@ # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 +# TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=ApacheCore - Win32 Release +CFG=ApacheCore - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,12 @@ CFG=ApacheCore - Win32 Release !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 "ApacheCore.mak" CFG="ApacheCore - Win32 Release" +!MESSAGE NMAKE /f "ApacheCore.mak" CFG="ApacheCore - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "ApacheCore - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ApacheCore - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "ApacheCore - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "ApacheCore - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -26,63 +26,55 @@ CFG=ApacheCore - Win32 Release # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe -MTL=midl.exe -RSC=rc.exe !IF "$(CFG)" == "ApacheCore - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\CoreR" -# PROP BASE Intermediate_Dir ".\CoreR" +# PROP BASE Output_Dir "LibR" +# PROP BASE Intermediate_Dir "LibR" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\CoreR" -# PROP Intermediate_Dir ".\CoreR" -# PROP Ignore_Export_Lib 0 +# PROP Output_Dir "LibR" +# PROP Intermediate_Dir "LibR" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "os/win32" /I "lib/apr/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" +RSC=rc.exe +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c 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",ApacheCore -# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"LibR\apr.lib" +# ADD LIB32 /nologo /out:"LibR\apr.lib" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\CoreD" -# PROP BASE Intermediate_Dir ".\CoreD" +# PROP BASE Output_Dir "LibD" +# PROP BASE Intermediate_Dir "LibD" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\CoreD" -# PROP Intermediate_Dir ".\CoreD" +# PROP Output_Dir "LibD" +# PROP Intermediate_Dir "LibD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "os/win32" /I "lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" +RSC=rc.exe +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c 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 /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore -# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore -# SUBTRACT LINK32 /incremental:no /map +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"LibD\apr.lib" +# ADD LIB32 /nologo /out:"LibD\apr.lib" !ENDIF @@ -107,10 +99,6 @@ SOURCE=.\ap\ap_sha1.c # End Source File # Begin Source File -SOURCE=.\ApacheCore.def -# End Source File -# Begin Source File - SOURCE=.\main\buff.c # End Source File # Begin Source File @@ -235,6 +223,10 @@ SOURCE=.\os\win32\modules.c # End Source File # Begin Source File +SOURCE=.\modules\mpm\winnt\mpm_winnt.c +# End Source File +# Begin Source File + SOURCE=.\modules\mpm\winnt\registry.c # End Source File # Begin Source File @@ -273,10 +265,6 @@ SOURCE=.\main\util_uri.c SOURCE=.\os\win32\util_win32.c # End Source File -# Begin Source File - -SOURCE=.\modules\mpm\winnt\mpm_winnt.c -# End Source File # End Group # Begin Group "Header Files" @@ -391,6 +379,10 @@ SOURCE=.\modules\mpm\winnt\mpm_default.h # End Source File # Begin Source File +SOURCE=.\modules\mpm\winnt\mpm_winnt.h +# End Source File +# Begin Source File + SOURCE=.\os\win32\os.h # End Source File # Begin Source File @@ -419,9 +411,13 @@ SOURCE=.\include\util_uri.h # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\mpm_winnt.h +SOURCE=.\modules\mpm\winnt\winnt.h # End Source File # End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" +# End Group # Begin Group "Generated Files" # PROP Default_Filter "" diff --git a/ApacheCoreDll.dsp b/ApacheCoreDll.dsp new file mode 100644 index 0000000000..3664cee98a --- /dev/null +++ b/ApacheCoreDll.dsp @@ -0,0 +1,100 @@ +# Microsoft Developer Studio Project File - Name="ApacheCoreDll" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=ApacheCoreDll - 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 "ApacheCoreDll.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 "ApacheCoreDll.mak" CFG="ApacheCoreDll - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "ApacheCoreDll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "ApacheCoreDll - 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)" == "ApacheCoreDll - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir ".\CoreR" +# PROP BASE Intermediate_Dir ".\CoreR" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir ".\CoreR" +# PROP Intermediate_Dir ".\CoreR" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /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 0x809 /d "NDEBUG" +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",ApacheCore +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:".\CoreR/ApacheCore.dll" /base:@"os\win32\BaseAddr.ref",ApacheCore + +!ELSEIF "$(CFG)" == "ApacheCoreDll - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir ".\CoreD" +# PROP BASE Intermediate_Dir ".\CoreD" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir ".\CoreD" +# PROP Intermediate_Dir ".\CoreD" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "_DEBUG" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" +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 /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /out:".\CoreD/ApacheCore.dll" /base:@"os\win32\BaseAddr.ref",ApacheCore + +!ENDIF + +# Begin Target + +# Name "ApacheCoreDll - Win32 Release" +# Name "ApacheCoreDll - Win32 Debug" +# Begin Source File + +SOURCE=.\os\win32\ApacheCore.c +# End Source File +# Begin Source File + +SOURCE=.\ApacheCore.def +# End Source File +# End Target +# End Project diff --git a/Makefile.win b/Makefile.win index 39dbe62c26..f6117f731b 100644 --- a/Makefile.win +++ b/Makefile.win @@ -78,7 +78,9 @@ _build: $(MAKE) $(MAKEOPT) -f gen_test_char.mak CFG="gen_test_char - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd .. -del Core$(SHORT)\buildmark.obj +# ApacheCoreDll creates the dynamic ApacheCore.dll from the static library project ApacheCore $(MAKE) $(MAKEOPT) -f ApacheCore.mak CFG="ApacheCore - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f ApacheCoreDll.mak CFG="ApacheCoreDll - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f Apache.mak CFG="Apache - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd os\win32 $(MAKE) $(MAKEOPT) -f ApacheModuleStatus.mak CFG="ApacheModuleStatus - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -2,9 +2,9 @@ # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 +# TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=ApacheCore - Win32 Release +CFG=ApacheCore - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,12 @@ CFG=ApacheCore - Win32 Release !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 "ApacheCore.mak" CFG="ApacheCore - Win32 Release" +!MESSAGE NMAKE /f "ApacheCore.mak" CFG="ApacheCore - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "ApacheCore - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ApacheCore - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "ApacheCore - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "ApacheCore - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -26,63 +26,55 @@ CFG=ApacheCore - Win32 Release # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe -MTL=midl.exe -RSC=rc.exe !IF "$(CFG)" == "ApacheCore - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\CoreR" -# PROP BASE Intermediate_Dir ".\CoreR" +# PROP BASE Output_Dir "LibR" +# PROP BASE Intermediate_Dir "LibR" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\CoreR" -# PROP Intermediate_Dir ".\CoreR" -# PROP Ignore_Export_Lib 0 +# PROP Output_Dir "LibR" +# PROP Intermediate_Dir "LibR" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "os/win32" /I "lib/apr/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" +RSC=rc.exe +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c 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",ApacheCore -# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"LibR\apr.lib" +# ADD LIB32 /nologo /out:"LibR\apr.lib" !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\CoreD" -# PROP BASE Intermediate_Dir ".\CoreD" +# PROP BASE Output_Dir "LibD" +# PROP BASE Intermediate_Dir "LibD" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\CoreD" -# PROP Intermediate_Dir ".\CoreD" +# PROP Output_Dir "LibD" +# PROP Intermediate_Dir "LibD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "os/win32" /I "lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" +RSC=rc.exe +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c 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 /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore -# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore -# SUBTRACT LINK32 /incremental:no /map +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"LibD\apr.lib" +# ADD LIB32 /nologo /out:"LibD\apr.lib" !ENDIF @@ -107,10 +99,6 @@ SOURCE=.\ap\ap_sha1.c # End Source File # Begin Source File -SOURCE=.\ApacheCore.def -# End Source File -# Begin Source File - SOURCE=.\main\buff.c # End Source File # Begin Source File @@ -235,6 +223,10 @@ SOURCE=.\os\win32\modules.c # End Source File # Begin Source File +SOURCE=.\modules\mpm\winnt\mpm_winnt.c +# End Source File +# Begin Source File + SOURCE=.\modules\mpm\winnt\registry.c # End Source File # Begin Source File @@ -273,10 +265,6 @@ SOURCE=.\main\util_uri.c SOURCE=.\os\win32\util_win32.c # End Source File -# Begin Source File - -SOURCE=.\modules\mpm\winnt\mpm_winnt.c -# End Source File # End Group # Begin Group "Header Files" @@ -391,6 +379,10 @@ SOURCE=.\modules\mpm\winnt\mpm_default.h # End Source File # Begin Source File +SOURCE=.\modules\mpm\winnt\mpm_winnt.h +# End Source File +# Begin Source File + SOURCE=.\os\win32\os.h # End Source File # Begin Source File @@ -419,9 +411,13 @@ SOURCE=.\include\util_uri.h # End Source File # Begin Source File -SOURCE=.\modules\mpm\winnt\mpm_winnt.h +SOURCE=.\modules\mpm\winnt\winnt.h # End Source File # End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" +# End Group # Begin Group "Generated Files" # PROP Default_Filter "" diff --git a/libhttpd.def b/libhttpd.def index 837810f489..8bdc2defd3 100644 --- a/libhttpd.def +++ b/libhttpd.def @@ -107,7 +107,7 @@ EXPORTS ap_get_server_built @100 ap_get_server_name @101 ap_get_server_port @102 - ;ap_get_server_version @103 + ap_get_server_version @103 ; ap_get_time @104 ap_get_token @105 ap_getparents @106 @@ -401,12 +401,18 @@ EXPORTS ap_bwrite_core @396 ; Exclusively provided for http_main.c - ap_register_hooks @398 - ap_prelinked_modules @399 - ap_preloaded_modules @400 - ap_post_config_hook @401 - ap_run_pre_config @402 - ap_run_rewrite_args @403 - ap_show_directives @404 - ap_show_modules @405 - ap_util_uri_init @406 + ap_register_hooks @398 NONAME + ap_prelinked_modules @399 NONAME + ap_preloaded_modules @400 NONAME + ap_post_config_hook @401 NONAME + ap_run_pre_config @402 NONAME + ap_run_rewrite_args @403 NONAME + ap_show_directives @404 NONAME + ap_show_modules @405 NONAME + ap_util_uri_init @406 NONAME + ap_mpm_run @407 NONAME + ap_hook_deregister_all @408 NONAME + ap_run_open_logs @409 NONAME + ap_process_config_tree @410 NONAME + ap_server_config_defines @411 NONAME DATA + diff --git a/libhttpd.dsp b/libhttpd.dsp new file mode 100644 index 0000000000..3664cee98a --- /dev/null +++ b/libhttpd.dsp @@ -0,0 +1,100 @@ +# Microsoft Developer Studio Project File - Name="ApacheCoreDll" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=ApacheCoreDll - 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 "ApacheCoreDll.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 "ApacheCoreDll.mak" CFG="ApacheCoreDll - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "ApacheCoreDll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "ApacheCoreDll - 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)" == "ApacheCoreDll - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir ".\CoreR" +# PROP BASE Intermediate_Dir ".\CoreR" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir ".\CoreR" +# PROP Intermediate_Dir ".\CoreR" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /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 0x809 /d "NDEBUG" +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",ApacheCore +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:".\CoreR/ApacheCore.dll" /base:@"os\win32\BaseAddr.ref",ApacheCore + +!ELSEIF "$(CFG)" == "ApacheCoreDll - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir ".\CoreD" +# PROP BASE Intermediate_Dir ".\CoreD" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir ".\CoreD" +# PROP Intermediate_Dir ".\CoreD" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "_DEBUG" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" +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 /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /out:".\CoreD/ApacheCore.dll" /base:@"os\win32\BaseAddr.ref",ApacheCore + +!ENDIF + +# Begin Target + +# Name "ApacheCoreDll - Win32 Release" +# Name "ApacheCoreDll - Win32 Debug" +# Begin Source File + +SOURCE=.\os\win32\ApacheCore.c +# End Source File +# Begin Source File + +SOURCE=.\ApacheCore.def +# End Source File +# End Target +# End Project |