summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Sato <takashi@apache.org>2009-12-30 00:40:27 +0000
committerTakashi Sato <takashi@apache.org>2009-12-30 00:40:27 +0000
commit6902a7ea7fb477e0a2233dace7321cb8296b5aed (patch)
tree67a14b536f06c4d25bd525c53fa9ea2b6dcda2a2
parent517aec9157d80094fedb1c824cdd08b26ffd11a8 (diff)
downloadhttpd-6902a7ea7fb477e0a2233dace7321cb8296b5aed.tar.gz
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
-rw-r--r--CHANGES6
-rw-r--r--docs/manual/mod/mod_proxy_connect.xml1
-rw-r--r--include/ap_mmn.h2
3 files changed, 5 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 1d23a11e61..b547de54df 100644
--- 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 b442008ea3..d021f1913d 100644
--- 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 e53717d224..63c9ff4430 100644
--- 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
*
*/