Backport r602795: fix ajp buffer size.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603736 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 3d6a5036f351a7ac45480eb2bc4920bcb659d68b..73f3bd726030cb0d0d82bd9cbf4c1510142f7c2c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,10 @@ Changes with Apache 2.2.7
      mod_imagemap: Fix a cross-site scripting issue.  Reported by JPCERT.
      [Joe Orton]  
 
+  *) mod_proxy_ajp: Use 64K as maximum AJP packet size. This is the maximum
+     length we can squeeze inside the AJP message packet.
+     [Mladen Turk]
+
   *) core: Lower memory consumption of ap_r* functions by reusing the brigade
      instead of recreating it during each filter pass.
      [Stefan Fritsch <sf sfritsch.de>]

diff --git a/STATUS b/STATUS
index 0e62073db4cbd0d3022b3d311c50d6e6caafceca..d90395ff44045f3b3709e823168c96a17c8ee7bd 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -79,12 +79,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_proxy_ajp: Use 64K as maximum allowable AJP packet size
-     Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=602795
-     2.2.x version of the patch works
-     +1 mturk, fuankg, rpluem
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/modules/proxy/ajp.h b/modules/proxy/ajp.h
index 3451a84813a3cfbc5c19b654b0283b0adae504a4..8c022fb351b89aab2f699dcc659f9f1fe5e9e37d 100644 (file)
--- a/modules/proxy/ajp.h
+++ b/modules/proxy/ajp.h
@@ -145,7 +145,7 @@ struct ajp_msg
 #define AJP_HEADER_SZ_LEN           2
 #define AJP_HEADER_SZ               6
 #define AJP_MSG_BUFFER_SZ           8192
-#define AJP_MAX_BUFFER_SZ           16384
+#define AJP_MAX_BUFFER_SZ           65536
 #define AJP13_MAX_SEND_BODY_SZ      (AJP_MAX_BUFFER_SZ - AJP_HEADER_SZ)
 
 /** Send a request from web server to container*/