httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/os/win32 libhttpd.c
Date Thu, 18 Jan 2001 19:49:30 GMT
wrowe       01/01/18 11:49:30

  Modified:    .        libhttpd.dsp Apache.dsw
  Removed:     .        httpd.dsp httpd.mak
               os/win32 libhttpd.c
  Log:
    This change eliminates the intermediate httpd.lib from the build of
    libhttpd.dll - it was required for the support applications to avoid
    linking to the libhttpd.dll, but those functions have all moved to
    apr and apr-util.
  
    This change also prepares us to eliminate libhttpd.def once all of the
    appropriate AP_DECLARE tags are assigned.
  
  Revision  Changes    Path
  1.7       +372 -1    httpd-2.0/libhttpd.dsp
  
  Index: libhttpd.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/libhttpd.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- libhttpd.dsp	2000/12/21 01:24:37	1.6
  +++ libhttpd.dsp	2001/01/18 19:49:25	1.7
  @@ -88,13 +88,384 @@
   
   # Name "libhttpd - Win32 Release"
   # Name "libhttpd - Win32 Debug"
  +# Begin Group "Configuration"
  +
  +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
  +# Begin Source File
  +
  +SOURCE=.\include\ap_config.h
  +# End Source File
   # Begin Source File
   
  -SOURCE=.\os\win32\libhttpd.c
  +SOURCE=.\include\ap_mmn.h
   # End Source File
   # Begin Source File
   
   SOURCE=.\libhttpd.def
  +# PROP Exclude_From_Build 1
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\buildmark.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\http_conf_globals.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\os\win32\modules.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\os\win32\os.h
  +# End Source File
  +# End Group
  +# Begin Group "Generated Files"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\server\gen_test_char.exe
  +
  +!IF  "$(CFG)" == "libhttpd - Win32 Release"
  +
  +# Begin Custom Build - Generating test_char.h
  +InputPath=.\server\gen_test_char.exe
  +
  +".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\server\gen_test_char.exe >.\server\test_char.h 
  +	echo Generated test_char.h from gen_test_char.exe 
  +	
  +# End Custom Build
  +
  +!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
  +
  +# Begin Custom Build - Generating test_char.h
  +InputPath=.\server\gen_test_char.exe
  +
  +".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\server\gen_test_char.exe >.\server\test_char.h 
  +	echo Generated test_char.h from gen_test_char.exe 
  +	
  +# End Custom Build
  +
  +!ENDIF 
  +
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\gen_uri_delims.exe
  +
  +!IF  "$(CFG)" == "libhttpd - Win32 Release"
  +
  +# Begin Custom Build - Generating uri_delims.h
  +InputPath=.\server\gen_uri_delims.exe
  +
  +".\server\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\server\gen_uri_delims.exe >.\server\uri_delims.h 
  +	echo Generated uri_delims.h from gen_uri_delims.exe 
  +	
  +# End Custom Build
  +
  +!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
  +
  +# Begin Custom Build - Generating uri_delims.h
  +InputPath=.\server\gen_uri_delims.exe
  +
  +".\server\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\server\gen_uri_delims.exe >.\server\uri_delims.h 
  +	echo Generated uri_delims.h from gen_uri_delims.exe 
  +	
  +# End Custom Build
  +
  +!ENDIF 
  +
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\test_char.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\uri_delims.h
  +# End Source File
  +# End Group
  +# Begin Group "httpd"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\server\config.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\connection.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\http_config.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\http_connection.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\http_log.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\http_main.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\http_vhost.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\httpd.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\log.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\vhost.c
  +# End Source File
  +# End Group
  +# Begin Group "modules"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\modules\http\http_core.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\http_core.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\http\http_protocol.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\http_protocol.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\http\http_request.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\http_request.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\aaa\mod_access.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\mappers\mod_actions.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\mappers\mod_alias.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\generators\mod_asis.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\aaa\mod_auth.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\generators\mod_autoindex.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\generators\mod_cgi.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\mappers\mod_dir.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\metadata\mod_env.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\mappers\mod_imap.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\filters\mod_include.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\os\win32\mod_isapi.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\loggers\mod_log_config.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\http\mod_mime.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\mappers\mod_negotiation.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\metadata\mod_setenvif.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\mappers\mod_so.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\modules\mappers\mod_userdir.c
  +# End Source File
  +# End Group
  +# Begin Group "util"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\server\rfc1413.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\rfc1413.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\util.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\util_cfgtree.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\util_cfgtree.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\util_charset.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\util_date.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\util_date.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\util_ebcdic.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\util_filter.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\util_filter.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\util_md5.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\util_md5.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\util_script.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\util_script.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\util_uri.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\util_uri.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\os\win32\util_win32.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\util_xml.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\util_xml.h
  +# End Source File
  +# End Group
  +# Begin Group "mpm_winnt"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\include\ap_listen.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\ap_mpm.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\listen.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\mpm\winnt\mpm.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\mpm_common.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\mpm\winnt\mpm_default.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\mpm_status.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\mpm\winnt\mpm_winnt.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\mpm\winnt\mpm_winnt.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\mpm\winnt\registry.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\server\mpm\winnt\service.c
   # End Source File
  +# End Group
   # End Target
   # End Project
  
  
  
  1.42      +4 -28     httpd-2.0/Apache.dsw
  
  Index: Apache.dsw
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Apache.dsw,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- Apache.dsw	2001/01/04 22:37:27	1.41
  +++ Apache.dsw	2001/01/18 19:49:26	1.42
  @@ -101,9 +101,6 @@
   
   Package=<4>
   {{{
  -    Begin Project Dependency
  -    Project_Dep_Name apr
  -    End Project Dependency
   }}}
   
   ###############################################################################
  @@ -204,30 +201,6 @@
   
   ###############################################################################
   
  -Project: "httpd"=".\httpd.dsp" - Package Owner=<4>
  -
  -Package=<5>
  -{{{
  -}}}
  -
  -Package=<4>
  -{{{
  -    Begin Project Dependency
  -    Project_Dep_Name libapr
  -    End Project Dependency
  -    Begin Project Dependency
  -    Project_Dep_Name libaprutil
  -    End Project Dependency
  -    Begin Project Dependency
  -    Project_Dep_Name gen_test_char
  -    End Project Dependency
  -    Begin Project Dependency
  -    Project_Dep_Name gen_uri_delims
  -    End Project Dependency
  -}}}
  -
  -###############################################################################
  -
   Project: "libhttpd"=".\libhttpd.dsp" - Package Owner=<4>
   
   Package=<5>
  @@ -252,7 +225,10 @@
       Project_Dep_Name pcreposix
       End Project Dependency
       Begin Project Dependency
  -    Project_Dep_Name httpd
  +    Project_Dep_Name gen_test_char
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name gen_uri_delims
       End Project Dependency
   }}}
   
  
  
  

Mime
View raw message