With this patch, dav and file_cache ride again :-) Note file_cache now

  uses mmaps, which may or may not be desired on win32.

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

diff --git a/Apache.dsw b/Apache.dsw
index b447ccd90214b0db86baeacd5fc829bcb7b9f7ba..f48580e94497ce7f5a8f7363cbff753fda878d74 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -158,6 +158,12 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name aprutildll
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_dav
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_dav_fs
+    End Project Dependency
 }}}
 
 ###############################################################################

diff --git a/ApacheCore.def b/ApacheCore.def
index f74dd5bc927a32276e2ec061113a1479b0b198b6..14962d5e7ecbe5b0ee2d2e1e342f0888b44dfe22 100644 (file)
--- a/ApacheCore.def
+++ b/ApacheCore.def
@@ -222,7 +222,7 @@ EXPORTS
 
        ap_send_http_header
        ap_send_http_trace
-
+        ap_send_mmap
        ap_send_size
        ap_server_root_relative
        

diff --git a/Makefile.win b/Makefile.win
index 8e0b82173eb14c822618ac238a0b4542b734eb2f..5687143afa838fb0a8d5b9afceac05769c6bc269 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -102,10 +102,10 @@ _build:
         $(MAKE) $(MAKEOPT) -f mod_file_cache.mak CFG="mod_file_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd modules\dav\main
-#       $(MAKE) $(MAKEOPT) -f mod_dav.mak CFG="mod_dav - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_dav.mak CFG="mod_dav - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..\..
        cd modules\dav\fs
-#       $(MAKE) $(MAKEOPT) -f mod_dav_fs.mak CFG="mod_dav_fs - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_dav_fs.mak CFG="mod_dav_fs - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..\..
        cd modules\generators
 #        $(MAKE) $(MAKEOPT) -f mod_info.mak CFG"=mod_info - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -147,8 +147,8 @@ _install:
        copy modules\aaa\mod_auth_dbm$(SHORT)\mod_auth_dbm.dll $(INSTDIR)\modules
        copy modules\aaa\mod_auth_digest$(SHORT)\mod_auth_digest.dll $(INSTDIR)\modules
        copy modules\cache\mod_file_cache$(SHORT)\mod_file_cache.dll $(INSTDIR)\modules
-#       copy modules\dav\fs\mod_dav_fs$(SHORT)\mod_dav_fs.dll $(INSTDIR)\modules
-#       copy modules\dav\main\mod_dav$(SHORT)\mod_dav.dll $(INSTDIR)\modules
+        copy modules\dav\fs\mod_dav_fs$(SHORT)\mod_dav_fs.dll $(INSTDIR)\modules
+        copy modules\dav\main\mod_dav$(SHORT)\mod_dav.dll $(INSTDIR)\modules
 #       copy modules\generators\mod_info$(SHORT)\mod_info.dll $(INSTDIR)\modules
         copy modules\generators\mod_status$(SHORT)\mod_status.dll $(INSTDIR)\modules
         copy modules\mappers\mod_rewrite$(SHORT)\mod_rewrite.dll $(INSTDIR)\modules

diff --git a/libhttpd.def b/libhttpd.def
index f74dd5bc927a32276e2ec061113a1479b0b198b6..14962d5e7ecbe5b0ee2d2e1e342f0888b44dfe22 100644 (file)
--- a/libhttpd.def
+++ b/libhttpd.def
@@ -222,7 +222,7 @@ EXPORTS
 
        ap_send_http_header
        ap_send_http_trace
-
+        ap_send_mmap
        ap_send_size
        ap_server_root_relative