Merge r1305167, r1330964, r1388660, r1388899, r1391396, r1391398, r1392214, r1406760...

Update transformations.

syntax for mod_b*.xml and mod_c*.xml

mod_cache_socache: New cache implementation backed by mod_socache
that replaces mod_mem_cache removed from httpd v2.2.

Windows build for mod_cache_socache added in r1388660

Fix the return values on mod_cache_socache's store_headers() implementation
to return APR errors codes and not DECLINED. We are committed to using this
implementation by this point, and any error should force us to stand down.
Submitted by: trawick
Reviewed by: minfrin

Apply proper APLOGNO codes for mod_cache_socache.

Added mod_cache_socache to NetWare build.

* Ensure that nkey is initialized.

mod_cache_socache: Don't clean up too soon. If we do, revalidated requests
lose their bodies.

Submitted by: minfrin, humbedooh, minfrin, gsmith, minfrin, minfrin, fuankg, rpluem, minfrin
Reviewed/backported by: jim

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

diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw
index 71f792a51e26a52e03c5bc37eb26ce04258c5c2a..8ffeb2196269fd7c9fc1dd349906e36f0e70689a 100644 (file)
--- a/Apache-apr2.dsw
+++ b/Apache-apr2.dsw
@@ -162,6 +162,9 @@ Package=<4>
     Project_Dep_Name mod_cache_disk
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_cache_socache
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_cern_meta
     End Project Dependency
     Begin Project Dependency
@@ -1513,6 +1516,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_cache_socache"=.\modules\cache\mod_cache_socache.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
+    Begin Project Dependency
+    Project_Dep_Name mod_cache
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_dumpio"=.\modules\debugging\mod_dumpio.dsp - Package Owner=<4>
 
 Package=<5>

diff --git a/Apache.dsw b/Apache.dsw
index ee508a1e6599f4d22117e80e66162a3607acf2e4..5c00b537a91f135b18786783d45c25bfd7d67200 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -177,6 +177,9 @@ Package=<4>
     Project_Dep_Name mod_cache_disk
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_cache_socache
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_cern_meta
     End Project Dependency
     Begin Project Dependency
@@ -1798,6 +1801,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_cache_socache"=.\modules\cache\mod_cache_socache.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
+    Begin Project Dependency
+    Project_Dep_Name mod_cache
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_dumpio"=.\modules\debugging\mod_dumpio.dsp - Package Owner=<4>
 
 Package=<5>

diff --git a/CHANGES b/CHANGES
index 329001130bd8c44318b7d043f0503d192fb019fd..3673104666df44d10a115546d9b6ca5193358bb4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.5
 
+  *) mod_cache_socache: New cache implementation backed by mod_socache
+     that replaces mod_mem_cache removed from httpd v2.2. [Graham
+     Leggett]
+
   *) htpasswd: Add -v option to verify a password. [Stefan Fritsch]
 
   *) mod_proxy: Add BalancerInherit and ProxyPassInherit to control

diff --git a/Makefile.win b/Makefile.win
index ab50800034a61fff2f4572fcda44968fb6d411a0..afdae74ca06d4c935abe866b8ebe7f55c77e4a61 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -407,6 +407,7 @@ _build:
        cd modules\cache
         $(MAKE) $(MAKEOPT) -f mod_cache.mak       CFG="mod_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_cache_disk.mak  CFG="mod_cache_disk - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_cache_socache.mak  CFG="mod_cache_socache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_file_cache.mak  CFG="mod_file_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_socache_dbm.mak CFG="mod_socache_dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 #       $(MAKE) $(MAKEOPT) -f mod_socache_dc.mak  CFG="mod_socache_dc - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -690,6 +691,7 @@ _copybin:
        copy modules\arch\win32\$(LONG)\mod_isapi.$(src_so)     "$(inst_so)" <.y
        copy modules\cache\$(LONG)\mod_cache.$(src_so)          "$(inst_so)" <.y
        copy modules\cache\$(LONG)\mod_cache_disk.$(src_so)     "$(inst_so)" <.y
+       copy modules\cache\$(LONG)\mod_cache_socache.$(src_so)  "$(inst_so)" <.y
        copy modules\cache\$(LONG)\mod_file_cache.$(src_so)     "$(inst_so)" <.y
        copy modules\cache\$(LONG)\mod_socache_dbm.$(src_so)    "$(inst_so)" <.y
 #      copy modules\cache\$(LONG)\mod_socache_dc.$(src_so)     "$(inst_so)" <.y

