From: Stefan Fritsch <sf@apache.org>
Date: Sat, 30 Jan 2010 11:23:43 +0000 (+0000)
Subject: Ooops. We are at 2.3.6 by now.
X-Git-Tag: 2.3.6~538
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc82c3eb120d632100499734118c17c03a482ead;p=apache

Ooops. We are at 2.3.6 by now.


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

diff --git a/CHANGES b/CHANGES
index 05e8c39d7c..4d1ca4bda4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,11 @@
 
 Changes with Apache 2.3.6
 
+  *) Make ap_pregsub(), used by AliasMatch and friends, use the same syntax
+     for regex backreferences as mod_rewrite and mod_include: Remove the use
+     of '&' as an alias for '$0' and allow to escape any character with a
+     backslash. PR 48351. [Stefan Fritsch]
+
   *) mod_authnz_ldap: If AuthLDAPCharsetConfig is set, also convert the
      password to UTF-8. PR 45318.
      [Johannes Müller <joh_m gmx.de>, Stefan Fritsch]
@@ -20,11 +25,6 @@ Changes with Apache 2.3.5
      optimization in the case of no request body.  PR 48359 
      [Jake Scott, William Rowe, Ruediger Pluem]
 
-  *) Make ap_pregsub(), used by AliasMatch and friends, use the same syntax
-     for regex backreferences as mod_rewrite and mod_include: Remove the use
-     of '&' as an alias for '$0' and allow to escape any character with a
-     backslash. PR 48351. [Stefan Fritsch]
-
   *) Turn static function get_server_name_for_url() into public
      ap_get_server_name_for_url() and use it where appropriate. This
      fixes mod_rewrite generating invalid URLs for redirects to IPv6
diff --git a/docs/manual/glossary.html.en b/docs/manual/glossary.html.en
index 7e31099975..6ce5bf6eb7 100644
--- a/docs/manual/glossary.html.en
+++ b/docs/manual/glossary.html.en
@@ -369,7 +369,7 @@
       to the whole matched expression. To write a literal dollar sign in a
       replacement string, it can be escaped with a backslash. Historically, the
       variable &amp; could be used as alias for $0 in some places. This is no
-      longer possible since version 2.3.5.  Apache uses Perl Compatible Regular
+      longer possible since version 2.3.6.  Apache uses Perl Compatible Regular
       Expressions provided by the <a href="http://www.pcre.org/">PCRE</a>
       library.  You can find more documentation about PCRE's regular expression
       syntax at that site, or at
@@ -478,4 +478,4 @@
 </div><div id="footer">
 <p class="apache">Copyright 2010 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml
index 53a7f38826..ce212fff6b 100644
--- a/docs/manual/glossary.xml
+++ b/docs/manual/glossary.xml
@@ -387,7 +387,7 @@
       to the whole matched expression. To write a literal dollar sign in a
       replacement string, it can be escaped with a backslash. Historically, the
       variable &amp; could be used as alias for $0 in some places. This is no
-      longer possible since version 2.3.5.  Apache uses Perl Compatible Regular
+      longer possible since version 2.3.6.  Apache uses Perl Compatible Regular
       Expressions provided by the <a href="http://www.pcre.org/">PCRE</a>
       library.  You can find more documentation about PCRE's regular expression
       syntax at that site, or at