From: Jim Jagielski Date: Fri, 28 Aug 2009 14:44:56 +0000 (+0000) Subject: Merge r777042, r777091, r778438, r778439 from trunk: X-Git-Tag: 2.2.14~89 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a09fb98c6d15235d103088994d6162fc827e7edf;p=thirdparty%2Fapache%2Fhttpd.git Merge r777042, r777091, r778438, r778439 from trunk: * Add CacheIgnoreURLSessionIdentifiers directive to ignore defined session identifiers encoded in the URL when caching. * Improve documentation for CacheIgnoreURLSessionIdentifiers Submitted by: Dan Poirier * Use the correct constant. * Correctly detect if CacheIgnoreURLSessionIdentifiers is set. Submitted by: rpluem Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@808906 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 946b2c8d29c..56633d5c329 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@  -*- coding: utf-8 -*- Changes with Apache 2.2.14 + *) mod_cache: Added CacheIgnoreURLSessionIdentifiers directive to ignore + defined session identifiers encoded in the URL when caching. + *) mod_mem_cache: fix seg fault under load due to pool concurrency problem PR: 47672 [Dan Poirier ] diff --git a/STATUS b/STATUS index 437eb47ebbd..027f391d282 100644 --- a/STATUS +++ b/STATUS @@ -89,16 +89,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * mod_cache: Add CacheIgnoreURLSessionIdentifiers directive to ignore - defined session identifiers encoded in the URL when caching. - Trunk version of patch: - http://svn.apache.org/viewvc?rev=777042&view=rev - http://svn.apache.org/viewvc?rev=777091&view=rev - http://svn.apache.org/viewvc?rev=778438&view=rev - http://svn.apache.org/viewvc?rev=778439&view=rev - Backport version for 2.2.x of patch: - Trunk version of patch works - +1: rpluem, jim, minfrin PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ]