Commit 42377254 authored by asf-sync-process's avatar asf-sync-process
Browse files

latest changes from branches/2.4.x, merged --enable-http2 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1704828 13f79535-47bb-0310-9956-ffa450edef68
parents ea63b1bd 54facdbf

STATUS

+25 −1
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
         svn diff ^/httpd/httpd/branches/2.4.x ^/httpd/httpd/branches/2.4.17-protocols-http2

     +1: icing, jim





  *) mod_slotmem_shm: Fix slots/SHM files names on restart for systems that

     can't create new (clear) slots while previous children gracefully stopping

     still use the old ones (e.g. Windows, OS2). PR 58024.
@@ -284,6 +283,31 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     merge patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_slotmem_shm-generation.patch

     +1: ylavic, jim



  *) mod_proxy: don't recyle backend announced "Connection: close" connections

     to avoid reusing it should the close be effective after some new request

     is ready to be sent.

     trunk patch: http://svn.apache.org/r1678763

                  http://svn.apache.org/r1703807

                  http://svn.apache.org/r1703813

     2.4.x patch: trunk works (module CHANGES)

     +1: ylavic

     ylavic: while at it, I also included r1678763 which is only an

             optimization, but allows to keep code in sync with trunk.



  *) mod_proxy: Fix ProxySourceAddress binding failure with AH00938.  PR 56687.

     trunk patch: http://svn.apache.org/r1703902

     2.4.x patch: trunk works (module CHANGES)

     +1: ylavic



   * mod_cache: r->err_headers_out is not merged into

     r->headers when mod_cache is enabled and the response

     is cached for the first time.

     trunk patch: http://svn.apache.org/r1704392

                  http://svn.apache.org/r1704395

     2.4.x patch: trunk works

     +1: elu





PATCHES/ISSUES THAT ARE BEING WORKED



   * mod_proxy_http: Don't establish or reuse a backend connection before pre-

docs/manual/rewrite/advanced.html.fr

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
<p><span>Langues Disponibles: </span><a href="../en/rewrite/advanced.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |

<a href="../fr/rewrite/advanced.html" title="Français">&nbsp;fr&nbsp;</a></p>

</div>

<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version

            anglaise pour les changements récents.</div>





<p>Ce document complète la <a href="../mod/mod_rewrite.html">documentation de référence</a> du

docs/manual/rewrite/advanced.xml.fr

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>

<!-- French translation : Lucien GENTIS -->

<!-- Reviewed by : Vincent Deffontaines -->

<!-- English Revision: 1686271:1701772 (outdated) -->

<!-- English Revision: 1703403 -->



<!--

 Licensed to the Apache Software Foundation (ASF) under one or more

docs/manual/rewrite/advanced.xml.meta

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ 


  <variants>

    <variant>en</variant>

    <variant outdated="yes">fr</variant>

    <variant>fr</variant>

  </variants>

</metafile>

docs/manual/rewrite/flags.html.fr

+9 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
<p><span>Langues Disponibles: </span><a href="../en/rewrite/flags.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |

<a href="../fr/rewrite/flags.html" title="Franais">&nbsp;fr&nbsp;</a></p>

</div>

<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version

            anglaise pour les changements rcents.</div>



<p>Ce document dcrit les drapeaux disponibles dans la directive

<code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>, en fournissant
@@ -147,6 +145,15 @@ suivante :</p> 
[CO=NAME:VALUE:DOMAIN:lifetime:path:secure:httponly]

</code></p></div>



<p>Si un caractre littral ':' doit tre insrer dans un des champs du

cookie, une autre syntaxe est disponible. Pour utiliser cette syntaxe

alternative, le contenu du champ "Name" doit tre prcd du caractre

';', et les spateurs de champs deviendront des ';'.</p>



<div class="example"><p><code>

[CO=;NAME;VALUE:MOREVALUE;DOMAIN;lifetime;path;secure;httponly]

</code></p></div>



<p>Vous devez dclarer un nom, une valeur et un domaine pour que

le cookie puisse tre dfini.</p>