Integrate mod_ident with the Win32 build.

  Submitted by David Shane Holden <dpejesh@yahoo.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98386 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache.dsw b/Apache.dsw
index 82406c556fc97d406a1c85c15b2c08c951900292..8c7b96294d3a235a197220ffab8bb5b164951d8c 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -1209,6 +1209,27 @@ Package=<4>
 
 ###############################################################################
 
+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>

diff --git a/Makefile.win b/Makefile.win
index 185327411223742002554ebab789540f650e920c..63c2c23fb4e2b3dda5ef633900da852c19cc5fb9 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -279,6 +279,7 @@ _build:
         $(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 @@ _install:
        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 @@ _install:
        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

diff --git a/build/nw_export.inc b/build/nw_export.inc
index 77522ee0c2d156f5eeacfaaa45b5aacc2c8cb399..50231249ffd3de985db9e37c5508f47c1e892867 100644 (file)
--- a/build/nw_export.inc
+++ b/build/nw_export.inc
@@ -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"

diff --git a/libhttpd.dsp b/libhttpd.dsp
index 284a7ddaf9a7295fc3d1b914f2a13a4bd0e154ba..ad2ad7ba69fdb73ad2abe064c30d9bf7c453ef6b 100644 (file)
--- a/libhttpd.dsp
+++ b/libhttpd.dsp
@@ -405,14 +405,6 @@ SOURCE=.\server\error_bucket.c
 # 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

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 761a98d9994c1c07c74fe0019f052e09a66cfa34..752dfb8dd007cd32f82a935304289eefa36a4409 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -63,3 +63,4 @@ mod_authz_user       0x6FAF0000    0x00010000
 mod_logio            0x6FAE0000    0x00010000
 util_ldap            0x6FAD0000    0x00010000
 mod_auth_ldap        0x6FAC0000    0x00010000
+mod_ident            0x6FAB0000    0x00010000