follow up r894425:

*) CHANGES:  order
*) ap_mmn.h: Not in 2.3.4 but 2.3.5.
*) doc:      Add compat note.

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

diff --git a/CHANGES b/CHANGES
index 1d23a11e61b273871a7d9d4b148fbaf66288deea..b547de54dfa1cd53ae7cc7cd2dc890f42bffa946 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,14 +2,14 @@
 
 Changes with Apache 2.3.5
 
+  *) mod_proxy, mod_proxy_connect: Move AllowCONNECT from mod_proxy to
+     mod_proxy_connect. [Takashi Sato]
+
   *) mod_cache: Do an exact match of the keys defined by
      CacheIgnoreURLSessionIdentifiers against the querystring instead of
      a partial match.  PR 48401.i
      [Dodou Wang <wangdong.08 gmail.com>, Ruediger Pluem]
 
-  *) mod_proxy, mod_proxy_connect: Move AllowCONNECT from mod_proxy to
-     mod_proxy_connect. [Takashi Sato]
-
   *) mod_proxy_balancer: Fix crash in balancer-manager. [Rainer Jung]
 
   *) mod_headers: Ensure that changes to the main request remain valid when

diff --git a/docs/manual/mod/mod_proxy_connect.xml b/docs/manual/mod/mod_proxy_connect.xml
index b442008ea36a42c74d243510e48ac2bd7bbff5ed..d021f1913d14e744df0f76728f828e8e04ae73d0 100644 (file)
--- a/docs/manual/mod/mod_proxy_connect.xml
+++ b/docs/manual/mod/mod_proxy_connect.xml
@@ -57,6 +57,7 @@ proxy</description>
 <default>AllowCONNECT 443 563</default>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
+<compatibility>Moved from <module>mod_proxy</module> in Apache 2.3.5.</compatibility>
 
 <usage>
     <p>The <directive>AllowCONNECT</directive> directive specifies a list

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index e53717d22473604e9c113182fcad6feae4b9b511..63c9ff44302915cb32f06a78bdf468c8fab543c0 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -206,7 +206,7 @@
  * 20091031.0 (2.3.3-dev)  remove public LDAP referral-related macros
  * 20091119.0 (2.3.4-dev)  dav_error interface uses apr_status_t parm, not errno
  * 20091119.1 (2.3.4-dev)  ap_mutex_register(), ap_{proc,global}_mutex_create()
- * 20091229.0 (2.3.4-dev)  Move allowed_connect_ports from proxy_server_conf
+ * 20091229.0 (2.3.5-dev)  Move allowed_connect_ports from proxy_server_conf
  *                         to mod_proxy_connect
  *
  */