You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/04/30 16:23:34 UTC
svn commit: r1477652 - in /httpd/httpd/branches/2.4.x: ./ build/
docs/manual/ docs/manual/howto/ docs/manual/mod/ docs/manual/rewrite/
modules/cache/ os/win32/
Author: jim
Date: Tue Apr 30 14:23:33 2013
New Revision: 1477652
URL: http://svn.apache.org/r1477652
Log:
Merge r1305167, r1330964, r1388660, r1388899, r1391396, r1391398, r1392214, r1406760, r1418648 from trunk:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/Apache-apr2.dsw
httpd/httpd/branches/2.4.x/Apache.dsw
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/Makefile.win
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/build/installwinconf.awk
httpd/httpd/branches/2.4.x/docs/manual/ (props changed)
httpd/httpd/branches/2.4.x/docs/manual/howto/ (props changed)
httpd/httpd/branches/2.4.x/docs/manual/mod/ (props changed)
httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml
httpd/httpd/branches/2.4.x/docs/manual/rewrite/ (props changed)
httpd/httpd/branches/2.4.x/docs/manual/socache.xml
httpd/httpd/branches/2.4.x/modules/cache/NWGNUmakefile
httpd/httpd/branches/2.4.x/modules/cache/config.m4
httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1305167,1330964,1388660,1388899,1391396,1391398,1392214,1406760,1418648
Modified: httpd/httpd/branches/2.4.x/Apache-apr2.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Apache-apr2.dsw?rev=1477652&r1=1477651&r2=1477652&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Apache-apr2.dsw (original)
+++ httpd/httpd/branches/2.4.x/Apache-apr2.dsw Tue Apr 30 14:23:33 2013
@@ -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>
Modified: httpd/httpd/branches/2.4.x/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Apache.dsw?rev=1477652&r1=1477651&r2=1477652&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Apache.dsw (original)
+++ httpd/httpd/branches/2.4.x/Apache.dsw Tue Apr 30 14:23:33 2013
@@ -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>
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1477652&r1=1477651&r2=1477652&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Apr 30 14:23:33 2013
@@ -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
Modified: httpd/httpd/branches/2.4.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Makefile.win?rev=1477652&r1=1477651&r2=1477652&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Makefile.win (original)
+++ httpd/httpd/branches/2.4.x/Makefile.win Tue Apr 30 14:23:33 2013
@@ -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
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1477652&r1=1477651&r2=1477652&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Apr 30 14:23:33 2013
@@ -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:
Modified: httpd/httpd/branches/2.4.x/build/installwinconf.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/installwinconf.awk?rev=1477652&r1=1477651&r2=1477652&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/installwinconf.awk (original)
+++ httpd/httpd/branches/2.4.x/build/installwinconf.awk Tue Apr 30 14:23:33 2013
@@ -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;
Propchange: httpd/httpd/branches/2.4.x/docs/manual/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk/docs/manual:r1305167,1330964,1388660,1388899,1391396,1391398,1392214,1406760,1418648
Propchange: httpd/httpd/branches/2.4.x/docs/manual/howto/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk/docs/manual/howto:r1305167,1330964,1388660,1388899,1391396,1391398,1392214,1406760,1418648
Propchange: httpd/httpd/branches/2.4.x/docs/manual/mod/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk/docs/manual/mod:r1305167,1330964,1388660,1388899,1391396,1391398,1392214,1406760,1418648
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml?rev=1477652&r1=1477651&r2=1477652&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml Tue Apr 30 14:23:33 2013
@@ -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>
Propchange: httpd/httpd/branches/2.4.x/docs/manual/rewrite/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk/docs/manual/rewrite:r1305167,1330964,1388660,1388899,1391396,1391398,1392214,1406760,1418648
Modified: httpd/httpd/branches/2.4.x/docs/manual/socache.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/socache.xml?rev=1477652&r1=1477651&r2=1477652&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/socache.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/socache.xml Tue Apr 30 14:23:33 2013
@@ -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>
Modified: httpd/httpd/branches/2.4.x/modules/cache/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/NWGNUmakefile?rev=1477652&r1=1477651&r2=1477652&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/NWGNUmakefile Tue Apr 30 14:23:33 2013
@@ -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 \
Modified: httpd/httpd/branches/2.4.x/modules/cache/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/config.m4?rev=1477652&r1=1477651&r2=1477652&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/config.m4 (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/config.m4 Tue Apr 30 14:23:33 2013
@@ -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
Modified: httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref?rev=1477652&r1=1477651&r2=1477652&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref (original)
+++ httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref Tue Apr 30 14:23:33 2013
@@ -119,3 +119,5 @@ mod_xml2enc.so 0x6F730000
mod_data.so 0x6F720000 0x00010000
mod_allowmethods.so 0x6F710000 0x00010000
mod_macro.so 0x6F700000 0x00010000
+mod_cache_socache.so 0x6F6F0000 0x00010000
+
Re: svn commit: r1477652 - in /httpd/httpd/branches/2.4.x: ./ build/ docs/manual/ docs/manual/howto/ docs/manual/mod/ docs/manual/rewrite/ modules/cache/ os/win32/
Posted by Graham Leggett <mi...@sharp.fm>.
On 30 Apr 2013, at 4:23 PM, jim@apache.org wrote:
> Modified:
> httpd/httpd/branches/2.4.x/ (props changed)
> httpd/httpd/branches/2.4.x/Apache-apr2.dsw
> httpd/httpd/branches/2.4.x/Apache.dsw
> httpd/httpd/branches/2.4.x/CHANGES
> httpd/httpd/branches/2.4.x/Makefile.win
> httpd/httpd/branches/2.4.x/STATUS
> httpd/httpd/branches/2.4.x/build/installwinconf.awk
> httpd/httpd/branches/2.4.x/docs/manual/ (props changed)
> httpd/httpd/branches/2.4.x/docs/manual/howto/ (props changed)
> httpd/httpd/branches/2.4.x/docs/manual/mod/ (props changed)
> httpd/httpd/branches/2.4.x/docs/manual/mod/allmodules.xml
> httpd/httpd/branches/2.4.x/docs/manual/rewrite/ (props changed)
> httpd/httpd/branches/2.4.x/docs/manual/socache.xml
> httpd/httpd/branches/2.4.x/modules/cache/NWGNUmakefile
> httpd/httpd/branches/2.4.x/modules/cache/config.m4
Seems the script didn't backport the mod_cache_socache.c module itself.
mod_cache_socache.c started life as an svn copy of mod_cache_disk.c, and to get the patch to work properly I had to pass --show-copies-as-adds to svn diff.
Regards,
Graham
--