httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r615931 - in /httpd/httpd/branches/2.2.x: STATUS modules/proxy/ajp.h modules/proxy/ajp_utils.c
Date Mon, 28 Jan 2008 16:20:48 GMT
Author: jim
Date: Mon Jan 28 08:20:44 2008
New Revision: 615931

URL: http://svn.apache.org/viewvc?rev=615931&view=rev
Log:
Merge r467259, r467274 from trunk:

128 is enough for CPING/CPONG messages.

Add CPING/CPONG message size as defined as max inside Apache Tomcat using define.
Submitted by: mturk
Reviewed by: jim

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/proxy/ajp.h
    httpd/httpd/branches/2.2.x/modules/proxy/ajp_utils.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=615931&r1=615930&r2=615931&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Jan 28 08:20:44 2008
@@ -81,15 +81,6 @@
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_proxy_ajp: Use a sufficient size for AJP CPING / CPONG messages.
-    Otherwise CPING / CPONG tests will always fail.
-    PR: 43504
-      Trunk version of patch:
-         http://svn.apache.org/viewvc?view=rev&revision=467259
-         http://svn.apache.org/viewvc?view=rev&revision=467274
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, trawick, jim
 
 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=615931&r1=615930&r2=615931&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/ajp.h (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/ajp.h Mon Jan 28 08:20:44 2008
@@ -147,6 +147,7 @@
 #define AJP_MSG_BUFFER_SZ           8192
 #define AJP_MAX_BUFFER_SZ           65536
 #define AJP13_MAX_SEND_BODY_SZ      (AJP_MAX_BUFFER_SZ - AJP_HEADER_SZ)
+#define AJP_PING_PONG_SZ            128
 
 /** Send a request from web server to container*/
 #define CMD_AJP13_FORWARD_REQUEST   (unsigned char)2

Modified: httpd/httpd/branches/2.2.x/modules/proxy/ajp_utils.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/ajp_utils.c?rev=615931&r1=615930&r2=615931&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/ajp_utils.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/ajp_utils.c Mon Jan 28 08:20:44 2008
@@ -31,7 +31,7 @@
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                          "Into ajp_handle_cping_cpong");
 
-    rc = ajp_msg_create(r->pool, AJP_HEADER_SZ_LEN+1, &msg);
+    rc = ajp_msg_create(r->pool, AJP_PING_PONG_SZ, &msg);
     if (rc != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                "ajp_handle_cping_cpong: ajp_msg_create failed");



Mime
View raw message