Propagate the rfc1413/mod_ident changes to Windows.
Shane
? modules/metadata/mod_ident.dsp
? modules/metadata/mod_ident.exp
Index: Apache.dsw
===================================================================
RCS file: /home/cvspublic/httpd-2.0/Apache.dsw,v
retrieving revision 1.94
diff -u -r1.94 Apache.dsw
--- Apache.dsw 11 Dec 2002 06:13:02 -0000 1.94
+++ Apache.dsw 19 Jan 2003 06:40:04 -0000
@@ -1212,6 +1212,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>
Index: Makefile.win
===================================================================
RCS file: /home/cvspublic/httpd-2.0/Makefile.win,v
retrieving revision 1.124
diff -u -r1.124 Makefile.win
--- Makefile.win 18 Jan 2003 02:26:45 -0000 1.124
+++ Makefile.win 19 Jan 2003 06:40:04 -0000
@@ -277,6 +277,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)
@@ -432,6 +433,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
@@ -488,6 +490,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
Index: libhttpd.dsp
===================================================================
RCS file: /home/cvspublic/httpd-2.0/libhttpd.dsp,v
retrieving revision 1.51
diff -u -r1.51 libhttpd.dsp
--- libhttpd.dsp 20 Sep 2002 06:06:41 -0000 1.51
+++ libhttpd.dsp 19 Jan 2003 06:40:04 -0000
@@ -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
Index: build/nw_export.inc
===================================================================
RCS file: /home/cvspublic/httpd-2.0/build/nw_export.inc,v
retrieving revision 1.4
diff -u -r1.4 nw_export.inc
--- build/nw_export.inc 13 Nov 2002 21:14:02 -0000 1.4
+++ build/nw_export.inc 19 Jan 2003 06:40:04 -0000
@@ -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"
Index: os/win32/BaseAddr.ref
===================================================================
RCS file: /home/cvspublic/httpd-2.0/os/win32/BaseAddr.ref,v
retrieving revision 1.23
diff -u -r1.23 BaseAddr.ref
--- os/win32/BaseAddr.ref 1 Dec 2002 23:38:44 -0000 1.23
+++ os/win32/BaseAddr.ref 19 Jan 2003 06:40:05 -0000
@@ -63,3 +63,4 @@
mod_logio 0x6FAE0000 0x00010000
util_ldap 0x6FAD0000 0x00010000
mod_auth_ldap 0x6FAC0000 0x00010000
+mod_ident 0x6FAB0000 0x00010000
ident_module
# Microsoft Developer Studio Project File - Name="mod_ident" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=mod_ident - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "mod_ident.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "mod_ident.mak" CFG="mod_ident - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "mod_ident - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "mod_ident - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "mod_ident - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I
"../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/Fd"Release\mod_ident" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386
/out:"Release/mod_ident.so" /base:@..\..\os\win32\BaseAddr.ref,mod_ident
# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386
/out:"Release/mod_ident.so" /base:@..\..\os\win32\BaseAddr.ref,mod_ident
!ELSEIF "$(CFG)" == "mod_ident - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I
"../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32"
/D "_WINDOWS" /Fd"Debug\mod_ident" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map
/debug /machine:I386 /out:"Debug/mod_ident.so"
/base:@..\..\os\win32\BaseAddr.ref,mod_ident
# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug
/machine:I386 /out:"Debug/mod_ident.so" /base:@..\..\os\win32\BaseAddr.ref,mod_ident
!ENDIF
# Begin Target
# Name "mod_ident - Win32 Release"
# Name "mod_ident - Win32 Debug"
# Begin Source File
SOURCE=.\mod_ident.c
# End Source File
# Begin Source File
SOURCE=.\mod_ident.rc
# End Source File
# Begin Source File
SOURCE=..\..\build\win32\win32ver.awk
!IF "$(CFG)" == "mod_ident - Win32 Release"
# PROP Ignore_Default_Tool 1
# Begin Custom Build - Creating Version Resource
InputPath=..\..\build\win32\win32ver.awk
".\mod_ident.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
awk -f ../../build/win32/win32ver.awk mod_ident "ident_module for Apache"
../../include/ap_release.h > .\mod_ident.rc
# End Custom Build
!ELSEIF "$(CFG)" == "mod_ident - Win32 Debug"
# PROP Ignore_Default_Tool 1
# Begin Custom Build - Creating Version Resource
InputPath=..\..\build\win32\win32ver.awk
".\mod_ident.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
awk -f ../../build/win32/win32ver.awk mod_ident "ident_module for Apache"
../../include/ap_release.h > .\mod_ident.rc
# End Custom Build
!ENDIF
# End Source File
# End Target
# End Project
