From: Nick Kew Date: Wed, 12 Dec 2007 20:50:37 +0000 (+0000) Subject: Backport r602795: fix ajp buffer size. X-Git-Tag: 2.2.7~102 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3a27b19c456518ab6967e3e16336c15f4ce764e;p=thirdparty%2Fapache%2Fhttpd.git 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 3d6a5036f35..73f3bd72603 100644 --- 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 ] diff --git a/STATUS b/STATUS index 0e62073db4c..d90395ff440 100644 --- 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 3451a84813a..8c022fb351b 100644 --- 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*/