httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r733762 - in /httpd/httpd/branches/2.2.x: ./ docs/ docs/conf/ docs/manual/ docs/manual/mod/ modules/cache/ support/
Date Mon, 12 Jan 2009 14:07:16 GMT
Author: jim
Date: Mon Jan 12 06:07:10 2009
New Revision: 733762

URL: http://svn.apache.org/viewvc?rev=733762&view=rev
Log:
Merge r729316, r729317 from trunk:

look for 'no-cache' in subprocess_env to prevent the saving
of an otherwise cacheable response.


document no-cache envvar

Submitted by: covener
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.2.x/   (props changed)
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/docs/   (props changed)
    httpd/httpd/branches/2.2.x/docs/conf/mime.types   (props changed)
    httpd/httpd/branches/2.2.x/docs/manual/env.html.en
    httpd/httpd/branches/2.2.x/docs/manual/env.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.html.en
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.xml
    httpd/httpd/branches/2.2.x/modules/cache/mod_cache.c
    httpd/httpd/branches/2.2.x/support/ab.c   (props changed)
    httpd/httpd/branches/2.2.x/support/suexec.c   (props changed)

Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 06:07:10 2009
@@ -1 +1 @@
-/httpd/httpd/trunk:451572,611483,639005,639010,647395,657354,657459,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250,729586,732414,732504,732832,733127,733134,733218-733219
+/httpd/httpd/trunk:451572,611483,639005,639010,647395,657354,657459,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250,729316-729317,729586,732414,732504,732832,733127,733134,733218-733219

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=733762&r1=733761&r2=733762&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Jan 12 06:07:10 2009
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.12
 
+  *) mod_cache: Introduce 'no-cache' per-request environment variable
+     to prevent the saving of an otherwise cacheable response.
+     [Eric Covener]
+
   *) core: Translate the the status line to ASCII on EBCDIC platforms in
      ap_send_interim_response() and for locally generated "100 Continue"
      responses.  [Eric Covener]

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=733762&r1=733761&r2=733762&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Jan 12 06:07:10 2009
@@ -94,15 +94,6 @@
       http://people.apache.org/~rederpj/backport_PR46342_simpleLDAPinit.diff
     +1: rederpj, niq, covener
 
-  * mod_cache: Introduce 'no-cache' per-request environment variable
-    to prevent the saving of an otherwise cacheable response.
-      trunk:
-        http://svn.apache.org/viewvc?rev=729316&view=rev
-        http://svn.apache.org/viewvc?rev=729317&view=rev
-      2.2.x:
-        trunk works
-    +1 covener, rpluem, niq
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

Propchange: httpd/httpd/branches/2.2.x/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 06:07:10 2009
@@ -1 +1 @@
-/httpd/httpd/trunk/docs:451572,611483,639005,639010,647395,657354,657459,660461,660566,664330,675610,678761,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325,693120,693392,693727-693728,696006,697093,703441,703997,706318,707163,708902,711421,719357,720250,729586,732414,732504,732832,733127,733134,733218-733219
+/httpd/httpd/trunk/docs:451572,611483,639005,639010,647395,657354,657459,660461,660566,664330,675610,678761,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325,693120,693392,693727-693728,696006,697093,703441,703997,706318,707163,708902,711421,719357,720250,729316-729317,729586,732414,732504,732832,733127,733134,733218-733219

Propchange: httpd/httpd/branches/2.2.x/docs/conf/mime.types
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 06:07:10 2009
@@ -1 +1 @@
-/httpd/httpd/trunk/docs/conf/mime.types:83749-721972,729586,732414,732504,732832,733127,733134,733218-733219
+/httpd/httpd/trunk/docs/conf/mime.types:83749-721972,729316-729317,729586,732414,732504,732832,733127,733134,733218-733219

Modified: httpd/httpd/branches/2.2.x/docs/manual/env.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/env.html.en?rev=733762&r1=733761&r2=733762&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/env.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/env.html.en Mon Jan 12 06:07:10 2009
@@ -282,6 +282,15 @@
 
     
 
+    <h3><a name="no-cache" id="no-cache">no-cache</a></h3>
+
+        <p>When set, <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>
will not save an otherwise
+        cacheable response.  This environment variable does not influence
+        whether a response already in the cache will be served for the current 
+        request.</p>
+
+    
+
     <h3><a name="nokeepalive" id="nokeepalive">nokeepalive</a></h3>
         
 

