Commit 480b3d25 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

update merge of changes in 2.4.x 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-changes@1715192 13f79535-47bb-0310-9956-ffa450edef68
parents 9f13ceb2 1458fa4e

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ Changes with Apache 2.4.17 
     to avoid reusing it should the close be effective after some new request

     is ready to be sent.  [Yann Ylavic]



  *) mod_ssl: Make the output filter more friendly with deferred write and

     response pipelining. [Yann Ylavic, Joe Orton]



  *) mod_substitute: Allow to configure the patterns merge order with the new

     SubstituteInheritBefore on|off directive.  PR 57641

     [Marc.Stern <Marc.Stern approach.be>, Yann Ylavic, William Rowe]

STATUS

+32 −14
Original line number Diff line number Diff line
@@ -127,19 +127,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     2.4.x patch: https://people.apache.org/~minfrin/httpd-mod_alias-expr2.patch

     +1: minfrin



   * mod_ssl: Make the output filter more friendly with deferred write and

              response pipelining.

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

                  http://svn.apache.org/r1705823

                  http://svn.apache.org/r1705826

                  http://svn.apache.org/r1705828

                  http://svn.apache.org/r1705833

                  http://svn.apache.org/r1706275

                  http://svn.apache.org/r1707230

                  http://svn.apache.org/r1707231

     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_ssl-deferred_friendly-v3.patch

     +1: ylavic



   * core: Fix crash in ap_mpm_pod_check call caused by NULL dereference of

          its parameter when starting httpd as single process (httpd -X).

     trunk patch: http://svn.apache.org/r1711479
@@ -161,6 +148,37 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-check_pipeline_blank_lines.patch

                  (trunk works, meant to ease review)

     +1: ylavic, minfrin

     icing: test 3 fails for me in t/security/CVE-2005-3357.t

     ylavic: not related (at least not the cause), fixed in r1715023.



  *) core/mod_ssl: 

     - master conn_rec* addition to conn_rec

     - minor mmn bump

     - improved ALPN and Upgrade handling

     - allowing requests for servers whose TLS configuration is compatible

       to the SNI server ones

     - disabling TLS renegotiation for slave connections

     changes are necessary for update modules/http2

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

                  http://svn.apache.org/r1709587

                  http://svn.apache.org/r1709602

                  http://svn.apache.org/r1709995

                  http://svn.apache.org/r1710231

                  http://svn.apache.org/r1710419

                  http://svn.apache.org/r1710572

                  http://svn.apache.org/r1710583

                  + manual addition of "conn_rec *master;"

     2.4.x patch: https://raw.githubusercontent.com/icing/mod_h2/master/sandbox/httpd/patches/2.4.17-protocols.patch

     branch mergeable to 2.4.x: ^/httpd/httpd/branches/2.4.17-protocols-changes

     +1: icing, jim

     ylavic: +1 with r1715023.



  *) mod_ssl: For the "SSLStaplingReturnResponderErrors off" case, make sure

              to only staple responses with certificate status "good"

     trunk patch: https://svn.apache.org/r1711728

                  https://svn.apache.org/r1713209 (missing LOGNO only)

     2.4.x patch: trunk works (modulo CHANGES)

     +1: kbrand, icing

    



PATCHES/ISSUES THAT ARE BEING WORKED

docs/manual/mod/core.html.fr

+18 −9
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 
<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |

<a href="../tr/mod/core.html" hreflang="tr" rel="alternate" title="Trke">&nbsp;tr&nbsp;</a></p>

</div>

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

            anglaise pour les changements rcents.</div>

<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Fonctionnalits de base du serveur HTTP Apache toujours

disponibles</td></tr>

<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Core</td></tr></table>
@@ -3947,19 +3945,30 @@ seulement depuis la version 2.3.3 sous Windows.</td></tr> 
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

<div class="directive-section"><h2><a name="qualifyredirecturl" id="qualifyredirecturl">Directive</a> <a name="QualifyRedirectURL" id="QualifyRedirectURL">QualifyRedirectURL</a></h2>

<table class="directive">

<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Controls whether the REDIRECT_URL environent variable is 

             fully qualified</td></tr>