diff --git a/STATUS b/STATUS
index e9416062b269ea7b9b057dba5d2847cb788dd139..4912df4bca060e5ec7e6fff3926f63c1a9bf5e50 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,19 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_cache_socache: New cache implementation backed by mod_socache
-      that replaces mod_mem_cache removed from httpd v2.2.
-      trunk patches: http://svn.apache.org/r1305167
-                     http://svn.apache.org/r1330964
-                     http://svn.apache.org/r1388660
-                     http://svn.apache.org/r1388899
-                     http://svn.apache.org/r1391396
-                     http://svn.apache.org/r1391398
-                     http://svn.apache.org/r1392214
-                     http://svn.apache.org/r1406760
-                     http://svn.apache.org/r1418648
-      2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache_socache-rollup.patch
-      +1: minfrin, gsmith, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index cdae9857b6d6268a20d204ec4e1b9faa71f132f2..52e9802f3654bbdf206ae4983b388a0d35ee891c 100644 (file)
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -117,6 +117,7 @@ BEGIN {
           print "#LoadModule buffer_module modules/mod_buffer.so" > dstfl;
           print "#LoadModule cache_module modules/mod_cache.so" > dstfl;
           print "#LoadModule cache_disk_module modules/mod_cache_disk.so" > dstfl;
+          print "#LoadModule cache_socache_module modules/mod_cache_socache.so" > dstfl;
           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;

diff --git a/docs/manual/mod/allmodules.xml b/docs/manual/mod/allmodules.xml
index 31af9e6f29cb45404b6f23875e4eb642940e49c6..b1c409b089d78b753f66161d2a8015e98631137f 100644 (file)
--- a/docs/manual/mod/allmodules.xml
+++ b/docs/manual/mod/allmodules.xml
@@ -29,6 +29,7 @@
   <modulefile>mod_buffer.xml</modulefile>
   <modulefile>mod_cache.xml</modulefile>
   <modulefile>mod_cache_disk.xml</modulefile>
+  <modulefile>mod_cache_socache.xml</modulefile>
   <modulefile>mod_cern_meta.xml</modulefile>
   <modulefile>mod_cgi.xml</modulefile>
   <modulefile>mod_cgid.xml</modulefile>

diff --git a/docs/manual/socache.xml b/docs/manual/socache.xml
index c680379256c90737c30b9e878ffe6b5769c7a388..70daaa261469125090245979b88e43212ffdc293 100644 (file)
--- a/docs/manual/socache.xml
+++ b/docs/manual/socache.xml
@@ -40,6 +40,7 @@
     <p>The only configuration required is to select which cache provider
     to use.  This is the responsibility of modules using the cache, and
     they enable selection using directives such as
+    <directive module="mod_cache_socache">CacheSocache</directive>,
     <directive module="mod_authn_socache">AuthnCacheSOCache</directive>,
     <directive module="mod_ssl">SSLSessionCache</directive>, and
     <directive module="mod_ssl">SSLStaplingCache</directive>.</p>

diff --git a/modules/cache/NWGNUmakefile b/modules/cache/NWGNUmakefile
index bc0c58fe9fa818f535df4ffdad017f34c0c70a2f..e544df62c046d0dfc749fc073df7f3c3aa1e1bbf 100644 (file)
--- a/modules/cache/NWGNUmakefile
+++ b/modules/cache/NWGNUmakefile
@@ -154,6 +154,7 @@ XDCDATA             =
 TARGET_nlm = \
        $(OBJDIR)/mod_cach.nlm \
        $(OBJDIR)/cach_dsk.nlm \
+       $(OBJDIR)/cach_socache.nlm \
        $(OBJDIR)/socachdbm.nlm \
        $(OBJDIR)/socachmem.nlm \
        $(OBJDIR)/socachshmcb.nlm \

diff --git a/modules/cache/config.m4 b/modules/cache/config.m4
index 5647e89b5ba4dd28df9b8f1b170880194ad69478..b9799b76d9a278df82e4aa1d5fd099b81706af02 100644 (file)
--- a/modules/cache/config.m4
+++ b/modules/cache/config.m4
@@ -13,17 +13,20 @@ cache_storage.lo dnl
 cache_util.lo dnl
 "
 cache_disk_objs="mod_cache_disk.lo"
+cache_socache_objs="mod_cache_socache.lo"
 
 case "$host" in
   *os2*)
     # OS/2 DLLs must resolve all symbols at build time
     # and we need some from main cache module
     cache_disk_objs="$cache_disk_objs mod_cache.la"
+    cache_socache_objs="$cache_socache_objs mod_cache.la"
     ;;
 esac
 
 APACHE_MODULE(cache, dynamic file caching.  At least one storage management module (e.g. mod_cache_disk) is also necessary., $cache_objs, , most)
 APACHE_MODULE(cache_disk, disk caching module, $cache_disk_objs, , most, , cache)
+APACHE_MODULE(cache_socache, shared object caching module, $cache_socache_objs, , most)
 
 dnl
 dnl APACHE_CHECK_DISTCACHE

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 87f6e0352641c445ed7a75c04d7fd86a92455de4..70aaa21089fbeabd2961b0e52ddec4b3e2013bd5 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -119,3 +119,5 @@ mod_xml2enc.so              0x6F730000    0x00010000
 mod_data.so                 0x6F720000    0x00010000
 mod_allowmethods.so         0x6F710000    0x00010000
 mod_macro.so                0x6F700000    0x00010000
+mod_cache_socache.so        0x6F6F0000    0x00010000
+