Modified: httpd/httpd/branches/2.2.x/docs/manual/env.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/env.xml?rev=733762&r1=733761&r2=733762&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/env.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/env.xml Mon Jan 12 06:07:10 2009
@@ -323,6 +323,15 @@
 
     </section>
 
+    <section id="no-cache"><title>no-cache</title>
+
+        <p>When set, <module>mod_cache</module> will not save an otherwise
+        cacheable response.  This environment variable does not influence
+        whether a response already in the cache will be served for the current 
+        request.</p>
+
+    </section>
+
     <section id="nokeepalive">
         <title>nokeepalive</title>
 

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.html.en?rev=733762&r1=733761&r2=733762&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.html.en Mon Jan 12 06:07:10 2009
@@ -164,6 +164,13 @@
       CacheDisable /local_files
     </code></p></div>
 
+    <p> The <code>no-cache</code> environment variable can be set to 
+    disable caching on a finer grained set of resources.</p>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../env.html">Environment Variables in Apache</a></li>
+</ul>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
 <div class="directive-section"><h2><a name="CacheEnable" id="CacheEnable">CacheEnable</a>
<a name="cacheenable" id="cacheenable">Directive</a></h2>
@@ -213,7 +220,14 @@
       CacheEnable  disk  http://www.apache.org/<br />
     </code></p></div>
 
+    <p> The <code>no-cache</code> environment variable can be set to 
+    disable caching on a finer grained set of resources.</p>
 
+
+<h3>See also</h3>
+<ul>
+<li><a href="../env.html">Environment Variables in Apache</a></li>
+</ul>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
 <div class="directive-section"><h2><a name="CacheIgnoreCacheControl" id="CacheIgnoreCacheControl">CacheIgnoreCacheControl</a>
<a name="cacheignorecachecontrol" id="cacheignorecachecontrol">Directive</a></h2>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.xml?rev=733762&r1=733761&r2=733762&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_cache.xml Mon Jan 12 06:07:10 2009
@@ -172,7 +172,11 @@
       CacheEnable  disk  http://www.apache.org/<br />
     </example>
 
+    <p> The <code>no-cache</code> environment variable can be set to 
+    disable caching on a finer grained set of resources.</p>
+
 </usage>
+<seealso><a href="../env.html">Environment Variables in Apache</a></seealso>
 </directivesynopsis>
 
 <directivesynopsis>
@@ -190,8 +194,11 @@
     <example><title>Example</title>
       CacheDisable /local_files
     </example>
-</usage>
 
+    <p> The <code>no-cache</code> environment variable can be set to 
+    disable caching on a finer grained set of resources.</p>
+</usage>
+<seealso><a href="../env.html">Environment Variables in Apache</a></seealso>
 </directivesynopsis>
 <directivesynopsis>
 <name>CacheMaxExpire</name>

Modified: httpd/httpd/branches/2.2.x/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/cache/mod_cache.c?rev=733762&r1=733761&r2=733762&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/cache/mod_cache.c (original)
+++ httpd/httpd/branches/2.2.x/modules/cache/mod_cache.c Mon Jan 12 06:07:10 2009
@@ -540,6 +540,9 @@
                               "*", NULL)) {
         reason = "Vary header contains '*'";
     }
+    else if (apr_table_get(r->subprocess_env, "no-cache") != NULL) { 
+        reason = "environment variable 'no-cache' is set";
+    }
     else if (r->no_cache) {
         /* or we've been asked not to cache it above */
         reason = "r->no_cache present";

Propchange: httpd/httpd/branches/2.2.x/support/ab.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 06:07:10 2009
@@ -1 +1 @@
-/httpd/httpd/trunk/support/ab.c:83751-655654,657354,657433,657459,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250,729586,732414,732504,732832,733127,733134,733218-733219
+/httpd/httpd/trunk/support/ab.c:83751-655654,657354,657433,657459,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250,729316-729317,729586,732414,732504,732832,733127,733134,733218-733219

Propchange: httpd/httpd/branches/2.2.x/support/suexec.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 06:07:10 2009
@@ -1 +1 @@
-/httpd/httpd/trunk/support/suexec.c:451572,611483,639005,639010,647395,655711,657354,657459,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250,729586,732414,732504,732832,733127,733134,733218-733219
+/httpd/httpd/trunk/support/suexec.c:451572,611483,639005,639010,647395,655711,657354,657459,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250,729316-729317,729586,732414,732504,732832,733127,733134,733218-733219



Mime
View raw message