Add mod_data to Windows build

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1202055 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw
index 579149a3f04094a861c475cc8d59d2e1cf2269f1..22bd63f67802703f8f4508a2e292adee18ba7a46 100644 (file)
--- a/Apache-apr2.dsw
+++ b/Apache-apr2.dsw
@@ -168,6 +168,9 @@ Package=<4>
     Project_Dep_Name mod_charset_lite
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_data
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_dav_fs
     End Project Dependency
     Begin Project Dependency
@@ -1333,6 +1336,24 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_data"=.\modules\filters\mod_data.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_dav"=.\modules\dav\main\mod_dav.dsp - Package Owner=<4>
 
 Package=<5>

diff --git a/Apache.dsw b/Apache.dsw
index ebfb3b3a98b343b39e8f03fbef04b4fa08c23b36..ed92084a8d63e69a2d7c2e04eadb9b2cef8d8cab 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -183,6 +183,9 @@ Package=<4>
     Project_Dep_Name mod_charset_lite
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_data
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_dav_fs
     End Project Dependency
     Begin Project Dependency
@@ -1591,6 +1594,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_data"=.\modules\filters\mod_data.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_dav"=.\modules\dav\main\mod_dav.dsp - Package Owner=<4>
 
 Package=<5>

diff --git a/Makefile.win b/Makefile.win
index cee1610dbaa9b91dbda076e86c62029ff497a84f..9dd71176b6389c11c697026bbb2c347a706cbb4a 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -450,6 +450,7 @@ _build:
        cd modules\filters
         $(MAKE) $(MAKEOPT) -f mod_buffer.mak      CFG="mod_buffer - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_data.mak        CFG="mod_data - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 !IF EXIST("srclib\zlib")
         $(MAKE) $(MAKEOPT) -f mod_deflate.mak     CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 !ENDIF
@@ -711,6 +712,7 @@ _copybin:
 !ENDIF
        copy modules\filters\$(LONG)\mod_buffer.$(src_so)       "$(inst_so)" <.y
        copy modules\filters\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y
+       copy modules\filters\$(LONG)\mod_data.$(src_so) "$(inst_so)" <.y
 !IF EXIST("srclib\zlib")
        copy modules\filters\$(LONG)\mod_deflate.$(src_so)      "$(inst_so)" <.y
 !IF EXIST("srclib\zlib\zlib1.$(src_dll)")

diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index 7e7718607bceddfd145258115b1b86a33bfda86a..dd4ab102f2acecb4aaeae0c306ec47842d42838a 100644 (file)
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -118,6 +118,7 @@ BEGIN {
          print "#LoadModule cern_meta_module modules/mod_cern_meta.so" > dstfl;
          print "LoadModule cgi_module modules/mod_cgi.so" > dstfl;
          print "#LoadModule charset_lite_module modules/mod_charset_lite.so" > dstfl;
+         print "#LoadModule data_module modules/mod_data.so" > dstfl;
          print "#LoadModule dav_module modules/mod_dav.so" > dstfl;
          print "#LoadModule dav_fs_module modules/mod_dav_fs.so" > dstfl;
          print "#LoadModule dav_lock_module modules/mod_dav_lock.so" > dstfl;

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 9d939148cbf6ab51f6e80ad5b900fff8d58a984a..3f3e40e94bbfbf8ba1b10e476617737f55451cf7 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -116,3 +116,4 @@ mod_proxy_express.so        0x6F760000    0x00010000
 mod_log_debug.so            0x6F750000    0x00010000
 mod_proxy_html.so           0x6F740000    0x00010000
 mod_xml2enc.so              0x6F730000    0x00010000
+mod_data.so              0x6F720000    0x00010000