Return-Path: Delivered-To: apache-cvs-archive@hyperreal.org Received: (qmail 13157 invoked by uid 6000); 8 Dec 1999 22:34:53 -0000 Received: (qmail 12936 invoked by uid 2016); 8 Dec 1999 22:34:38 -0000 Delivered-To: apcore-apache-2.0-cvs@apache.org Received: (qmail 12684 invoked by uid 215); 8 Dec 1999 22:34:30 -0000 Date: 8 Dec 1999 22:34:30 -0000 Message-ID: <19991208223430.12681.qmail@hyperreal.org> From: stoddard@hyperreal.org To: apache-2.0-cvs@apache.org Subject: cvs commit: apache-2.0/src/os/win32 registry.c registry.h service.c main_win32.c Sender: apache-cvs-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org stoddard 99/12/08 14:34:24 Modified: src Apache.dsp Apache.mak ApacheCore.dsp ApacheCore.mak ApacheCore.def src/os/win32 registry.c registry.h service.c main_win32.c Log: Win32: First cut at getting apache -k restart|shutdown and running apache as a service working Revision Changes Path 1.2 +20 -4 apache-2.0/src/Apache.dsp Index: Apache.dsp =================================================================== RCS file: /home/cvs/apache-2.0/src/Apache.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Apache.dsp 1999/08/24 05:34:12 1.1 +++ Apache.dsp 1999/12/08 22:32:46 1.2 @@ -41,7 +41,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./lib/apr/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -49,7 +49,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 lib\apr\Release\aprlib.lib CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "Apache - Win32 Debug" @@ -65,7 +65,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "./include" /I "./lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe @@ -73,7 +73,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386 +# ADD LINK32 lib\apr\debug\aprlib.lib CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386 !ENDIF @@ -88,10 +88,26 @@ SOURCE=.\os\win32\main_win32.c # End Source File +# Begin Source File + +SOURCE=.\os\win32\registry.c +# End Source File +# Begin Source File + +SOURCE=.\os\win32\service.c +# End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" +# Begin Source File + +SOURCE=.\os\win32\registry.h +# End Source File +# Begin Source File + +SOURCE=.\os\win32\service.h +# End Source File # End Group # Begin Group "Resource Files" 1.2 +136 -61 apache-2.0/src/Apache.mak Index: Apache.mak =================================================================== RCS file: /home/cvs/apache-2.0/src/Apache.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Apache.mak 1999/08/24 05:34:12 1.1 +++ Apache.mak 1999/12/08 22:32:50 1.2 @@ -25,6 +25,9 @@ NULL=nul !ENDIF +CPP=cl.exe +RSC=rc.exe + !IF "$(CFG)" == "Apache - Win32 Release" OUTDIR=.\ApacheR @@ -46,62 +49,34 @@ CLEAN : -@erase "$(INTDIR)\apache.res" -@erase "$(INTDIR)\main_win32.obj" + -@erase "$(INTDIR)\registry.obj" + -@erase "$(INTDIR)\service.obj" -@erase "$(INTDIR)\vc50.idb" -@erase "$(OUTDIR)\Apache.exe" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\ +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./include" /I "./lib/apr/include" /D\ + "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN"\ /Fp"$(INTDIR)\Apache.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheR/ 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) $< -<< - -RSC=rc.exe RSC_PROJ=/l 0x809 /fo"$(INTDIR)\apache.res" /d "NDEBUG" BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console\ - /incremental:no /pdb:"$(OUTDIR)\Apache.pdb" /machine:I386\ +LINK32_FLAGS=lib\apr\Release\aprlib.lib CoreR\ApacheCore.lib kernel32.lib\ + user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo\ + /subsystem:console /incremental:no /pdb:"$(OUTDIR)\Apache.pdb" /machine:I386\ /out:"$(OUTDIR)\Apache.exe" LINK32_OBJS= \ "$(INTDIR)\apache.res" \ - "$(INTDIR)\main_win32.obj" + "$(INTDIR)\main_win32.obj" \ + "$(INTDIR)\registry.obj" \ + "$(INTDIR)\service.obj" "$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -129,6 +104,8 @@ CLEAN : -@erase "$(INTDIR)\apache.res" -@erase "$(INTDIR)\main_win32.obj" + -@erase "$(INTDIR)\registry.obj" + -@erase "$(INTDIR)\service.obj" -@erase "$(INTDIR)\vc50.idb" -@erase "$(INTDIR)\vc50.pdb" -@erase "$(OUTDIR)\Apache.exe" @@ -138,11 +115,33 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "./include" /I "./lib/apr/include"\ + /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN"\ /Fp"$(INTDIR)\Apache.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheD/ CPP_SBRS=. +RSC_PROJ=/l 0x809 /fo"$(INTDIR)\apache.res" /d "_DEBUG" +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=lib\apr\debug\aprlib.lib CoreD\ApacheCore.lib kernel32.lib\ + user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo\ + /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\Apache.pdb" /debug\ + /machine:I386 /out:"$(OUTDIR)\Apache.exe" +LINK32_OBJS= \ + "$(INTDIR)\apache.res" \ + "$(INTDIR)\main_win32.obj" \ + "$(INTDIR)\registry.obj" \ + "$(INTDIR)\service.obj" + +"$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -174,33 +173,109 @@ $(CPP_PROJ) $< << -RSC=rc.exe -RSC_PROJ=/l 0x809 /fo"$(INTDIR)\apache.res" /d "_DEBUG" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" -BSC32_SBRS= \ + +!IF "$(CFG)" == "Apache - Win32 Release" || "$(CFG)" == "Apache - Win32 Debug" +SOURCE=.\os\win32\main_win32.c +DEP_CPP_MAIN_=\ + ".\include\ap.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_hooks.h"\ + ".\include\ap_iol.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\lib\apr\file_io\win32\readdir.h"\ + ".\lib\apr\include\apr_errno.h"\ + ".\lib\apr\include\apr_file_io.h"\ + ".\lib\apr\include\apr_general.h"\ + ".\lib\apr\include\apr_lib.h"\ + ".\lib\apr\include\apr_win.h"\ + ".\os\win32\os.h"\ + ".\os\win32\registry.h"\ + ".\os\win32\service.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ -LINK32=link.exe -LINK32_FLAGS=CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console\ - /incremental:yes /pdb:"$(OUTDIR)\Apache.pdb" /debug /machine:I386\ - /out:"$(OUTDIR)\Apache.exe" -LINK32_OBJS= \ - "$(INTDIR)\apache.res" \ - "$(INTDIR)\main_win32.obj" +NODEP_CPP_MAIN_=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\lib\apr\include\apr_config.h"\ + -"$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< +"$(INTDIR)\main_win32.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF +SOURCE=.\os\win32\registry.c +DEP_CPP_REGIS=\ + ".\include\ap.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_iol.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\lib\apr\file_io\win32\readdir.h"\ + ".\lib\apr\include\apr_errno.h"\ + ".\lib\apr\include\apr_file_io.h"\ + ".\lib\apr\include\apr_general.h"\ + ".\lib\apr\include\apr_lib.h"\ + ".\lib\apr\include\apr_win.h"\ + ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_REGIS=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\lib\apr\include\apr_config.h"\ + -!IF "$(CFG)" == "Apache - Win32 Release" || "$(CFG)" == "Apache - Win32 Debug" -SOURCE=.\os\win32\main_win32.c +"$(INTDIR)\registry.obj" : $(SOURCE) $(DEP_CPP_REGIS) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\os\win32\service.c +DEP_CPP_SERVI=\ + ".\include\ap.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_iol.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\lib\apr\file_io\win32\readdir.h"\ + ".\lib\apr\include\apr_errno.h"\ + ".\lib\apr\include\apr_file_io.h"\ + ".\lib\apr\include\apr_general.h"\ + ".\lib\apr\include\apr_lib.h"\ + ".\lib\apr\include\apr_win.h"\ + ".\os\win32\os.h"\ + ".\os\win32\registry.h"\ + ".\os\win32\service.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_SERVI=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\lib\apr\include\apr_config.h"\ + -"$(INTDIR)\main_win32.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) 1.7 +0 -4 apache-2.0/src/ApacheCore.dsp Index: ApacheCore.dsp =================================================================== RCS file: /home/cvs/apache-2.0/src/ApacheCore.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ApacheCore.dsp 1999/11/08 18:54:04 1.6 +++ ApacheCore.dsp 1999/12/08 22:32:57 1.7 @@ -218,10 +218,6 @@ # End Source File # Begin Source File -SOURCE=.\os\win32\registry.c -# End Source File -# Begin Source File - SOURCE=.\main\rfc1413.c # End Source File # Begin Source File 1.8 +732 -1531 apache-2.0/src/ApacheCore.mak Index: ApacheCore.mak =================================================================== RCS file: /home/cvs/apache-2.0/src/ApacheCore.mak,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ApacheCore.mak 1999/11/08 18:54:06 1.7 +++ ApacheCore.mak 1999/12/08 22:33:09 1.8 @@ -81,7 +81,6 @@ -@erase "$(INTDIR)\mod_userdir.obj" -@erase "$(INTDIR)\modules.obj" -@erase "$(INTDIR)\readdir.obj" - -@erase "$(INTDIR)\registry.obj" -@erase "$(INTDIR)\rfc1413.obj" -@erase "$(INTDIR)\util.obj" -@erase "$(INTDIR)\util_date.obj" @@ -148,7 +147,6 @@ "$(INTDIR)\mod_userdir.obj" \ "$(INTDIR)\modules.obj" \ "$(INTDIR)\readdir.obj" \ - "$(INTDIR)\registry.obj" \ "$(INTDIR)\rfc1413.obj" \ "$(INTDIR)\util.obj" \ "$(INTDIR)\util_date.obj" \ @@ -242,8 +240,6 @@ -@erase "$(INTDIR)\modules.sbr" -@erase "$(INTDIR)\readdir.obj" -@erase "$(INTDIR)\readdir.sbr" - -@erase "$(INTDIR)\registry.obj" - -@erase "$(INTDIR)\registry.sbr" -@erase "$(INTDIR)\rfc1413.obj" -@erase "$(INTDIR)\rfc1413.sbr" -@erase "$(INTDIR)\util.obj" @@ -311,7 +307,6 @@ "$(INTDIR)\mod_userdir.sbr" \ "$(INTDIR)\modules.sbr" \ "$(INTDIR)\readdir.sbr" \ - "$(INTDIR)\registry.sbr" \ "$(INTDIR)\rfc1413.sbr" \ "$(INTDIR)\util.sbr" \ "$(INTDIR)\util_date.sbr" \ @@ -366,7 +361,6 @@ "$(INTDIR)\mod_userdir.obj" \ "$(INTDIR)\modules.obj" \ "$(INTDIR)\readdir.obj" \ - "$(INTDIR)\registry.obj" \ "$(INTDIR)\rfc1413.obj" \ "$(INTDIR)\util.obj" \ "$(INTDIR)\util_date.obj" \ @@ -417,16 +411,12 @@ !IF "$(CFG)" == "ApacheCore - Win32 Release" || "$(CFG)" ==\ "ApacheCore - Win32 Debug" SOURCE=.\main\buff.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_BUFF_=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_log.h"\ @@ -441,36 +431,25 @@ ".\lib\apr\include\apr_win.h"\ ".\os\win32\iol_socket.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_BUFF_=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_BUFF_=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\iol_socket.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\buff.obj" "$(INTDIR)\buff.sbr" : $(SOURCE) $(DEP_CPP_BUFF_)\ "$(INTDIR)" @@ -480,41 +459,12 @@ !ENDIF SOURCE=.\buildmark.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - -DEP_CPP_BUILD=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\buildmark.obj" : $(SOURCE) $(DEP_CPP_BUILD) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - DEP_CPP_BUILD=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\httpd.h"\ @@ -536,6 +486,15 @@ ".\lib\apr\include\apr_config.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\buildmark.obj" : $(SOURCE) $(DEP_CPP_BUILD) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" + + "$(INTDIR)\buildmark.obj" "$(INTDIR)\buildmark.sbr" : $(SOURCE)\ $(DEP_CPP_BUILD) "$(INTDIR)" @@ -543,9 +502,6 @@ !ENDIF SOURCE=.\main\http_config.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_HTTP_=\ ".\include\ap.h"\ ".\include\ap_config.h"\ @@ -553,7 +509,6 @@ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\explain.h"\ ".\include\hsregex.h"\ @@ -577,46 +532,25 @@ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_HTTP_=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_HTTP_=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\explain.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_request.h"\ - ".\include\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\http_config.obj" "$(INTDIR)\http_config.sbr" : $(SOURCE)\ $(DEP_CPP_HTTP_) "$(INTDIR)" @@ -626,9 +560,6 @@ !ENDIF SOURCE=.\main\http_connection.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_HTTP_C=\ ".\include\ap.h"\ ".\include\ap_config.h"\ @@ -637,7 +568,6 @@ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ ".\include\ap_mpm.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ @@ -654,52 +584,32 @@ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ ".\lib\apr\include\apr_network_io.h"\ ".\lib\apr\include\apr_portable.h"\ ".\lib\apr\include\apr_thread_proc.h"\ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_HTTP_C=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\http_connection.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_HTTP_C=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\ap_mpm.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_connection.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\mpm_status.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\http_connection.obj" "$(INTDIR)\http_connection.sbr" : $(SOURCE)\ $(DEP_CPP_HTTP_C) "$(INTDIR)" @@ -709,9 +619,6 @@ !ENDIF SOURCE=.\main\http_core.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_HTTP_CO=\ ".\include\ap.h"\ ".\include\ap_config.h"\ @@ -720,9 +627,7 @@ ".\include\ap_iol.h"\ ".\include\ap_md5.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ - ".\include\fnmatch.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ ".\include\http_connection.h"\ @@ -739,46 +644,59 @@ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ ".\lib\apr\include\apr_file_io.h"\ + ".\lib\apr\include\apr_fnmatch.h"\ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ ".\lib\apr\include\apr_network_io.h"\ ".\lib\apr\include\apr_portable.h"\ ".\lib\apr\include\apr_thread_proc.h"\ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_HTTP_CO=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_HTTP_CO=\ + +"$(INTDIR)\http_core.obj" "$(INTDIR)\http_core.sbr" : $(SOURCE)\ + $(DEP_CPP_HTTP_CO) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=.\main\http_log.c +DEP_CPP_HTTP_L=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ - ".\include\ap_md5.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ - ".\include\fnmatch.h"\ ".\include\hsregex.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\http_request.h"\ - ".\include\http_vhost.h"\ ".\include\httpd.h"\ - ".\include\rfc1413.h"\ - ".\include\util_md5.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ @@ -792,31 +710,45 @@ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_HTTP_L=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\http_core.obj" "$(INTDIR)\http_core.sbr" : $(SOURCE)\ - $(DEP_CPP_HTTP_CO) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -SOURCE=.\main\http_log.c -!IF "$(CFG)" == "ApacheCore - Win32 Release" +"$(INTDIR)\http_log.obj" "$(INTDIR)\http_log.sbr" : $(SOURCE) $(DEP_CPP_HTTP_L)\ + "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) -DEP_CPP_HTTP_L=\ + +!ENDIF + +SOURCE=.\main\http_main.c +DEP_CPP_HTTP_M=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ + ".\include\ap_mpm.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ - ".\include\http_core.h"\ ".\include\http_log.h"\ ".\include\http_main.h"\ ".\include\httpd.h"\ @@ -825,37 +757,58 @@ ".\lib\apr\include\apr_errno.h"\ ".\lib\apr\include\apr_file_io.h"\ ".\lib\apr\include\apr_general.h"\ + ".\lib\apr\include\apr_getopt.h"\ ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ +NODEP_CPP_HTTP_M=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ + ".\main\xmlparse.h"\ + -"$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_HTTP_L=\ + +"$(INTDIR)\http_main.obj" "$(INTDIR)\http_main.sbr" : $(SOURCE)\ + $(DEP_CPP_HTTP_M) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=.\main\http_protocol.c +DEP_CPP_HTTP_P=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ ".\include\http_core.h"\ ".\include\http_log.h"\ ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\http_vhost.h"\ ".\include\httpd.h"\ + ".\include\mpm_status.h"\ + ".\include\util_date.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ @@ -863,905 +816,49 @@ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ ".\lib\apr\include\apr_network_io.h"\ ".\lib\apr\include\apr_portable.h"\ ".\lib\apr\include\apr_thread_proc.h"\ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ - -"$(INTDIR)\http_log.obj" "$(INTDIR)\http_log.sbr" : $(SOURCE) $(DEP_CPP_HTTP_L)\ - "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\main\http_main.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - -DEP_CPP_HTTP_M=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\ap_mpm.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_main.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - -DEP_CPP_HTTP_M=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\ap_mpm.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_main.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\http_main.obj" "$(INTDIR)\http_main.sbr" : $(SOURCE)\ - $(DEP_CPP_HTTP_M) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\main\http_protocol.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - -DEP_CPP_HTTP_P=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\mpm_status.h"\ - ".\include\util_date.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - -DEP_CPP_HTTP_P=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\mpm_status.h"\ - ".\include\util_date.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\http_protocol.obj" "$(INTDIR)\http_protocol.sbr" : $(SOURCE)\ - $(DEP_CPP_HTTP_P) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\main\http_request.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - -DEP_CPP_HTTP_R=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\fnmatch.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - -DEP_CPP_HTTP_R=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\fnmatch.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\http_request.obj" "$(INTDIR)\http_request.sbr" : $(SOURCE)\ - $(DEP_CPP_HTTP_R) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\main\http_vhost.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - -DEP_CPP_HTTP_V=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_protocol.h"\ - ".\include\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\http_vhost.obj" : $(SOURCE) $(DEP_CPP_HTTP_V) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - -DEP_CPP_HTTP_V=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_protocol.h"\ - ".\include\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\http_vhost.obj" "$(INTDIR)\http_vhost.sbr" : $(SOURCE)\ - $(DEP_CPP_HTTP_V) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\main\iol_file.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - -DEP_CPP_IOL_F=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\iol_file.obj" : $(SOURCE) $(DEP_CPP_IOL_F) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - -DEP_CPP_IOL_F=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\iol_file.obj" "$(INTDIR)\iol_file.sbr" : $(SOURCE) $(DEP_CPP_IOL_F)\ - "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\os\win32\iol_socket.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - -DEP_CPP_IOL_S=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\iol_socket.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\iol_socket.obj" : $(SOURCE) $(DEP_CPP_IOL_S) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - -DEP_CPP_IOL_S=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\iol_socket.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\iol_socket.obj" "$(INTDIR)\iol_socket.sbr" : $(SOURCE)\ - $(DEP_CPP_IOL_S) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\main\listen.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - -DEP_CPP_LISTE=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_listen.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_log.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\listen.obj" : $(SOURCE) $(DEP_CPP_LISTE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - -DEP_CPP_LISTE=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_listen.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_log.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\listen.obj" "$(INTDIR)\listen.sbr" : $(SOURCE) $(DEP_CPP_LISTE)\ - "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\modules\standard\mod_access.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - -DEP_CPP_MOD_A=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - -DEP_CPP_MOD_A=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\mod_access.obj" "$(INTDIR)\mod_access.sbr" : $(SOURCE)\ - $(DEP_CPP_MOD_A) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\modules\standard\mod_actions.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - -DEP_CPP_MOD_AC=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_script.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - -DEP_CPP_MOD_AC=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_script.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\mod_actions.obj" "$(INTDIR)\mod_actions.sbr" : $(SOURCE)\ - $(DEP_CPP_MOD_AC) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\modules\standard\mod_alias.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - -DEP_CPP_MOD_AL=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - -DEP_CPP_MOD_AL=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\mod_alias.obj" "$(INTDIR)\mod_alias.sbr" : $(SOURCE)\ - $(DEP_CPP_MOD_AL) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\modules\standard\mod_asis.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - -DEP_CPP_MOD_AS=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_script.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - -DEP_CPP_MOD_AS=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_script.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ +NODEP_CPP_HTTP_P=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\mod_asis.obj" "$(INTDIR)\mod_asis.sbr" : $(SOURCE) $(DEP_CPP_MOD_AS)\ - "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\modules\standard\mod_auth.c - !IF "$(CFG)" == "ApacheCore - Win32 Release" -DEP_CPP_MOD_AU=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - - -"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - -DEP_CPP_MOD_AU=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - -"$(INTDIR)\mod_auth.obj" "$(INTDIR)\mod_auth.sbr" : $(SOURCE) $(DEP_CPP_MOD_AU)\ - "$(INTDIR)" +"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -SOURCE=.\modules\standard\mod_autoindex.c -!IF "$(CFG)" == "ApacheCore - Win32 Release" +"$(INTDIR)\http_protocol.obj" "$(INTDIR)\http_protocol.sbr" : $(SOURCE)\ + $(DEP_CPP_HTTP_P) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) -DEP_CPP_MOD_AUT=\ + +!ENDIF + +SOURCE=.\main\http_request.c +DEP_CPP_HTTP_R=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ - ".\include\fnmatch.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ ".\include\http_core.h"\ @@ -1770,47 +867,65 @@ ".\include\http_protocol.h"\ ".\include\http_request.h"\ ".\include\httpd.h"\ - ".\include\util_script.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ ".\lib\apr\include\apr_file_io.h"\ + ".\lib\apr\include\apr_fnmatch.h"\ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ ".\lib\apr\include\apr_network_io.h"\ ".\lib\apr\include\apr_portable.h"\ ".\lib\apr\include\apr_thread_proc.h"\ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_HTTP_R=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ + ".\main\scoreboard.h"\ -"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_AUT=\ + +"$(INTDIR)\http_request.obj" "$(INTDIR)\http_request.sbr" : $(SOURCE)\ + $(DEP_CPP_HTTP_R) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=.\main\http_vhost.c +DEP_CPP_HTTP_V=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ - ".\include\fnmatch.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ ".\include\http_core.h"\ ".\include\http_log.h"\ - ".\include\http_main.h"\ ".\include\http_protocol.h"\ - ".\include\http_request.h"\ + ".\include\http_vhost.h"\ ".\include\httpd.h"\ - ".\include\util_script.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ @@ -1818,307 +933,348 @@ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ ".\lib\apr\include\apr_network_io.h"\ ".\lib\apr\include\apr_portable.h"\ ".\lib\apr\include\apr_thread_proc.h"\ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_HTTP_V=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\mod_autoindex.obj" "$(INTDIR)\mod_autoindex.sbr" : $(SOURCE)\ - $(DEP_CPP_MOD_AUT) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\http_vhost.obj" : $(SOURCE) $(DEP_CPP_HTTP_V) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -SOURCE=.\modules\standard\mod_cgi.c -!IF "$(CFG)" == "ApacheCore - Win32 Release" +"$(INTDIR)\http_vhost.obj" "$(INTDIR)\http_vhost.sbr" : $(SOURCE)\ + $(DEP_CPP_HTTP_V) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) -DEP_CPP_MOD_C=\ + +!ENDIF + +SOURCE=.\main\iol_file.c +DEP_CPP_IOL_F=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ - ".\include\http_conf_globals.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ ".\include\httpd.h"\ - ".\include\util_script.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ ".\lib\apr\include\apr_file_io.h"\ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_IOL_F=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\iol_file.obj" : $(SOURCE) $(DEP_CPP_IOL_F) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_C=\ + +"$(INTDIR)\iol_file.obj" "$(INTDIR)\iol_file.sbr" : $(SOURCE) $(DEP_CPP_IOL_F)\ + "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=.\os\win32\iol_socket.c +DEP_CPP_IOL_S=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ - ".\include\http_conf_globals.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ ".\include\httpd.h"\ - ".\include\util_script.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ ".\lib\apr\include\apr_file_io.h"\ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ + ".\os\win32\iol_socket.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_IOL_S=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\mod_cgi.obj" "$(INTDIR)\mod_cgi.sbr" : $(SOURCE) $(DEP_CPP_MOD_C)\ - "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\iol_socket.obj" : $(SOURCE) $(DEP_CPP_IOL_S) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -SOURCE=.\modules\standard\mod_dir.c -!IF "$(CFG)" == "ApacheCore - Win32 Release" +"$(INTDIR)\iol_socket.obj" "$(INTDIR)\iol_socket.sbr" : $(SOURCE)\ + $(DEP_CPP_IOL_S) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) -DEP_CPP_MOD_D=\ + +!ENDIF + +SOURCE=.\main\listen.c +DEP_CPP_LISTE=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ + ".\include\ap_listen.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ - ".\include\http_core.h"\ ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ ".\include\httpd.h"\ - ".\include\util_script.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ ".\lib\apr\include\apr_file_io.h"\ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_LISTE=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\listen.obj" : $(SOURCE) $(DEP_CPP_LISTE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_D=\ + +"$(INTDIR)\listen.obj" "$(INTDIR)\listen.sbr" : $(SOURCE) $(DEP_CPP_LISTE)\ + "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=.\modules\standard\mod_access.c +DEP_CPP_MOD_A=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ ".\include\http_core.h"\ ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ ".\include\http_request.h"\ ".\include\httpd.h"\ - ".\include\util_script.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ ".\lib\apr\include\apr_file_io.h"\ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_A=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\mod_dir.obj" "$(INTDIR)\mod_dir.sbr" : $(SOURCE) $(DEP_CPP_MOD_D)\ - "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -SOURCE=.\modules\standard\mod_env.c -!IF "$(CFG)" == "ApacheCore - Win32 Release" +"$(INTDIR)\mod_access.obj" "$(INTDIR)\mod_access.sbr" : $(SOURCE)\ + $(DEP_CPP_MOD_A) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) -DEP_CPP_MOD_E=\ + +!ENDIF + +SOURCE=.\modules\standard\mod_actions.c +DEP_CPP_MOD_AC=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ ".\include\http_request.h"\ ".\include\httpd.h"\ + ".\include\util_script.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ ".\lib\apr\include\apr_file_io.h"\ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ + ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ + ".\lib\apr\include\apr_network_io.h"\ + ".\lib\apr\include\apr_portable.h"\ + ".\lib\apr\include\apr_thread_proc.h"\ + ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ +NODEP_CPP_MOD_AC=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ + -"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - -DEP_CPP_MOD_E=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - -"$(INTDIR)\mod_env.obj" "$(INTDIR)\mod_env.sbr" : $(SOURCE) $(DEP_CPP_MOD_E)\ - "$(INTDIR)" + +"$(INTDIR)\mod_actions.obj" "$(INTDIR)\mod_actions.sbr" : $(SOURCE)\ + $(DEP_CPP_MOD_AC) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF - -SOURCE=.\modules\standard\mod_imap.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" -DEP_CPP_MOD_I=\ +SOURCE=.\modules\standard\mod_alias.c +DEP_CPP_MOD_AL=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ ".\include\http_request.h"\ ".\include\httpd.h"\ - ".\include\util_script.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ ".\lib\apr\include\apr_file_io.h"\ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ +NODEP_CPP_MOD_AL=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ + -"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_I=\ + +"$(INTDIR)\mod_alias.obj" "$(INTDIR)\mod_alias.sbr" : $(SOURCE)\ + $(DEP_CPP_MOD_AL) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=.\modules\standard\mod_asis.c +DEP_CPP_MOD_AS=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ - ".\include\http_core.h"\ ".\include\http_log.h"\ ".\include\http_main.h"\ ".\include\http_protocol.h"\ @@ -2132,39 +1288,55 @@ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ ".\lib\apr\include\apr_network_io.h"\ ".\lib\apr\include\apr_portable.h"\ ".\lib\apr\include\apr_thread_proc.h"\ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ +NODEP_CPP_MOD_AS=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ + -"$(INTDIR)\mod_imap.obj" "$(INTDIR)\mod_imap.sbr" : $(SOURCE) $(DEP_CPP_MOD_I)\ - "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -SOURCE=.\modules\standard\mod_log_config.c -!IF "$(CFG)" == "ApacheCore - Win32 Release" +"$(INTDIR)\mod_asis.obj" "$(INTDIR)\mod_asis.sbr" : $(SOURCE) $(DEP_CPP_MOD_AS)\ + "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) -DEP_CPP_MOD_L=\ + +!ENDIF + +SOURCE=.\modules\standard\mod_auth.c +DEP_CPP_MOD_AU=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ ".\include\http_core.h"\ ".\include\http_log.h"\ ".\include\http_protocol.h"\ + ".\include\http_request.h"\ ".\include\httpd.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ @@ -2173,139 +1345,175 @@ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_md5.h"\ + ".\lib\apr\include\apr_mmap.h"\ ".\lib\apr\include\apr_network_io.h"\ ".\lib\apr\include\apr_portable.h"\ ".\lib\apr\include\apr_thread_proc.h"\ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_AU=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_L=\ + +"$(INTDIR)\mod_auth.obj" "$(INTDIR)\mod_auth.sbr" : $(SOURCE) $(DEP_CPP_MOD_AU)\ + "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=.\modules\standard\mod_autoindex.c +DEP_CPP_MOD_AUT=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ ".\include\http_core.h"\ ".\include\http_log.h"\ + ".\include\http_main.h"\ ".\include\http_protocol.h"\ + ".\include\http_request.h"\ ".\include\httpd.h"\ + ".\include\util_script.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ ".\lib\apr\include\apr_file_io.h"\ + ".\lib\apr\include\apr_fnmatch.h"\ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ ".\lib\apr\include\apr_network_io.h"\ ".\lib\apr\include\apr_portable.h"\ ".\lib\apr\include\apr_thread_proc.h"\ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_AUT=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\mod_log_config.obj" "$(INTDIR)\mod_log_config.sbr" : $(SOURCE)\ - $(DEP_CPP_MOD_L) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -SOURCE=.\modules\standard\mod_mime.c -!IF "$(CFG)" == "ApacheCore - Win32 Release" +"$(INTDIR)\mod_autoindex.obj" "$(INTDIR)\mod_autoindex.sbr" : $(SOURCE)\ + $(DEP_CPP_MOD_AUT) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) -DEP_CPP_MOD_M=\ + +!ENDIF + +SOURCE=.\modules\standard\mod_cgi.c +DEP_CPP_MOD_C=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ ".\include\http_config.h"\ + ".\include\http_core.h"\ ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ ".\include\http_request.h"\ ".\include\httpd.h"\ + ".\include\util_script.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ ".\lib\apr\include\apr_file_io.h"\ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ + ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ + ".\lib\apr\include\apr_network_io.h"\ + ".\lib\apr\include\apr_portable.h"\ + ".\lib\apr\include\apr_thread_proc.h"\ + ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_C=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_M=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_log.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - -"$(INTDIR)\mod_mime.obj" "$(INTDIR)\mod_mime.sbr" : $(SOURCE) $(DEP_CPP_MOD_M)\ +"$(INTDIR)\mod_cgi.obj" "$(INTDIR)\mod_cgi.sbr" : $(SOURCE) $(DEP_CPP_MOD_C)\ "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF - -SOURCE=.\modules\standard\mod_negotiation.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" -DEP_CPP_MOD_N=\ +SOURCE=.\modules\standard\mod_dir.c +DEP_CPP_MOD_D=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ ".\include\http_core.h"\ ".\include\http_log.h"\ + ".\include\http_main.h"\ ".\include\http_protocol.h"\ ".\include\http_request.h"\ ".\include\httpd.h"\ @@ -2317,78 +1525,106 @@ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ ".\lib\apr\include\apr_network_io.h"\ ".\lib\apr\include\apr_portable.h"\ ".\lib\apr\include\apr_thread_proc.h"\ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_D=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_N=\ + +"$(INTDIR)\mod_dir.obj" "$(INTDIR)\mod_dir.sbr" : $(SOURCE) $(DEP_CPP_MOD_D)\ + "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=.\modules\standard\mod_env.c +DEP_CPP_MOD_E=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_protocol.h"\ ".\include\http_request.h"\ ".\include\httpd.h"\ - ".\include\util_script.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ ".\lib\apr\include\apr_file_io.h"\ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_E=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\mod_negotiation.obj" "$(INTDIR)\mod_negotiation.sbr" : $(SOURCE)\ - $(DEP_CPP_MOD_N) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -SOURCE=.\modules\standard\mod_setenvif.c -!IF "$(CFG)" == "ApacheCore - Win32 Release" +"$(INTDIR)\mod_env.obj" "$(INTDIR)\mod_env.sbr" : $(SOURCE) $(DEP_CPP_MOD_E)\ + "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) -DEP_CPP_MOD_S=\ + +!ENDIF + +SOURCE=.\modules\standard\mod_imap.c +DEP_CPP_MOD_I=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ ".\include\http_core.h"\ ".\include\http_log.h"\ + ".\include\http_main.h"\ ".\include\http_protocol.h"\ + ".\include\http_request.h"\ ".\include\httpd.h"\ + ".\include\util_script.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ @@ -2396,28 +1632,48 @@ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ ".\lib\apr\include\apr_network_io.h"\ ".\lib\apr\include\apr_portable.h"\ ".\lib\apr\include\apr_thread_proc.h"\ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_I=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" + +"$(INTDIR)\mod_imap.obj" "$(INTDIR)\mod_imap.sbr" : $(SOURCE) $(DEP_CPP_MOD_I)\ + "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +!ENDIF -DEP_CPP_MOD_S=\ +SOURCE=.\modules\standard\mod_log_config.c +DEP_CPP_MOD_L=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ @@ -2432,36 +1688,52 @@ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ ".\lib\apr\include\apr_network_io.h"\ ".\lib\apr\include\apr_portable.h"\ ".\lib\apr\include\apr_thread_proc.h"\ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_L=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\mod_setenvif.obj" "$(INTDIR)\mod_setenvif.sbr" : $(SOURCE)\ - $(DEP_CPP_MOD_S) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -SOURCE=.\modules\standard\mod_userdir.c -!IF "$(CFG)" == "ApacheCore - Win32 Release" +"$(INTDIR)\mod_log_config.obj" "$(INTDIR)\mod_log_config.sbr" : $(SOURCE)\ + $(DEP_CPP_MOD_L) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) -DEP_CPP_MOD_U=\ + +!ENDIF + +SOURCE=.\modules\standard\mod_mime.c +DEP_CPP_MOD_M=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ + ".\include\http_log.h"\ ".\include\http_request.h"\ ".\include\httpd.h"\ ".\include\util_uri.h"\ @@ -2472,59 +1744,105 @@ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_M=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_U=\ + +"$(INTDIR)\mod_mime.obj" "$(INTDIR)\mod_mime.sbr" : $(SOURCE) $(DEP_CPP_MOD_M)\ + "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=.\modules\standard\mod_negotiation.c +DEP_CPP_MOD_N=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_protocol.h"\ ".\include\http_request.h"\ ".\include\httpd.h"\ + ".\include\util_script.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ ".\lib\apr\include\apr_file_io.h"\ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ + ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ + ".\lib\apr\include\apr_network_io.h"\ + ".\lib\apr\include\apr_portable.h"\ + ".\lib\apr\include\apr_thread_proc.h"\ + ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_N=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\mod_userdir.obj" "$(INTDIR)\mod_userdir.sbr" : $(SOURCE)\ - $(DEP_CPP_MOD_U) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -SOURCE=.\os\win32\modules.c -!IF "$(CFG)" == "ApacheCore - Win32 Release" +"$(INTDIR)\mod_negotiation.obj" "$(INTDIR)\mod_negotiation.sbr" : $(SOURCE)\ + $(DEP_CPP_MOD_N) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) -DEP_CPP_MODUL=\ + +!ENDIF + +SOURCE=.\modules\standard\mod_setenvif.c +DEP_CPP_MOD_S=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_protocol.h"\ ".\include\httpd.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ @@ -2532,27 +1850,53 @@ ".\lib\apr\include\apr_file_io.h"\ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ + ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ + ".\lib\apr\include\apr_network_io.h"\ + ".\lib\apr\include\apr_portable.h"\ + ".\lib\apr\include\apr_thread_proc.h"\ + ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ +NODEP_CPP_MOD_S=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ + -"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MODUL=\ + +"$(INTDIR)\mod_setenvif.obj" "$(INTDIR)\mod_setenvif.sbr" : $(SOURCE)\ + $(DEP_CPP_MOD_S) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=.\modules\standard\mod_userdir.c +DEP_CPP_MOD_U=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ + ".\include\http_request.h"\ ".\include\httpd.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ @@ -2562,51 +1906,44 @@ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ - -"$(INTDIR)\modules.obj" "$(INTDIR)\modules.sbr" : $(SOURCE) $(DEP_CPP_MODUL)\ - "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\os\win32\readdir.c -DEP_CPP_READD=\ - ".\os\win32\readdir.h"\ +NODEP_CPP_MOD_U=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ !IF "$(CFG)" == "ApacheCore - Win32 Release" -"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)" +"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -"$(INTDIR)\readdir.obj" "$(INTDIR)\readdir.sbr" : $(SOURCE) $(DEP_CPP_READD)\ - "$(INTDIR)" +"$(INTDIR)\mod_userdir.obj" "$(INTDIR)\mod_userdir.sbr" : $(SOURCE)\ + $(DEP_CPP_MOD_U) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF - -SOURCE=.\os\win32\registry.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" -DEP_CPP_REGIS=\ +SOURCE=.\os\win32\modules.c +DEP_CPP_MODUL=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ + ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ - ".\include\http_log.h"\ + ".\include\http_config.h"\ ".\include\httpd.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ @@ -2616,147 +1953,105 @@ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MODUL=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\lib\apr\include\apr_config.h"\ + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + -"$(INTDIR)\registry.obj" : $(SOURCE) $(DEP_CPP_REGIS) "$(INTDIR)" +"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_REGIS=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_log.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - -"$(INTDIR)\registry.obj" "$(INTDIR)\registry.sbr" : $(SOURCE) $(DEP_CPP_REGIS)\ +"$(INTDIR)\modules.obj" "$(INTDIR)\modules.sbr" : $(SOURCE) $(DEP_CPP_MODUL)\ "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF -SOURCE=.\main\rfc1413.c +SOURCE=.\os\win32\readdir.c +DEP_CPP_READD=\ + ".\os\win32\readdir.h"\ + {$(INCLUDE)}"sys\types.h"\ + !IF "$(CFG)" == "ApacheCore - Win32 Release" -DEP_CPP_RFC14=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\httpd.h"\ - ".\include\rfc1413.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - -"$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)" +"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_RFC14=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\httpd.h"\ - ".\include\rfc1413.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - -"$(INTDIR)\rfc1413.obj" "$(INTDIR)\rfc1413.sbr" : $(SOURCE) $(DEP_CPP_RFC14)\ +"$(INTDIR)\readdir.obj" "$(INTDIR)\readdir.sbr" : $(SOURCE) $(DEP_CPP_READD)\ "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF -SOURCE=.\main\util.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - -DEP_CPP_UTIL_=\ +SOURCE=.\main\rfc1413.c +DEP_CPP_RFC14=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_log.h"\ ".\include\http_main.h"\ - ".\include\http_protocol.h"\ ".\include\httpd.h"\ + ".\include\rfc1413.h"\ ".\include\util_uri.h"\ ".\lib\apr\file_io\win32\readdir.h"\ ".\lib\apr\include\apr_errno.h"\ ".\lib\apr\include\apr_file_io.h"\ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ - ".\main\test_char.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_RFC14=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ -"$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" + +"$(INTDIR)\rfc1413.obj" "$(INTDIR)\rfc1413.sbr" : $(SOURCE) $(DEP_CPP_RFC14)\ + "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=.\main\util.c DEP_CPP_UTIL_=\ ".\include\ap.h"\ ".\include\ap_config.h"\ @@ -2764,7 +2059,6 @@ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_log.h"\ @@ -2778,6 +2072,7 @@ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ ".\lib\apr\include\apr_network_io.h"\ ".\lib\apr\include\apr_portable.h"\ ".\lib\apr\include\apr_thread_proc.h"\ @@ -2785,8 +2080,26 @@ ".\lib\apr\include\apr_win.h"\ ".\main\test_char.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_UTIL_=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" + + "$(INTDIR)\util.obj" "$(INTDIR)\util.sbr" : $(SOURCE) $(DEP_CPP_UTIL_)\ "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) @@ -2795,9 +2108,6 @@ !ENDIF SOURCE=.\main\util_date.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_UTIL_D=\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ @@ -2805,22 +2115,23 @@ ".\include\hsregex.h"\ ".\include\util_date.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_UTIL_D=\ + ".\include\ap_config_auto.h"\ + ".\include\os.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_UTIL_D=\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_mmn.h"\ - ".\include\hsregex.h"\ - ".\include\util_date.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\util_date.obj" "$(INTDIR)\util_date.sbr" : $(SOURCE)\ $(DEP_CPP_UTIL_D) "$(INTDIR)" @@ -2830,9 +2141,6 @@ !ENDIF SOURCE=.\main\util_md5.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_UTIL_M=\ ".\include\ap.h"\ ".\include\ap_config.h"\ @@ -2840,7 +2148,6 @@ ".\include\ap_iol.h"\ ".\include\ap_md5.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\httpd.h"\ @@ -2858,40 +2165,25 @@ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_UTIL_M=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_UTIL_M=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_md5.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\httpd.h"\ - ".\include\util_md5.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\util_md5.obj" "$(INTDIR)\util_md5.sbr" : $(SOURCE) $(DEP_CPP_UTIL_M)\ "$(INTDIR)" @@ -2901,9 +2193,6 @@ !ENDIF SOURCE=.\main\util_script.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_UTIL_S=\ ".\include\ap.h"\ ".\include\ap_config.h"\ @@ -2911,7 +2200,6 @@ ".\include\ap_hooks.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ @@ -2930,53 +2218,32 @@ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_lock.h"\ + ".\lib\apr\include\apr_mmap.h"\ ".\lib\apr\include\apr_network_io.h"\ ".\lib\apr\include\apr_portable.h"\ ".\lib\apr\include\apr_thread_proc.h"\ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_UTIL_S=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_UTIL_S=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_date.h"\ - ".\include\util_script.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\util_script.obj" "$(INTDIR)\util_script.sbr" : $(SOURCE)\ $(DEP_CPP_UTIL_S) "$(INTDIR)" @@ -2986,16 +2253,12 @@ !ENDIF SOURCE=.\main\util_uri.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_UTIL_U=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_log.h"\ @@ -3009,7 +2272,18 @@ ".\lib\apr\include\apr_win.h"\ ".\main\uri_delims.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ +NODEP_CPP_UTIL_U=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ + + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + "$(INTDIR)\util_uri.obj" : $(SOURCE) $(DEP_CPP_UTIL_U) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) @@ -3017,27 +2291,6 @@ !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_UTIL_U=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_log.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\main\uri_delims.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\util_uri.obj" "$(INTDIR)\util_uri.sbr" : $(SOURCE) $(DEP_CPP_UTIL_U)\ "$(INTDIR)" @@ -3047,16 +2300,12 @@ !ENDIF SOURCE=.\os\win32\util_win32.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_UTIL_W=\ ".\include\ap.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_iol.h"\ ".\include\ap_mmn.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_log.h"\ @@ -3069,34 +2318,24 @@ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_UTIL_W=\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\lib\apr\include\apr_config.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\util_win32.obj" : $(SOURCE) $(DEP_CPP_UTIL_W) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_UTIL_W=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_log.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\util_win32.obj" "$(INTDIR)\util_win32.sbr" : $(SOURCE)\ $(DEP_CPP_UTIL_W) "$(INTDIR)" @@ -3106,9 +2345,6 @@ !ENDIF SOURCE=.\modules\mpm\winnt\winnt.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_WINNT=\ ".\include\ap.h"\ ".\include\ap_config.h"\ @@ -3118,7 +2354,6 @@ ".\include\ap_listen.h"\ ".\include\ap_mmn.h"\ ".\include\ap_mpm.h"\ - ".\include\apr.h"\ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ @@ -3142,59 +2377,25 @@ ".\modules\mpm\winnt\mpm_default.h"\ ".\os\win32\iol_socket.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_WINNT=\ - ".\os\win32\getopt.h"\ + ".\include\ap_config_auto.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr_config.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\winnt.obj" : $(SOURCE) $(DEP_CPP_WINNT) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_WINNT=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_listen.h"\ - ".\include\ap_mmn.h"\ - ".\include\ap_mpm.h"\ - ".\include\apr.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_connection.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\file_io\win32\readdir.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\modules\mpm\winnt\mpm_default.h"\ - ".\os\win32\iol_socket.h"\ - ".\os\win32\os.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - -NODEP_CPP_WINNT=\ - ".\include\ap_config_auto.h"\ - ".\include\ebcdic.h"\ - ".\include\os.h"\ - ".\lib\apr\include\apr_config.h"\ - "$(INTDIR)\winnt.obj" "$(INTDIR)\winnt.sbr" : $(SOURCE) $(DEP_CPP_WINNT)\ "$(INTDIR)" 1.8 +8 -1 apache-2.0/src/ApacheCore.def Index: ApacheCore.def =================================================================== RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ApacheCore.def 1999/11/05 15:45:05 1.7 +++ ApacheCore.def 1999/12/08 22:33:24 1.8 @@ -222,7 +222,7 @@ ap_send_fd_length @215 ap_send_http_header @216 ap_send_http_trace @217 - ap_send_mmap @218 +; ap_send_mmap @218 ap_send_size @219 ap_server_root_relative @220 ap_set_byterange @221 @@ -368,3 +368,10 @@ ap_hook_fixups @363 regerror @364 ap_send_error_response @365 + ap_start_shutdown @366 +; ap_send_signal @367 + ap_pid_fname @368 + ap_read_config @369 + ap_server_pre_read_config @370 + ap_server_post_read_config @371 + ap_setup_prelinked_modules @372 1.6 +94 -10 apache-2.0/src/os/win32/registry.c Index: registry.c =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/registry.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- registry.c 1999/10/20 19:57:23 1.5 +++ registry.c 1999/12/08 22:33:52 1.6 @@ -1,3 +1,60 @@ +/* ==================================================================== + * Copyright (c) 1995-1999 The Apache Group. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the Apache Group + * for use in the Apache HTTP server project (http://www.apache.org/)." + * + * 4. The names "Apache Server" and "Apache Group" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the Apache Group + * for use in the Apache HTTP server project (http://www.apache.org/)." + * + * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Group and was originally based + * on public domain software written at the National Center for + * Supercomputing Applications, University of Illinois, Urbana-Champaign. + * For more information on the Apache Group and the Apache HTTP server + * project, please see . + * + */ + /* * Functions to handle interacting with the Win32 registry */ @@ -24,9 +81,9 @@ * * HKLM\Software\[Vendor]\[Software]\[Version]\ServerRoot */ - -#include -#include +#include "os.h" +//#include +//#include #include "httpd.h" #include "http_log.h" @@ -180,11 +237,11 @@ rv = RegCloseKey(hKey); if (rv != ERROR_SUCCESS) { - do_error(rv, "RegCloseKey HKLM\\%s", key); - if (retval == 0) { - /* Keep error status from RegQueryValueEx, if any */ - retval = -4; - } + do_error(rv, "RegCloseKey HKLM\\%s", key); + if (retval == 0) { + /* Keep error status from RegQueryValueEx, if any */ + retval = -4; + } } return retval < 0 ? retval : nSize; @@ -197,7 +254,7 @@ * dir will contain an empty string), or -1 if there was * an error getting the key. */ - +#if 0 int ap_registry_get_server_root(ap_context_t *p, char *dir, int size) { int rv; @@ -209,7 +266,19 @@ return (rv < -1) ? -1 : 0; } +#else +int ap_registry_get_server_root(ap_context_t *p, char **buf) +{ + int rv; + rv = ap_registry_get_key_int(p, REGKEY, "ServerRoot", NULL, 0, buf); + if (rv < 0) { + *buf = NULL; + } + + return (rv < -1) ? -1 : 0; +} +#endif char *ap_get_service_key(char *service_name) { char *key = malloc(strlen(SERVICEKEYPRE) + @@ -220,7 +289,7 @@ return(key); } - +#if 0 int ap_registry_get_service_conf(ap_context_t *p, char *dir, int size, char *service_name) { int rv; @@ -234,6 +303,21 @@ free(key); return (rv < -1) ? -1 : 0; } +#else +int ap_registry_get_service_conf(ap_context_t *p, char **buf, char *service_name) +{ + int rv; + char *key = ap_get_service_key(service_name); + + rv = ap_registry_get_key_int(p, key, "ConfPath", NULL, 0, buf); + if (rv < 0) { + *buf = NULL; + } + + free(key); + return (rv < -1) ? -1 : 0; +} +#endif /********************************************************************** * The rest of this file deals with storing keys or values in the registry 1.3 +59 -2 apache-2.0/src/os/win32/registry.h Index: registry.h =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/registry.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- registry.h 1999/08/31 05:35:13 1.2 +++ registry.h 1999/12/08 22:33:58 1.3 @@ -1,8 +1,65 @@ +/* ==================================================================== + * Copyright (c) 1995-1999 The Apache Group. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the Apache Group + * for use in the Apache HTTP server project (http://www.apache.org/)." + * + * 4. The names "Apache Server" and "Apache Group" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the Apache Group + * for use in the Apache HTTP server project (http://www.apache.org/)." + * + * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Group and was originally based + * on public domain software written at the National Center for + * Supercomputing Applications, University of Illinois, Urbana-Champaign. + * For more information on the Apache Group and the Apache HTTP server + * project, please see . + * + */ + /* * Declarations for users of the functions defined in registry.c */ -extern int ap_registry_get_server_root(ap_context_t *p, char *dir, int size); +extern int ap_registry_get_server_root(ap_context_t *p, char **buf); extern int ap_registry_set_server_root(char *dir); -extern int ap_registry_get_service_conf(ap_context_t *p, char *dir, int size, char *service_name); +extern int ap_registry_get_service_conf(ap_context_t *p, char **buf, char *service_name); extern int ap_registry_set_service_conf(char *dir, char *service_name); 1.2 +82 -28 apache-2.0/src/os/win32/service.c Index: service.c =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/service.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- service.c 1999/08/24 06:45:42 1.1 +++ service.c 1999/12/08 22:34:02 1.2 @@ -1,16 +1,70 @@ +/* ==================================================================== + * Copyright (c) 1995-1999 The Apache Group. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the Apache Group + * for use in the Apache HTTP server project (http://www.apache.org/)." + * + * 4. The names "Apache Server" and "Apache Group" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the Apache Group + * for use in the Apache HTTP server project (http://www.apache.org/)." + * + * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Group and was originally based + * on public domain software written at the National Center for + * Supercomputing Applications, University of Illinois, Urbana-Champaign. + * For more information on the Apache Group and the Apache HTTP server + * project, please see . + * + */ + #ifdef WIN32 -#include -#include +#include "os.h" #include -#include #include #include "httpd.h" #include "http_conf_globals.h" #include "http_log.h" #include "http_main.h" -#include "multithread.h" #include "service.h" #include "registry.h" @@ -41,14 +95,14 @@ }; globdat.main_fn = main_fn; - globdat.stop_event = create_event(0, 0, "apache-signal"); + globdat.stop_event = CreateEvent(NULL, 0, 0, "apache-signal"); globdat.connected = 1; if(!StartServiceCtrlDispatcher(dispatchTable)) { /* This is a genuine failure of the SCM. */ - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "Error starting service control dispatcher"); + ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), NULL, + "Error starting service control dispatcher"); return(globdat.exit_status); } else @@ -72,7 +126,7 @@ if(!(globdat.hServiceStatus = RegisterServiceCtrlHandler( globdat.name, service_ctrl))) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, + ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), NULL, "Failure registering service handler"); return; } @@ -83,7 +137,7 @@ 3000); // wait hint service_cd(); - if( service_init() ) +// if( service_init() ) /* Arguments are ok except for \! */ globdat.exit_status = (*globdat.main_fn)( argc, argv ); @@ -197,7 +251,7 @@ if (GetModuleFileName( NULL, szPath, 512 ) == 0) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, + ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), NULL, "GetModuleFileName failed"); return; } @@ -210,8 +264,8 @@ SC_MANAGER_ALL_ACCESS // access required ); if (!schSCManager) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "OpenSCManager failed"); + ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), NULL, + "OpenSCManager failed"); } else { schService = CreateService( @@ -237,8 +291,8 @@ printf("The %s service has been installed successfully.\n", service_name ); } else { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "CreateService failed"); + ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), NULL, + "CreateService failed"); } CloseServiceHandle(schSCManager); @@ -259,15 +313,15 @@ SC_MANAGER_ALL_ACCESS // access required ); if (!schSCManager) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "OpenSCManager failed"); + ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), NULL, + "OpenSCManager failed"); } else { schService = OpenService(schSCManager, service_name, SERVICE_ALL_ACCESS); if (schService == NULL) { /* Could not open the service */ - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, + ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), NULL, "OpenService failed"); } else { @@ -276,8 +330,8 @@ // now remove the service if (DeleteService(schService) == 0) - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "DeleteService failed"); + ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), NULL, + "DeleteService failed"); else printf("The %s service has been removed successfully.\n", service_name ); CloseServiceHandle(schService); @@ -307,8 +361,8 @@ int Err; if (!(schSCM = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS))) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "OpenSCManager failed"); + ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), NULL, + "OpenSCManager failed"); return FALSE; } @@ -320,8 +374,8 @@ Err = GetLastError(); if (Err != ERROR_SERVICE_DOES_NOT_EXIST && Err != ERROR_INVALID_NAME) - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "OpenService failed"); + ap_log_error(APLOG_MARK, APLOG_ERR, Err, NULL, + "OpenService failed"); return FALSE; } @@ -351,20 +405,20 @@ SC_MANAGER_ALL_ACCESS // access required ); if (!schSCManager) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "OpenSCManager failed"); + ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), NULL, + "OpenSCManager failed"); } else { schService = OpenService(schSCManager, service_name, SERVICE_ALL_ACCESS); if (schService == NULL) { /* Could not open the service */ - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "OpenService failed"); + ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), NULL, + "OpenService failed"); } else { if (!QueryServiceStatus(schService, &globdat.ssStatus)) - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, + ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), NULL, "QueryService failed"); else { if (globdat.ssStatus.dwCurrentState == SERVICE_STOPPED && action == stop) 1.2 +421 -0 apache-2.0/src/os/win32/main_win32.c Index: main_win32.c =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/main_win32.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- main_win32.c 1999/08/24 06:45:39 1.1 +++ main_win32.c 1999/12/08 22:34:09 1.2 @@ -1,3 +1,60 @@ +/* ==================================================================== + * Copyright (c) 1995-1999 The Apache Group. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the Apache Group + * for use in the Apache HTTP server project (http://www.apache.org/)." + * + * 4. The names "Apache Server" and "Apache Group" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the Apache Group + * for use in the Apache HTTP server project (http://www.apache.org/)." + * + * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Group and was originally based + * on public domain software written at the National Center for + * Supercomputing Applications, University of Illinois, Urbana-Champaign. + * For more information on the Apache Group and the Apache HTTP server + * project, please see . + * + */ + /* main_win32.c - Apache executable stub file for Win32 * This file's purpose in life is to load, and call the * "real" main function, apache_main(), located in ApacheCore.dll @@ -8,9 +65,373 @@ * satistifies that requirement. */ +#include "httpd.h" +#include "http_config.h" /* ap_server_root_relative */ +#include "apr_getopt.h" +#include "service.h" +#include "http_log.h" +#include "registry.h" + __declspec(dllexport) int apache_main(int argc, char *argv[]); +#define DEFAULTSERVICENAME "Apache" + +#if 0 +API_VAR_IMPORT int ap_optreset; +API_VAR_IMPORT char *ap_optarg; +API_VAR_IMPORT int ap_optind; +#endif +API_VAR_IMPORT char *ap_pid_fname; /* Need to read the config first */ +API_VAR_IMPORT char *ap_server_root; +API_VAR_IMPORT ap_array_header_t *ap_server_pre_read_config; +API_VAR_IMPORT ap_array_header_t *ap_server_post_read_config; +#if 0 +static int send_signal(ap_context_t *p, char *signal) +{ + HANDLE event; + char prefix[20]; + char *EventName; + FILE *fp; + int nread; + char *fname; + int end; + + printf("signal = %s\n", signal); + + fname = ap_server_root_relative (p, ap_pid_fname); + + fp = fopen(fname, "r"); + if (!fp) { + printf("Cannot read apache PID file %s. Error = %d\n", fname, errno); + return FALSE; + } + prefix[0] = 'a'; + prefix[1] = 'p'; + + nread = fread(prefix+2, 1, sizeof(prefix)-3, fp); + if (nread == 0) { + fclose(fp); + printf("PID file %s was empty\n", fname); + return FALSE; + } + fclose(fp); + + /* Terminate the prefix string */ + end = 2 + nread - 1; + while (end > 0 && (prefix[end] == '\r' || prefix[end] == '\n')) + end--; + prefix[end + 1] = '\0'; + + /* Build the event name. Should be one of the following... + * apPID_shutdown + * apPID_restart + */ + EventName = ap_pstrcat(p,prefix,"_",signal,NULL); + printf("event name = %s\n", EventName); + event = OpenEvent(EVENT_ALL_ACCESS, FALSE, EventName); + printf("event handle = %d\n", event); + if (event == NULL) { + printf("Unknown signal name \"%s\". Use either shutdown or restart.\n", + signal); + return FALSE; + } + SetEvent(event); + ResetEvent(event); + CloseHandle(event); + return TRUE; +} +#else +static int send_signal(ap_context_t *p, char *signal) +{ + HANDLE event; + char prefix[20]; + char *EventName; + FILE *fp; + int nread; + char *fname; + int end; + + printf("signal = %s\n", signal); + + fname = "e:/apache/logs/httpd.pid"; + + fp = fopen(fname, "r"); + if (!fp) { + printf("Cannot read apache PID file %s. Error = %d\n", fname, errno); + return FALSE; + } + prefix[0] = 'a'; + prefix[1] = 'p'; + nread = fread(prefix+2, 1, sizeof(prefix)-3, fp); + if (nread == 0) { + fclose(fp); + printf("PID file %s was empty\n", fname); + return FALSE; + } + fclose(fp); + + /* Terminate the prefix string */ + end = 2 + nread - 1; + while (end > 0 && (prefix[end] == '\r' || prefix[end] == '\n')) + end--; + prefix[end + 1] = '\0'; + + /* Build the event name. Should be one of the following... + * apPID_shutdown + * apPID_restart + */ + EventName = ap_pstrcat(p,prefix,"_",signal,NULL); + printf("event name = %s\n", EventName); + event = OpenEvent(EVENT_ALL_ACCESS, FALSE, EventName); + printf("event handle = %d\n", event); + if (event == NULL) { + printf("Unknown signal name \"%s\". Use either shutdown or restart.\n", + signal); + return FALSE; + } + SetEvent(event); + ResetEvent(event); + CloseHandle(event); + return TRUE; +} +#endif +int service_init() +{ +/* + common_init(); + + ap_cpystrn(ap_server_root, HTTPD_ROOT, sizeof(ap_server_root)); + if (ap_registry_get_service_conf(pconf, ap_server_confname, sizeof(ap_server_confname), + ap_server_argv0)) + return FALSE; + + ap_setup_prelinked_modules(); + server_conf = ap_read_config(pconf, ptrans, ap_server_confname); + ap_log_pid(pconf, ap_pid_fname); + post_parse_init(); +*/ + return TRUE; +} +#if 0 int main(int argc, char *argv[]) { return apache_main(argc, argv); } +#else +int main(int argc, char *argv[]) +{ + ap_context_t *pwincmd; + int c; + char *ch; + char *service_name = NULL; //DEFAULTSERVICENAME; + char *tmp_server_root = NULL; + char *signal_to_send = NULL; + char *server_confname = NULL; + char cwd[MAX_STRING_LEN]; + char **new; + + BOOLEAN install = FALSE; + BOOLEAN uninstall = FALSE; + BOOLEAN k = FALSE; + BOOLEAN n = FALSE; + BOOLEAN d = FALSE; + BOOLEAN f = FALSE; + + ap_array_header_t *table; + int new_argc = 0; + + ap_create_context(&pwincmd, NULL); + if (pwincmd == NULL) { +// printf(stderr,""); + exit(0); + } + + /* Set up default ap_server_root (do we need HTTPD_ROOT? I think not...) */ + if (!GetCurrentDirectory(sizeof(cwd),cwd)) { + ap_log_error(APLOG_MARK,APLOG_ERR, GetLastError(), NULL, "GetCurrentDirectory() failure"); + exit(0); + } + ap_server_root = ap_os_canonical_filename(pwincmd, cwd); + + table = ap_make_array(pwincmd, 1, sizeof(char *)); + + /* Add the new_argv[0] */ + new = (char **) ap_push_array(table); + *new = argv[0]; + new_argc++; + + /* Service application + * Configuration file in registry at: + * HKLM\System\CurrentControlSet\Services\[Svc name]\Parameters\ConfPath + */ + if (isProcessService()) { + /* Fetch server_conf from the registry + * Rebuild argv and argc adding the -d server_root and -f server_conf then + * call service_main + */ + int i; + ap_registry_get_service_conf(pwincmd, &server_confname, argv[0]); + for (i = 0; i < argc ; i++) { + new = (char **) ap_push_array(table); + *new = argv[i]; + } + /* Add server_confname to the argument list */ + new = (char **) ap_push_array(table); + *new = "-f"; + new = (char **) ap_push_array(table); + *new = server_confname; + new = (char **) ap_push_array(table); + *new = "-d"; + new = (char **) ap_push_array(table); + *new = ap_server_root; + argc += 4; + apache_main(new_argc, (char**) table->elts); + exit(0); + } + + /* Munch away at the command line arguments... */ + while (ap_getopt(pwincmd, argc, argv, "n:k:iuC:c:d:f:vVlLth", &c) == APR_SUCCESS) { + switch (c) { + case 'k': + signal_to_send = ap_pstrdup(pwincmd, ap_optarg); + break; + case 'i': + install = TRUE; + break; + case 'u': + uninstall = TRUE; + break; + case 'n': + service_name = ap_pstrdup(pwincmd, ap_optarg); + if (isValidService(ap_optarg)) { + ap_registry_get_service_conf(pwincmd, &server_confname, ap_optarg); + } + break; + case 'f': + server_confname = ap_optarg; + f = TRUE; + break; + case 'd': + ap_server_root = ap_optarg; + d = TRUE; + break; + default: + new = (char **) ap_push_array(table); + ch = ap_pstrndup(pwincmd, (char*)&c, 1); + *new = ap_pstrcat(pwincmd,"-", ch, NULL); + new_argc++; + if (ap_optarg) { + new = (char **) ap_push_array(table); + *new = ap_optarg; + new_argc++; + } + break; + } + } + + /* Check for conflicting options */ + + /* Determine ap_server_confname. + * ap_server_confname is found in this order: + * (1) -f or -n + * (2) [-d]/SERVER_CONFIG_FILE + * (3) ./SERVER_CONFIG_FILE + * (4) [Registry: HKLM\Software\[product]\ServerRoot]/SERVER_CONFIG_FILE + * (5) /HTTPD_ROOT/SERVER_CONFIG_FILE (Humm, I don't think we should even try this... ) + */ + if (!server_confname) { + server_confname = ap_pstrdup(pwincmd, SERVER_CONFIG_FILE); + if (access(ap_server_root_relative(pwincmd, server_confname), 0)) { + ap_registry_get_server_root(pwincmd, &tmp_server_root); + if (tmp_server_root) + ap_server_root = ap_pstrdup(pwincmd, ap_os_canonical_filename(pwincmd, tmp_server_root)); + else { + /* use default server_root */ + } + } + } + + /* Canonicalize the server_confname */ + if (!ap_os_is_path_absolute(server_confname)) { + char *full_conf_path; + full_conf_path = ap_pstrcat(pwincmd, ap_server_root, "/", server_confname, NULL); + full_conf_path = ap_os_canonical_filename(pwincmd, full_conf_path); + server_confname = full_conf_path; + } + ap_getparents(server_confname); + ap_no2slash(server_confname); + + /* Handle -i (install as a service) */ + if (install) { + if (!service_name) + service_name = DEFAULTSERVICENAME; + InstallService(service_name, server_confname); + exit(0); + } + /* Handle -u (uninstall service) */ + if (uninstall) { + if (!service_name) + service_name = DEFAULTSERVICENAME; + RemoveService(service_name); + exit(0); + } + + /* Handle -k -n */ + if (service_name && signal_to_send) { + send_signal_to_service(service_name, signal_to_send); + exit(0); + } + + /* Handle -k restart|shutdown */ + if (signal_to_send && strcasecmp(signal_to_send, "start")) { + /* Treat -k start confpath as just -f confpath */ +#if 0 + server_rec *server_conf; + process_rec process; + process.pool = pwincmd; + process.pconf = pwincmd; + process.argc = argc; + process.argv = argv; + ap_setup_prelinked_modules(&process); + ap_server_pre_read_config = ap_make_array(pwincmd, 1, sizeof(char *)); + ap_server_post_read_config = ap_make_array(pwincmd, 1, sizeof(char *)); + server_conf = ap_read_config(&process, pwincmd, server_confname); +#endif + send_signal(pwincmd, signal_to_send); + exit(0); + } + + /* Complete building the new argv list. Need to add: + * -f server_conf + * -d server_root + */ + new = (char **) ap_push_array(table); + *new = "-f"; + new = (char **) ap_push_array(table); + *new = server_confname; + new = (char **) ap_push_array(table); + *new = "-d"; + new = (char **) ap_push_array(table); + *new = ap_server_root; + new_argc += 4; + + /* Set optreset and optind to allow ap_getopt to work correctly + * when called from http_main.c + */ + ap_optreset = 1; + ap_optind = 1; + + return apache_main(new_argc, (char**) table->elts); + +/* What is this? */ + /* Console application or a child process. */ +#if 0 + if ((s = strrchr(argv[0], PATHSEPARATOR)) != NULL) { + ap_server_argv0 = ++s; + } + else { + ap_server_argv0 = argv[0]; + } +#endif +} +#endif