stoddard    99/12/20 11:52:53

  Modified:    src      ApacheCore.def Apache.dsp Apache.mak ApacheCore.dsp
                        ApacheCore.mak
               src/modules/mpm/winnt winnt.c
  Log:
  Windows: Can now install/uninstall Apache as a service and start/stop apache 
via
  net start and net stop commands. Not extensively tested, so there may be bugs
  in this still.
  
  Revision  Changes    Path
  1.9       +13 -6     apache-2.0/src/ApacheCore.def
  
  Index: ApacheCore.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ApacheCore.def    1999/12/08 22:33:24     1.8
  +++ ApacheCore.def    1999/12/20 19:52:44     1.9
  @@ -369,9 +369,16 @@
           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
  +        send_signal_to_service  @367
  +        ap_read_config   @368
  +     ap_server_pre_read_config  @369
  +     ap_server_post_read_config @370
  +     ap_setup_prelinked_modules @371
  +     RemoveService @372
  +     InstallService @373
  +     isValidService @374
  +     service_main  @375
  +     isProcessService @376
  +     ap_registry_get_server_root @377
  +     ap_registry_get_service_conf @378
  +
  
  
  
  1.3       +2 -18     apache-2.0/src/Apache.dsp
  
  Index: Apache.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Apache.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Apache.dsp        1999/12/08 22:32:46     1.2
  +++ Apache.dsp        1999/12/20 19:52:45     1.3
  @@ -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 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
  +# 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"
   
  @@ -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 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
  +# 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,26 +88,10 @@
   
   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.3       +9 -80     apache-2.0/src/Apache.mak
  
  Index: Apache.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Apache.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Apache.mak        1999/12/08 22:32:50     1.2
  +++ Apache.mak        1999/12/20 19:52:46     1.3
  @@ -49,8 +49,6 @@
   CLEAN :
        [EMAIL PROTECTED] "$(INTDIR)\apache.res"
        [EMAIL PROTECTED] "$(INTDIR)\main_win32.obj"
  -     [EMAIL PROTECTED] "$(INTDIR)\registry.obj"
  -     [EMAIL PROTECTED] "$(INTDIR)\service.obj"
        [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
        [EMAIL PROTECTED] "$(OUTDIR)\Apache.exe"
   
  @@ -74,9 +72,7 @@
    /out:"$(OUTDIR)\Apache.exe" 
   LINK32_OBJS= \
        "$(INTDIR)\apache.res" \
  -     "$(INTDIR)\main_win32.obj" \
  -     "$(INTDIR)\registry.obj" \
  -     "$(INTDIR)\service.obj"
  +     "$(INTDIR)\main_win32.obj"
   
   "$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -104,8 +100,6 @@
   CLEAN :
        [EMAIL PROTECTED] "$(INTDIR)\apache.res"
        [EMAIL PROTECTED] "$(INTDIR)\main_win32.obj"
  -     [EMAIL PROTECTED] "$(INTDIR)\registry.obj"
  -     [EMAIL PROTECTED] "$(INTDIR)\service.obj"
        [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
        [EMAIL PROTECTED] "$(INTDIR)\vc50.pdb"
        [EMAIL PROTECTED] "$(OUTDIR)\Apache.exe"
  @@ -132,9 +126,7 @@
    /machine:I386 /out:"$(OUTDIR)\Apache.exe" 
   LINK32_OBJS= \
        "$(INTDIR)\apache.res" \
  -     "$(INTDIR)\main_win32.obj" \
  -     "$(INTDIR)\registry.obj" \
  -     "$(INTDIR)\service.obj"
  +     "$(INTDIR)\main_win32.obj"
   
   "$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -178,6 +170,7 @@
   SOURCE=.\os\win32\main_win32.c
   DEP_CPP_MAIN_=\
        ".\include\ap.h"\
  +     ".\include\ap_ac_config.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
        ".\include\ap_hooks.h"\
  @@ -187,13 +180,15 @@
        ".\include\hsregex.h"\
        ".\include\http_config.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_getopt.h"\
        ".\lib\apr\include\apr_lib.h"\
  +     ".\lib\apr\include\apr_thread_proc.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        ".\os\win32\registry.h"\
  @@ -203,79 +198,13 @@
        
   NODEP_CPP_MAIN_=\
        ".\include\ap_config_auto.h"\
  +     ".\include\ap_config_win32.h"\
  +     ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\lib\apr\include\apr_config.h"\
  +     ".\lib\apr\include\apr.h"\
        
   
   "$(INTDIR)\main_win32.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
  -     $(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -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"\
  -     
  -
  -"$(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)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  
  
  
  1.10      +10 -2     apache-2.0/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApacheCore.dsp    1999/12/16 15:46:14     1.9
  +++ ApacheCore.dsp    1999/12/20 19:52:47     1.10
  @@ -44,7 +44,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" 
/YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /D 
"NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I 
".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /YX 
/FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -70,7 +70,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D 
"_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\include" /I 
".\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D 
"WIN32_LEAN_AND_MEAN" /FR /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\include" /I 
".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D 
"WIN32_LEAN_AND_MEAN" /FR /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -222,7 +222,15 @@
   # 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
  +
  +SOURCE=.\os\win32\service.c
   # End Source File
   # Begin Source File
   
  
  
  
  1.11      +1514 -382 apache-2.0/src/ApacheCore.mak
  
  Index: ApacheCore.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.mak,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ApacheCore.mak    1999/12/16 15:46:14     1.10
  +++ ApacheCore.mak    1999/12/20 19:52:47     1.11
  @@ -82,7 +82,9 @@
        [EMAIL PROTECTED] "$(INTDIR)\mod_so.obj"
        [EMAIL PROTECTED] "$(INTDIR)\mod_userdir.obj"
        [EMAIL PROTECTED] "$(INTDIR)\modules.obj"
  +     [EMAIL PROTECTED] "$(INTDIR)\registry.obj"
        [EMAIL PROTECTED] "$(INTDIR)\rfc1413.obj"
  +     [EMAIL PROTECTED] "$(INTDIR)\service.obj"
        [EMAIL PROTECTED] "$(INTDIR)\util.obj"
        [EMAIL PROTECTED] "$(INTDIR)\util_date.obj"
        [EMAIL PROTECTED] "$(INTDIR)\util_md5.obj"
  @@ -98,8 +100,8 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /D\
  - "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN"\
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I\
  + ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN"\
    /Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\CoreR/
   CPP_SBRS=.
  @@ -149,7 +151,9 @@
        "$(INTDIR)\mod_so.obj" \
        "$(INTDIR)\mod_userdir.obj" \
        "$(INTDIR)\modules.obj" \
  +     "$(INTDIR)\registry.obj" \
        "$(INTDIR)\rfc1413.obj" \
  +     "$(INTDIR)\service.obj" \
        "$(INTDIR)\util.obj" \
        "$(INTDIR)\util_date.obj" \
        "$(INTDIR)\util_md5.obj" \
  @@ -244,8 +248,12 @@
        [EMAIL PROTECTED] "$(INTDIR)\mod_userdir.sbr"
        [EMAIL PROTECTED] "$(INTDIR)\modules.obj"
        [EMAIL PROTECTED] "$(INTDIR)\modules.sbr"
  +     [EMAIL PROTECTED] "$(INTDIR)\registry.obj"
  +     [EMAIL PROTECTED] "$(INTDIR)\registry.sbr"
        [EMAIL PROTECTED] "$(INTDIR)\rfc1413.obj"
        [EMAIL PROTECTED] "$(INTDIR)\rfc1413.sbr"
  +     [EMAIL PROTECTED] "$(INTDIR)\service.obj"
  +     [EMAIL PROTECTED] "$(INTDIR)\service.sbr"
        [EMAIL PROTECTED] "$(INTDIR)\util.obj"
        [EMAIL PROTECTED] "$(INTDIR)\util.sbr"
        [EMAIL PROTECTED] "$(INTDIR)\util_date.obj"
  @@ -273,8 +281,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\include" /I 
".\lib\apr\include"\
  - /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" 
/FR"$(INTDIR)\\"\
  - /Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D 
"WIN32_LEAN_AND_MEAN"\
  + /FR"$(INTDIR)\\" /Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\CoreD/
   CPP_SBRS=.\CoreD/
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -312,7 +321,9 @@
        "$(INTDIR)\mod_so.sbr" \
        "$(INTDIR)\mod_userdir.sbr" \
        "$(INTDIR)\modules.sbr" \
  +     "$(INTDIR)\registry.sbr" \
        "$(INTDIR)\rfc1413.sbr" \
  +     "$(INTDIR)\service.sbr" \
        "$(INTDIR)\util.sbr" \
        "$(INTDIR)\util_date.sbr" \
        "$(INTDIR)\util_md5.sbr" \
  @@ -367,7 +378,9 @@
        "$(INTDIR)\mod_so.obj" \
        "$(INTDIR)\mod_userdir.obj" \
        "$(INTDIR)\modules.obj" \
  +     "$(INTDIR)\registry.obj" \
        "$(INTDIR)\rfc1413.obj" \
  +     "$(INTDIR)\service.obj" \
        "$(INTDIR)\util.obj" \
        "$(INTDIR)\util_date.obj" \
        "$(INTDIR)\util_md5.obj" \
  @@ -417,6 +430,9 @@
   !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_ac_config.h"\
  @@ -446,19 +462,36 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.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\buff.h"\
  +     ".\include\hsregex.h"\
  +     ".\include\http_log.h"\
  +     ".\include\http_main.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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_thread_proc.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)"
  @@ -468,6 +501,9 @@
   !ENDIF 
   
   SOURCE=.\buildmark.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_BUILD=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -494,18 +530,32 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
   
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
   "$(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\buff.h"\
  +     ".\include\hsregex.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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_thread_proc.h"\
  +     ".\lib\apr\include\apr_win.h"\
  +     ".\os\win32\os.h"\
  +     
   
   "$(INTDIR)\buildmark.obj"    "$(INTDIR)\buildmark.sbr" : $(SOURCE)\
    $(DEP_CPP_BUILD) "$(INTDIR)"
  @@ -514,6 +564,9 @@
   !ENDIF 
   
   SOURCE=.\main\http_config.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_HTTP_=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -552,19 +605,45 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.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\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\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)"
  @@ -574,6 +653,9 @@
   !ENDIF 
   
   SOURCE=.\main\http_connection.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_HTTP_C=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -613,19 +695,46 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.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\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\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"\
  +     
   
   "$(INTDIR)\http_connection.obj"      "$(INTDIR)\http_connection.sbr" : 
$(SOURCE)\
    $(DEP_CPP_HTTP_C) "$(INTDIR)"
  @@ -635,6 +744,9 @@
   !ENDIF 
   
   SOURCE=.\main\http_core.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_HTTP_CO=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -679,19 +791,51 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.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=\
  +     ".\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\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\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\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"\
  +     
   
   "$(INTDIR)\http_core.obj"    "$(INTDIR)\http_core.sbr" : $(SOURCE)\
    $(DEP_CPP_HTTP_CO) "$(INTDIR)"
  @@ -701,6 +845,9 @@
   !ENDIF 
   
   SOURCE=.\main\http_log.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_HTTP_L=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -736,19 +883,42 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
   
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
   "$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  +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_mmn.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"\
  +     ".\include\util_uri.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_log.obj"     "$(INTDIR)\http_log.sbr" : $(SOURCE) 
$(DEP_CPP_HTTP_L)\
    "$(INTDIR)"
  @@ -758,6 +928,9 @@
   !ENDIF 
   
   SOURCE=.\main\http_main.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_HTTP_M=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -790,20 +963,40 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        ".\main\xmlparse.h"\
        
   
  -!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_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\buff.h"\
  +     ".\include\hsregex.h"\
  +     ".\include\http_config.h"\
  +     ".\include\http_log.h"\
  +     ".\include\http_main.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.h"\
  +     ".\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_thread_proc.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)"
  @@ -813,6 +1006,9 @@
   !ENDIF 
   
   SOURCE=.\main\http_protocol.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_HTTP_P=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -854,31 +1050,17 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
   
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
   "$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -
  -"$(INTDIR)\http_protocol.obj"        "$(INTDIR)\http_protocol.sbr" : 
$(SOURCE)\
  - $(DEP_CPP_HTTP_P) "$(INTDIR)"
  -     $(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
   
  -SOURCE=.\main\http_request.c
  -DEP_CPP_HTTP_R=\
  +DEP_CPP_HTTP_P=\
        ".\include\ap.h"\
  -     ".\include\ap_ac_config.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
        ".\include\ap_hooks.h"\
  @@ -892,11 +1074,13 @@
        ".\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\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"\
  @@ -907,28 +1091,99 @@
        ".\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"\
  +
  +"$(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_ac_config.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_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\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\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        ".\main\scoreboard.h"\
        
   
  -!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_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\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_uri.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"\
  +     
   
   "$(INTDIR)\http_request.obj" "$(INTDIR)\http_request.sbr" : $(SOURCE)\
    $(DEP_CPP_HTTP_R) "$(INTDIR)"
  @@ -938,6 +1193,9 @@
   !ENDIF 
   
   SOURCE=.\main\http_vhost.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_HTTP_V=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -975,19 +1233,44 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
   
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
   "$(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\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\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"\
  +     
   
   "$(INTDIR)\http_vhost.obj"   "$(INTDIR)\http_vhost.sbr" : $(SOURCE)\
    $(DEP_CPP_HTTP_V) "$(INTDIR)"
  @@ -997,6 +1280,9 @@
   !ENDIF 
   
   SOURCE=.\main\iol_file.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_IOL_F=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -1023,19 +1309,33 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
   
  -!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_IOL_F=\
  +     ".\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\httpd.h"\
  +     ".\include\util_uri.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_thread_proc.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)"
  @@ -1045,6 +1345,9 @@
   !ENDIF 
   
   SOURCE=.\os\win32\iol_socket.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_IOL_S=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -1079,15 +1382,35 @@
        ".\lib\apr\include\apr.h"\
        
   
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
   "$(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\buff.h"\
  +     ".\include\hsregex.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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"\
  +     
   
   "$(INTDIR)\iol_socket.obj"   "$(INTDIR)\iol_socket.sbr" : $(SOURCE)\
    $(DEP_CPP_IOL_S) "$(INTDIR)"
  @@ -1097,6 +1420,9 @@
   !ENDIF 
   
   SOURCE=.\main\listen.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_LISTE=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -1128,19 +1454,38 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
   
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
   "$(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\buff.h"\
  +     ".\include\hsregex.h"\
  +     ".\include\http_config.h"\
  +     ".\include\http_log.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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_thread_proc.h"\
  +     ".\lib\apr\include\apr_win.h"\
  +     ".\os\win32\os.h"\
  +     
   
   "$(INTDIR)\listen.obj"       "$(INTDIR)\listen.sbr" : $(SOURCE) 
$(DEP_CPP_LISTE)\
    "$(INTDIR)"
  @@ -1150,6 +1495,9 @@
   !ENDIF 
   
   SOURCE=.\modules\standard\mod_access.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_MOD_A=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -1181,19 +1529,38 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
   
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
   "$(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\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\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_thread_proc.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)"
  @@ -1203,6 +1570,9 @@
   !ENDIF 
   
   SOURCE=.\modules\standard\mod_actions.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_MOD_AC=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -1242,31 +1612,17 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
   
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
   "$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -
  -"$(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
  -DEP_CPP_MOD_AL=\
  +DEP_CPP_MOD_AC=\
        ".\include\ap.h"\
  -     ".\include\ap_ac_config.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
        ".\include\ap_hooks.h"\
  @@ -1275,16 +1631,60 @@
        ".\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\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"\
  +     
  +
  +"$(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_ac_config.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_request.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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_thread_proc.h"\
  +     ".\lib\apr\include\apr_win.h"\
  +     ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
  @@ -1293,19 +1693,36 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
   
  -!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_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\buff.h"\
  +     ".\include\hsregex.h"\
  +     ".\include\http_config.h"\
  +     ".\include\http_request.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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_thread_proc.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)"
  @@ -1315,6 +1732,9 @@
   !ENDIF 
   
   SOURCE=.\modules\standard\mod_asis.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_MOD_AS=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -1353,19 +1773,45 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
   
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
   "$(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\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\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"\
  +     
   
   "$(INTDIR)\mod_asis.obj"     "$(INTDIR)\mod_asis.sbr" : $(SOURCE) 
$(DEP_CPP_MOD_AS)\
    "$(INTDIR)"
  @@ -1375,6 +1821,9 @@
   !ENDIF 
   
   SOURCE=.\modules\standard\mod_auth.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_MOD_AU=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -1413,19 +1862,45 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
   
  -!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_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\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\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_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"\
  +     
   
   "$(INTDIR)\mod_auth.obj"     "$(INTDIR)\mod_auth.sbr" : $(SOURCE) 
$(DEP_CPP_MOD_AU)\
    "$(INTDIR)"
  @@ -1435,6 +1910,9 @@
   !ENDIF 
   
   SOURCE=.\modules\standard\mod_autoindex.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_MOD_AUT=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -1475,31 +1953,17 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
   
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
   "$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -
  -"$(INTDIR)\mod_autoindex.obj"        "$(INTDIR)\mod_autoindex.sbr" : 
$(SOURCE)\
  - $(DEP_CPP_MOD_AUT) "$(INTDIR)"
  -     $(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
   
  -SOURCE=.\modules\standard\mod_cgi.c
  -DEP_CPP_MOD_C=\
  +DEP_CPP_MOD_AUT=\
        ".\include\ap.h"\
  -     ".\include\ap_ac_config.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
        ".\include\ap_hooks.h"\
  @@ -1507,7 +1971,6 @@
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
  -     ".\include\http_conf_globals.h"\
        ".\include\http_config.h"\
        ".\include\http_core.h"\
        ".\include\http_log.h"\
  @@ -1519,6 +1982,7 @@
        ".\include\util_uri.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"\
  @@ -1529,37 +1993,20 @@
        ".\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\ap_config_win32.h"\
  -     ".\include\apr.h"\
  -     ".\include\ebcdic.h"\
  -     ".\include\os.h"\
  -     ".\lib\apr\include\apr.h"\
  -     
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   
  -"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
  +"$(INTDIR)\mod_autoindex.obj"        "$(INTDIR)\mod_autoindex.sbr" : 
$(SOURCE)\
  + $(DEP_CPP_MOD_AUT) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
   
  -"$(INTDIR)\mod_cgi.obj"      "$(INTDIR)\mod_cgi.sbr" : $(SOURCE) 
$(DEP_CPP_MOD_C)\
  - "$(INTDIR)"
  -     $(CPP) $(CPP_PROJ) $(SOURCE)
  +!ENDIF 
   
  +SOURCE=.\modules\standard\mod_cgi.c
   
  -!ENDIF 
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -SOURCE=.\modules\standard\mod_dir.c
  -DEP_CPP_MOD_D=\
  +DEP_CPP_MOD_C=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
        ".\include\ap_config.h"\
  @@ -1569,6 +2016,7 @@
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
  +     ".\include\http_conf_globals.h"\
        ".\include\http_config.h"\
        ".\include\http_core.h"\
        ".\include\http_log.h"\
  @@ -1593,36 +2041,22 @@
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
  -NODEP_CPP_MOD_D=\
  +NODEP_CPP_MOD_C=\
        ".\include\ap_config_auto.h"\
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   
  -"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
  +"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -
  -"$(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=\
  +DEP_CPP_MOD_C=\
        ".\include\ap.h"\
  -     ".\include\ap_ac_config.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
        ".\include\ap_hooks.h"\
  @@ -1630,48 +2064,42 @@
        ".\include\ap_mmn.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\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_E=\
  -     ".\include\ap_config_auto.h"\
  -     ".\include\ap_config_win32.h"\
  -     ".\include\apr.h"\
  -     ".\include\ebcdic.h"\
  -     ".\include\os.h"\
  -     ".\lib\apr\include\apr.h"\
  -     
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
  -"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
  -     $(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
        
   
  -"$(INTDIR)\mod_env.obj"      "$(INTDIR)\mod_env.sbr" : $(SOURCE) 
$(DEP_CPP_MOD_E)\
  +"$(INTDIR)\mod_cgi.obj"      "$(INTDIR)\mod_cgi.sbr" : $(SOURCE) 
$(DEP_CPP_MOD_C)\
    "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ENDIF 
   
  -SOURCE=.\modules\standard\mod_imap.c
  -DEP_CPP_MOD_I=\
  +SOURCE=.\modules\standard\mod_dir.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
  +DEP_CPP_MOD_D=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
        ".\include\ap_config.h"\
  @@ -1705,36 +2133,22 @@
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
  -NODEP_CPP_MOD_I=\
  +NODEP_CPP_MOD_D=\
        ".\include\ap_config_auto.h"\
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   
  -"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
  +"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -
  -"$(INTDIR)\mod_imap.obj"     "$(INTDIR)\mod_imap.sbr" : $(SOURCE) 
$(DEP_CPP_MOD_I)\
  - "$(INTDIR)"
  -     $(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
   
  -SOURCE=.\modules\standard\mod_include.c
  -DEP_CPP_MOD_IN=\
  +DEP_CPP_MOD_D=\
        ".\include\ap.h"\
  -     ".\include\ap_ac_config.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
        ".\include\ap_hooks.h"\
  @@ -1763,22 +2177,224 @@
        ".\lib\apr\include\apr_time.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
  +     
  +
  +"$(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
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
  +DEP_CPP_MOD_E=\
  +     ".\include\ap.h"\
  +     ".\include\ap_ac_config.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_request.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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_thread_proc.h"\
  +     ".\lib\apr\include\apr_win.h"\
  +     ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
  -NODEP_CPP_MOD_IN=\
  +NODEP_CPP_MOD_E=\
        ".\include\ap_config_auto.h"\
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
  -     ".\modules\standard\config.h"\
  -     ".\modules\standard\modules\perl\mod_perl.h"\
        
   
  +"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(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\buff.h"\
  +     ".\include\hsregex.h"\
  +     ".\include\http_config.h"\
  +     ".\include\http_request.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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_thread_proc.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)"
  +     $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\modules\standard\mod_imap.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
  +DEP_CPP_MOD_I=\
  +     ".\include\ap.h"\
  +     ".\include\ap_ac_config.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_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\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_I=\
  +     ".\include\ap_config_auto.h"\
  +     ".\include\ap_config_win32.h"\
  +     ".\include\apr.h"\
  +     ".\include\ebcdic.h"\
  +     ".\lib\apr\include\apr.h"\
  +     
  +
  +"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
  +     $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  +
  +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\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\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"\
  +     
  +
  +"$(INTDIR)\mod_imap.obj"     "$(INTDIR)\mod_imap.sbr" : $(SOURCE) 
$(DEP_CPP_MOD_I)\
  + "$(INTDIR)"
  +     $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\modules\standard\mod_include.c
  +
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  +DEP_CPP_MOD_IN=\
  +     ".\include\ap.h"\
  +     ".\include\ap_ac_config.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_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\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_IN=\
  +     ".\include\ap_config_auto.h"\
  +     ".\include\ap_config_win32.h"\
  +     ".\include\apr.h"\
  +     ".\include\ebcdic.h"\
  +     ".\lib\apr\include\apr.h"\
  +     ".\modules\standard\config.h"\
  +     ".\modules\standard\modules\perl\mod_perl.h"\
  +     
   
   "$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -1786,16 +2402,297 @@
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  +DEP_CPP_MOD_IN=\
  +     ".\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_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\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"\
  +     
   
   "$(INTDIR)\mod_include.obj"  "$(INTDIR)\mod_include.sbr" : $(SOURCE)\
    $(DEP_CPP_MOD_IN) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
  +
  +!ENDIF 
  +
  +SOURCE=.\modules\standard\mod_log_config.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
  +DEP_CPP_MOD_L=\
  +     ".\include\ap.h"\
  +     ".\include\ap_ac_config.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_core.h"\
  +     ".\include\http_log.h"\
  +     ".\include\http_protocol.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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_L=\
  +     ".\include\ap_config_auto.h"\
  +     ".\include\ap_config_win32.h"\
  +     ".\include\apr.h"\
  +     ".\include\ebcdic.h"\
  +     ".\lib\apr\include\apr.h"\
  +     
  +
  +"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)"
  +     $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  +
  +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\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\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"\
  +     
  +
  +"$(INTDIR)\mod_log_config.obj"       "$(INTDIR)\mod_log_config.sbr" : 
$(SOURCE)\
  + $(DEP_CPP_MOD_L) "$(INTDIR)"
  +     $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\modules\standard\mod_mime.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
  +DEP_CPP_MOD_M=\
  +     ".\include\ap.h"\
  +     ".\include\ap_ac_config.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\http_request.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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_thread_proc.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\ap_config_win32.h"\
  +     ".\include\apr.h"\
  +     ".\include\ebcdic.h"\
  +     ".\lib\apr\include\apr.h"\
  +     
  +
  +"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(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\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\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_thread_proc.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)"
  +     $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\modules\standard\mod_negotiation.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
  +DEP_CPP_MOD_N=\
  +     ".\include\ap.h"\
  +     ".\include\ap_ac_config.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_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\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\ap_config_win32.h"\
  +     ".\include\apr.h"\
  +     ".\include\ebcdic.h"\
  +     ".\lib\apr\include\apr.h"\
  +     
  +
  +"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)"
  +     $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  +
  +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\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\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"\
  +     
  +
  +"$(INTDIR)\mod_negotiation.obj"      "$(INTDIR)\mod_negotiation.sbr" : 
$(SOURCE)\
  + $(DEP_CPP_MOD_N) "$(INTDIR)"
  +     $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\modules\standard\mod_setenvif.c
   
  -!ENDIF 
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -SOURCE=.\modules\standard\mod_log_config.c
  -DEP_CPP_MOD_L=\
  +DEP_CPP_MOD_S=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
        ".\include\ap_config.h"\
  @@ -1826,34 +2723,61 @@
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
  -NODEP_CPP_MOD_L=\
  +NODEP_CPP_MOD_S=\
        ".\include\ap_config_auto.h"\
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   
  -"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)"
  +"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  +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\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\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"\
  +     
   
  -"$(INTDIR)\mod_log_config.obj"       "$(INTDIR)\mod_log_config.sbr" : 
$(SOURCE)\
  - $(DEP_CPP_MOD_L) "$(INTDIR)"
  +"$(INTDIR)\mod_setenvif.obj" "$(INTDIR)\mod_setenvif.sbr" : $(SOURCE)\
  + $(DEP_CPP_MOD_S) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ENDIF 
   
  -SOURCE=.\modules\standard\mod_mime.c
  -DEP_CPP_MOD_M=\
  +SOURCE=.\modules\standard\mod_so.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
  +DEP_CPP_MOD_SO=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
        ".\include\ap_config.h"\
  @@ -1865,7 +2789,6 @@
        ".\include\hsregex.h"\
        ".\include\http_config.h"\
        ".\include\http_log.h"\
  -     ".\include\http_request.h"\
        ".\include\httpd.h"\
        ".\include\util_uri.h"\
        ".\lib\apr\include\apr_errno.h"\
  @@ -1878,34 +2801,54 @@
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
  -NODEP_CPP_MOD_M=\
  +NODEP_CPP_MOD_SO=\
        ".\include\ap_config_auto.h"\
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -
  -"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)"
  +"$(INTDIR)\mod_so.obj" : $(SOURCE) $(DEP_CPP_MOD_SO) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  +DEP_CPP_MOD_SO=\
  +     ".\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\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_thread_proc.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_so.obj"       "$(INTDIR)\mod_so.sbr" : $(SOURCE) 
$(DEP_CPP_MOD_SO)\
    "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ENDIF 
   
  -SOURCE=.\modules\standard\mod_negotiation.c
  -DEP_CPP_MOD_N=\
  +SOURCE=.\modules\standard\mod_userdir.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
  +DEP_CPP_MOD_U=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
        ".\include\ap_config.h"\
  @@ -1916,56 +2859,67 @@
        ".\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\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=\
  +NODEP_CPP_MOD_U=\
        ".\include\ap_config_auto.h"\
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
   
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
  -"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)"
  +"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  +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\buff.h"\
  +     ".\include\hsregex.h"\
  +     ".\include\http_config.h"\
  +     ".\include\http_request.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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_thread_proc.h"\
  +     ".\lib\apr\include\apr_win.h"\
  +     ".\os\win32\os.h"\
  +     
   
  -"$(INTDIR)\mod_negotiation.obj"      "$(INTDIR)\mod_negotiation.sbr" : 
$(SOURCE)\
  - $(DEP_CPP_MOD_N) "$(INTDIR)"
  +"$(INTDIR)\mod_userdir.obj"  "$(INTDIR)\mod_userdir.sbr" : $(SOURCE)\
  + $(DEP_CPP_MOD_U) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ENDIF 
   
  -SOURCE=.\modules\standard\mod_setenvif.c
  -DEP_CPP_MOD_S=\
  +SOURCE=.\os\win32\modules.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
  +DEP_CPP_MODUL=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
        ".\include\ap_config.h"\
  @@ -1976,64 +2930,73 @@
        ".\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\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_S=\
  +NODEP_CPP_MODUL=\
        ".\include\ap_config_auto.h"\
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   
  -"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
  +"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  +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\buff.h"\
  +     ".\include\hsregex.h"\
  +     ".\include\http_config.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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_thread_proc.h"\
  +     ".\lib\apr\include\apr_win.h"\
  +     ".\os\win32\os.h"\
  +     
   
  -"$(INTDIR)\mod_setenvif.obj" "$(INTDIR)\mod_setenvif.sbr" : $(SOURCE)\
  - $(DEP_CPP_MOD_S) "$(INTDIR)"
  +"$(INTDIR)\modules.obj"      "$(INTDIR)\modules.sbr" : $(SOURCE) 
$(DEP_CPP_MODUL)\
  + "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ENDIF 
   
  -SOURCE=.\modules\standard\mod_so.c
  -DEP_CPP_MOD_SO=\
  +SOURCE=.\os\win32\registry.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
  +DEP_CPP_REGIS=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.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"\
  @@ -2047,95 +3010,136 @@
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
  -NODEP_CPP_MOD_SO=\
  +NODEP_CPP_REGIS=\
        ".\include\ap_config_auto.h"\
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
   
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
  -"$(INTDIR)\mod_so.obj" : $(SOURCE) $(DEP_CPP_MOD_SO) "$(INTDIR)"
  +"$(INTDIR)\registry.obj" : $(SOURCE) $(DEP_CPP_REGIS) "$(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\buff.h"\
  +     ".\include\hsregex.h"\
  +     ".\include\http_log.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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_thread_proc.h"\
  +     ".\lib\apr\include\apr_win.h"\
  +     ".\os\win32\os.h"\
  +     
   
  -"$(INTDIR)\mod_so.obj"       "$(INTDIR)\mod_so.sbr" : $(SOURCE) 
$(DEP_CPP_MOD_SO)\
  +"$(INTDIR)\registry.obj"     "$(INTDIR)\registry.sbr" : $(SOURCE) 
$(DEP_CPP_REGIS)\
    "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ENDIF 
   
  -SOURCE=.\modules\standard\mod_userdir.c
  -DEP_CPP_MOD_U=\
  +SOURCE=.\main\rfc1413.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
  +DEP_CPP_RFC14=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.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_request.h"\
  +     ".\include\http_log.h"\
  +     ".\include\http_main.h"\
        ".\include\httpd.h"\
  +     ".\include\rfc1413.h"\
        ".\include\util_uri.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_thread_proc.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
  -NODEP_CPP_MOD_U=\
  +NODEP_CPP_RFC14=\
        ".\include\ap_config_auto.h"\
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
        
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   
  -"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
  +"$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(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\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\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_thread_proc.h"\
  +     ".\lib\apr\include\apr_win.h"\
  +     ".\os\win32\os.h"\
  +     
   
  -"$(INTDIR)\mod_userdir.obj"  "$(INTDIR)\mod_userdir.sbr" : $(SOURCE)\
  - $(DEP_CPP_MOD_U) "$(INTDIR)"
  +"$(INTDIR)\rfc1413.obj"      "$(INTDIR)\rfc1413.sbr" : $(SOURCE) 
$(DEP_CPP_RFC14)\
  + "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ENDIF 
  +
  +SOURCE=.\os\win32\service.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -SOURCE=.\os\win32\modules.c
  -DEP_CPP_MODUL=\
  +DEP_CPP_SERVI=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.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_conf_globals.h"\
  +     ".\include\http_log.h"\
  +     ".\include\http_main.h"\
        ".\include\httpd.h"\
        ".\include\util_uri.h"\
        ".\lib\apr\include\apr_errno.h"\
  @@ -2145,80 +3149,50 @@
        ".\lib\apr\include\apr_thread_proc.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_MODUL=\
  +NODEP_CPP_SERVI=\
        ".\include\ap_config_auto.h"\
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
        ".\lib\apr\include\apr.h"\
        
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   
  -"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
  +"$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -
  -"$(INTDIR)\modules.obj"      "$(INTDIR)\modules.sbr" : $(SOURCE) 
$(DEP_CPP_MODUL)\
  - "$(INTDIR)"
  -     $(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
   
  -SOURCE=.\main\rfc1413.c
  -DEP_CPP_RFC14=\
  +DEP_CPP_SERVI=\
        ".\include\ap.h"\
  -     ".\include\ap_ac_config.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\rfc1413.h"\
        ".\include\util_uri.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_thread_proc.h"\
        ".\lib\apr\include\apr_win.h"\
        ".\os\win32\os.h"\
  -     {$(INCLUDE)}"sys\stat.h"\
  -     {$(INCLUDE)}"sys\types.h"\
  -     
  -NODEP_CPP_RFC14=\
  -     ".\include\ap_config_auto.h"\
  -     ".\include\ap_config_win32.h"\
  -     ".\include\apr.h"\
  -     ".\include\ebcdic.h"\
  -     ".\include\os.h"\
  -     ".\lib\apr\include\apr.h"\
  +     ".\os\win32\registry.h"\
  +     ".\os\win32\service.h"\
        
  -
  -!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)\service.obj"      "$(INTDIR)\service.sbr" : $(SOURCE) 
$(DEP_CPP_SERVI)\
    "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
  @@ -2226,6 +3200,9 @@
   !ENDIF 
   
   SOURCE=.\main\util.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_UTIL_=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -2252,6 +3229,7 @@
        ".\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"\
  @@ -2261,20 +3239,43 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
  -     ".\main\test_char.h"\
        
   
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
   "$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  +DEP_CPP_UTIL_=\
  +     ".\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_log.h"\
  +     ".\include\http_main.h"\
  +     ".\include\http_protocol.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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"\
  +     ".\main\test_char.h"\
  +     ".\os\win32\os.h"\
  +     
   
   "$(INTDIR)\util.obj" "$(INTDIR)\util.sbr" : $(SOURCE) $(DEP_CPP_UTIL_)\
    "$(INTDIR)"
  @@ -2284,6 +3285,9 @@
   !ENDIF 
   
   SOURCE=.\main\util_date.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_UTIL_D=\
        ".\include\ap_ac_config.h"\
        ".\include\ap_config.h"\
  @@ -2300,18 +3304,22 @@
        ".\include\ap_config_auto.h"\
        ".\include\ap_config_win32.h"\
        ".\include\apr.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)"
  @@ -2321,6 +3329,9 @@
   !ENDIF 
   
   SOURCE=.\main\util_md5.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_UTIL_M=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -2353,19 +3364,39 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.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\buff.h"\
  +     ".\include\hsregex.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_md5.h"\
  +     ".\include\util_uri.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)"
  @@ -2375,6 +3406,9 @@
   !ENDIF 
   
   SOURCE=.\main\util_script.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_UTIL_S=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -2415,19 +3449,47 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.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\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\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"\
  +     
   
   "$(INTDIR)\util_script.obj"  "$(INTDIR)\util_script.sbr" : $(SOURCE)\
    $(DEP_CPP_UTIL_S) "$(INTDIR)"
  @@ -2437,6 +3499,9 @@
   !ENDIF 
   
   SOURCE=.\main\util_uri.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_UTIL_U=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -2455,6 +3520,7 @@
        ".\lib\apr\include\apr_lib.h"\
        ".\lib\apr\include\apr_thread_proc.h"\
        ".\lib\apr\include\apr_win.h"\
  +     ".\main\uri_delims.h"\
        ".\os\win32\os.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
  @@ -2464,20 +3530,35 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.h"\
  -     ".\main\uri_delims.h"\
        
   
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
   "$(INTDIR)\util_uri.obj" : $(SOURCE) $(DEP_CPP_UTIL_U) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !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\buff.h"\
  +     ".\include\hsregex.h"\
  +     ".\include\http_log.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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_thread_proc.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)"
  @@ -2487,6 +3568,9 @@
   !ENDIF 
   
   SOURCE=.\os\win32\util_win32.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_UTIL_W=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -2517,15 +3601,31 @@
        ".\lib\apr\include\apr.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\buff.h"\
  +     ".\include\hsregex.h"\
  +     ".\include\http_log.h"\
  +     ".\include\httpd.h"\
  +     ".\include\util_uri.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_thread_proc.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)"
  @@ -2535,6 +3635,9 @@
   !ENDIF 
   
   SOURCE=.\modules\mpm\winnt\winnt.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_WINNT=\
        ".\include\ap.h"\
        ".\include\ap_ac_config.h"\
  @@ -2567,6 +3670,7 @@
        ".\modules\mpm\winnt\mpm_default.h"\
        ".\os\win32\iol_socket.h"\
        ".\os\win32\os.h"\
  +     ".\os\win32\service.h"\
        {$(INCLUDE)}"sys\stat.h"\
        {$(INCLUDE)}"sys\types.h"\
        
  @@ -2575,19 +3679,47 @@
        ".\include\ap_config_win32.h"\
        ".\include\apr.h"\
        ".\include\ebcdic.h"\
  -     ".\include\os.h"\
        ".\lib\apr\include\apr.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\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\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"\
  +     
   
   "$(INTDIR)\winnt.obj"        "$(INTDIR)\winnt.sbr" : $(SOURCE) 
$(DEP_CPP_WINNT)\
    "$(INTDIR)"
  
  
  
  1.35      +9 -21     apache-2.0/src/modules/mpm/winnt/winnt.c
  
  Index: winnt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- winnt.c   1999/12/20 19:07:33     1.34
  +++ winnt.c   1999/12/20 19:52:51     1.35
  @@ -67,7 +67,8 @@
   #include "ap_config.h"
   #include "ap_listen.h"
   #include "mpm_default.h"
  -#include "../os/win32/iol_socket.h"
  +#include "service.h"
  +#include "iol_socket.h"
   #include "winnt.h"
   
   
  @@ -1555,11 +1556,7 @@
       /* Create child process 
        * Should only be one in this version of Apache for WIN32 
        */
  -#if 1
  -//    ReportStatusToSCMgr(SERVICE_START_PENDING, NO_ERROR, 3000);
  -#else
  -//    service_set_status(SERVICE_START_PENDING);
  -#endif
  +    service_set_status(SERVICE_START_PENDING);
       while (remaining_children_to_start--) {
           if (create_process(pconf, process_handles, process_kill_events, 
                              &current_live_processes) < 0) {
  @@ -1569,11 +1566,8 @@
               goto die_now;
           }
       }
  -#if 1
  -//    ReportStatusToSCMgr(SERVICE_RUNNING, NO_ERROR, 3000);
  -#else
  -//    service_set_status(SERVICE_RUNNING);
  -#endif
  +    service_set_status(SERVICE_RUNNING);
  +
       restart_pending = shutdown_pending = 0;
       
       /* Wait for shutdown or restart events or for child death */
  @@ -1769,11 +1763,8 @@
           setup_signal_names(ap_psprintf(pconf,"ap%d", parent_pid));
           if (!restart) {
               ap_log_pid(pconf, ap_pid_fname);
  -#if 1
  -//            ReportStatusToSCMgr(SERVICE_START_PENDING, NO_ERROR, 3000);
  -#else
  -//            service_set_status(SERVICE_START_PENDING);
  -#endif
  +
  +            service_set_status(SERVICE_START_PENDING);
               AMCSocketInitialize();
   //            setup_signal_names(ap_psprintf(pconf,"ap%d", parent_pid));
           
  @@ -1827,11 +1818,8 @@
               CloseHandle(restart_event);
               CloseHandle(shutdown_event);
               AMCSocketCleanup();
  -#if 1
  -//            ReportStatusToSCMgr(SERVICE_STOPPED, NO_ERROR, 3000);
  -#else
  -//            service_set_status(SERVICE_STOPPED);
  -#endif
  +
  +            service_set_status(SERVICE_STOPPED);
           }
       }
       return !restart;
  
  
  

Reply via email to