<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Vrifie si la variable d'environnement REDIRECT_URL est

pleinement qualifie</td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>QualifyRedirectURL ON|OFF</code></td></tr>

<tr><th><a href="directive-dict.html#Default">Dfaut:</a></th><td><code>QualifyRedirectURL OFF</code></td></tr>

<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, rpertoire</td></tr>

<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</td></tr>

<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Core</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibilit:</a></th><td>Directive supported in 2.4.18 and later. 2.4.17 acted

as if 'QualifyRedirectURL ON' was configured.</td></tr>

</table><p>La documentation de cette directive

	n'a pas encore t traduite. Veuillez vous reporter  la version

	en langue anglaise.</p></div>

<tr><th><a href="directive-dict.html#Compatibility">Compatibilit:</a></th><td>Directive supporte  partir de la version 2.4.18 du

serveur HTTP Apache. Jusqu' la version 2.4.17, le serveur se comportait

comme si la directive QualifyRedirectURL tait dfinie  ON.</td></tr>

</table>

    <p>Cette directive permet de s'assurer que le serveur vrifiera que

    la variable d'environnement REDIRECT_URL est bien pleinement

    qualifie. Par dfaut, cette variable contient l'URL textuellement

    demande par le client, par exemple "/index.html". Avec <code class="directive"><a href="#qualifyredirecturl on">QualifyRedirectURL ON</a></code>, la mme requte

    affectera  la variable REDIRECT_URL une valeur du style

    "http://www.example.com/index.html".</p>

    <p>Mme si cette directive n'est pas dfinie, lorsqu'une requte est

    soumise avec une URL pleinement qualifie, la variable REDIRECT_URL

    contiendra quand-mme une URL pleinement qualifie.

    </p>



</div>

<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

<div class="directive-section"><h2><a name="rlimitcpu" id="rlimitcpu">Directive</a> <a name="RLimitCPU" id="RLimitCPU">RLimitCPU</a></h2>

<table class="directive">

docs/manual/mod/core.xml.fr

+30 −1
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">

<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>

<!-- English Revision: 1705784:1712268 (outdated) -->

<!-- English Revision: 1712268 -->

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

<!-- Reviewed by : Vincent Deffontaines -->
@@ -5069,4 +5069,33 @@ Apache</compatibility> 
</usage>

</directivesynopsis>



<directivesynopsis>

<name>QualifyRedirectURL</name>

<description>V&eacute;rifie si la variable d'environnement REDIRECT_URL est

pleinement qualifi&eacute;e</description>

<syntax>QualifyRedirectURL ON|OFF</syntax>

<default>QualifyRedirectURL OFF</default>

<contextlist><context>server config</context><context>virtual host</context>

<context>directory</context>

</contextlist>

<override>FileInfo</override>

<compatibility>Directive support&eacute;e &agrave; partir de la version 2.4.18 du

serveur HTTP Apache. Jusqu'&agrave; la version 2.4.17, le serveur se comportait

comme si la directive QualifyRedirectURL &eacute;tait d&eacute;finie &agrave; ON.</compatibility>



<usage>

    <p>Cette directive permet de s'assurer que le serveur v&eacute;rifiera que

    la variable d'environnement REDIRECT_URL est bien pleinement

    qualifi&eacute;e. Par d&eacute;faut, cette variable contient l'URL textuellement

    demand&eacute;e par le client, par exemple "/index.html". Avec <directive

    module="core">QualifyRedirectURL ON</directive>, la m&ecirc;me requ&ecirc;te

    affectera &agrave; la variable REDIRECT_URL une valeur du style

    "http://www.example.com/index.html".</p>

    <p>M&ecirc;me si cette directive n'est pas d&eacute;finie, lorsqu'une requ&ecirc;te est

    soumise avec une URL pleinement qualifi&eacute;e, la variable REDIRECT_URL

    contiendra quand-m&ecirc;me une URL pleinement qualifi&eacute;e.

    </p>

</usage>

</directivesynopsis>



</modulesynopsis>

docs/manual/mod/core.xml.meta

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
    <variant outdated="yes">de</variant>

    <variant>en</variant>

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

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

    <variant>fr</variant>

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

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

  </variants>