From: Eric Covener <covener@apache.org>
Date: Wed, 9 Mar 2016 15:14:14 +0000 (+0000)
Subject: backported
X-Git-Tag: 2.5.0-alpha~1935
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0daa39b2824b069c0f78cabb32247e46def79eda;p=thirdparty%2Fapache%2Fhttpd.git

backported


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734260 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 86a807555b2..4d83effa2c7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,9 +8,6 @@ Changes with Apache 2.5.0
   *) mod_reqtimeout: Prevent long response times from triggering a timeout once
      the request has been fully read.  PR 59045.  [Yann Ylavic]
 
-  *) mod_rewrite: Add QSL|qslast flag to allow rewrites to files with 
-     literal question marks in their names. PR 58777. [Eric Covener]
-
   *) core: Split ap_create_request() from ap_read_request(). [Graham Leggett]
 
   *) mod_ssl: Don't lose track of the SSL context if the ssl_run_pre_handshake()
diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 24acc23aff9..ea0fca334cf 100644
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -1365,9 +1365,10 @@ cannot use <code>$N</code> in the substitution string!
         ...</a></em></td>
     </tr>
     <tr>
-        <td>qslast|QSA</td>
+        <td>qslast|QSL</td>
         <td>Interpret the last (right-most) question mark as the query string
             delimeter, instead of the first (left-most) as normally used.  
+            Available in 2.4.19 and later.
         <em><a href="../rewrite/flags.html#flag_qsl">details
         ...</a></em></td>
     </tr>
diff --git a/docs/manual/rewrite/flags.xml b/docs/manual/rewrite/flags.xml
index f0fe2cec73a..3439c6da43e 100644
--- a/docs/manual/rewrite/flags.xml
+++ b/docs/manual/rewrite/flags.xml
@@ -653,7 +653,7 @@ This is useful when mapping to files that have literal question marks in
 their filename.  If no query string is used in the substitution, 
 a question mark can be appended to it in combination with this flag.  </p>
 
-<p> This flag is available in version 2.5.0 and later.</p>
+<p> This flag is available in version 2.4.19 and later.</p>
 
 </section>