You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2003/01/20 22:38:50 UTC

cvs commit: httpd-2.0/os/win32 BaseAddr.ref

wrowe       2003/01/20 13:38:50

  Modified:    .        Makefile.win Apache.dsw libhttpd.dsp
               build    nw_export.inc
               os/win32 BaseAddr.ref
  Log:
    Integrate mod_ident with the Win32 build.
    Submitted by David Shane Holden <dp...@yahoo.com>
  
  Revision  Changes    Path
  1.126     +3 -0      httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.125
  retrieving revision 1.126
  diff -u -r1.125 -r1.126
  --- Makefile.win	19 Jan 2003 02:46:55 -0000	1.125
  +++ Makefile.win	20 Jan 2003 21:38:49 -0000	1.126
  @@ -279,6 +279,7 @@
   	 $(MAKE) $(MAKEOPT) -f mod_env.mak         CFG="mod_env - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f mod_expires.mak     CFG="mod_expires - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f mod_headers.mak     CFG="mod_headers - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  +	 $(MAKE) $(MAKEOPT) -f mod_ident.mak       CFG="mod_ident - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f mod_mime_magic.mak  CFG="mod_mime_magic - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f mod_setenvif.mak    CFG="mod_setenvif - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f mod_unique_id.mak   CFG="mod_unique_id - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  @@ -436,6 +437,7 @@
   	copy modules\metadata\$(LONG)\mod_env.so "$(INSTDIR)\modules" <.y
   	copy modules\metadata\$(LONG)\mod_expires.so "$(INSTDIR)\modules" <.y
   	copy modules\metadata\$(LONG)\mod_headers.so "$(INSTDIR)\modules" <.y
  +	copy modules\metadata\$(LONG)\mod_ident.so "$(INSTDIR)\modules" <.y
   	copy modules\metadata\$(LONG)\mod_mime_magic.so "$(INSTDIR)\modules" <.y
   	copy modules\metadata\$(LONG)\mod_setenvif.so "$(INSTDIR)\modules" <.y
   	copy modules\metadata\$(LONG)\mod_unique_id.so "$(INSTDIR)\modules" <.y
  @@ -494,6 +496,7 @@
   	copy modules\metadata\$(LONG)\mod_env.pdb "$(INSTDIR)\modules" <.y
   	copy modules\metadata\$(LONG)\mod_expires.pdb "$(INSTDIR)\modules" <.y
   	copy modules\metadata\$(LONG)\mod_headers.pdb "$(INSTDIR)\modules" <.y
  +	copy modules\metadata\$(LONG)\mod_ident.pdb "$(INSTDIR)\modules" <.y
   	copy modules\metadata\$(LONG)\mod_mime_magic.pdb "$(INSTDIR)\modules" <.y
   	copy modules\metadata\$(LONG)\mod_setenvif.pdb "$(INSTDIR)\modules" <.y
   	copy modules\metadata\$(LONG)\mod_unique_id.pdb "$(INSTDIR)\modules" <.y
  
  
  
  1.97      +21 -0     httpd-2.0/Apache.dsw
  
  Index: Apache.dsw
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Apache.dsw,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- Apache.dsw	19 Jan 2003 02:53:33 -0000	1.96
  +++ Apache.dsw	20 Jan 2003 21:38:49 -0000	1.97
  @@ -1209,6 +1209,27 @@
   
   ###############################################################################
   
  +Project: "mod_ident"=".\modules\metadata\mod_ident.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 libhttpd
  +    End Project Dependency
  +}}}
  +
  +###############################################################################
  +
   Project: "mod_imap"=".\modules\mappers\mod_imap.dsp" - Package Owner=<4>
   
   Package=<5>
  
  
  
  1.53      +0 -8      httpd-2.0/libhttpd.dsp
  
  Index: libhttpd.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/libhttpd.dsp,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- libhttpd.dsp	20 Jan 2003 18:57:03 -0000	1.52
  +++ libhttpd.dsp	20 Jan 2003 21:38:49 -0000	1.53
  @@ -405,14 +405,6 @@
   # End Source File
   # 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
  
  
  
  1.5       +0 -1      httpd-2.0/build/nw_export.inc
  
  Index: nw_export.inc
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/nw_export.inc,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- nw_export.inc	13 Nov 2002 21:14:02 -0000	1.4
  +++ nw_export.inc	20 Jan 2003 21:38:49 -0000	1.5
  @@ -34,7 +34,6 @@
   #include "http_vhost.h"
   #include "mpm_common.h"
   #include "pcreposix.h"
  -#include "rfc1413.h"
   #include "scoreboard.h"
   #include "util_cfgtree.h"
   #include "util_charset.h"
  
  
  
  1.24      +1 -0      httpd-2.0/os/win32/BaseAddr.ref
  
  Index: BaseAddr.ref
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/win32/BaseAddr.ref,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- BaseAddr.ref	1 Dec 2002 23:38:44 -0000	1.23
  +++ BaseAddr.ref	20 Jan 2003 21:38:50 -0000	1.24
  @@ -63,3 +63,4 @@
   mod_logio            0x6FAE0000    0x00010000
   util_ldap            0x6FAD0000    0x00010000
   mod_auth_ldap        0x6FAC0000    0x00010000
  +mod_ident            0x6FAB0000    0x00010000