Commit 861fae5f authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@733762 13f79535-47bb-0310-9956-ffa450edef68
parent 6f831dc8

CHANGES

+4 −0
Original line number Diff line number Diff line 
                                                         -*- 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]

STATUS

+0 −9
Original line number Diff line number Diff line
@@ -94,15 +94,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
      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 ]

docs/manual/env.html.en

+9 −0
Original line number Diff line number Diff line
@@ -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>

docs/manual/env.xml

+9 −0
Original line number Diff line number Diff line
@@ -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>

docs/manual/mod/mod_cache.html.en

+14 −0
Original line number Diff line number Diff line
@@ -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 @@ manager</td></tr> 
      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>