You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2007/12/12 21:50:37 UTC
svn commit: r603736 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/proxy/ajp.h
Author: niq
Date: Wed Dec 12 12:50:37 2007
New Revision: 603736
URL: http://svn.apache.org/viewvc?rev=603736&view=rev
Log:
Backport r602795: fix ajp buffer size.
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/proxy/ajp.h
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=603736&r1=603735&r2=603736&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Wed Dec 12 12:50:37 2007
@@ -5,6 +5,10 @@
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>]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=603736&r1=603735&r2=603736&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Dec 12 12:50:37 2007
@@ -79,12 +79,6 @@
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 ]
Modified: httpd/httpd/branches/2.2.x/modules/proxy/ajp.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/ajp.h?rev=603736&r1=603735&r2=603736&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/ajp.h (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/ajp.h Wed Dec 12 12:50:37 2007
@@ -145,7 +145,7 @@
#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*/