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

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

diff --git a/STATUS b/STATUS
index dbdb347c40c1830711e167869fefd22cd1950d28..5dbb46295ee5e8e268bdde867f3257b87dd493cf 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -81,15 +81,6 @@ RELEASE SHOWSTOPPERS:
 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 ]

diff --git a/modules/proxy/ajp.h b/modules/proxy/ajp.h
index 8c022fb351b89aab2f699dcc659f9f1fe5e9e37d..8327e8d454c8e7c2ac7c1824839b171cdb75a2b3 100644 (file)
--- a/modules/proxy/ajp.h
+++ b/modules/proxy/ajp.h
@@ -147,6 +147,7 @@ struct ajp_msg
 #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

diff --git a/modules/proxy/ajp_utils.c b/modules/proxy/ajp_utils.c
index 5a0e877269011c916a5b7bbfdb0f3259c68b7903..780aeb4856097e90159e9dc7ff5b09a47c5d95d2 100644 (file)
--- a/modules/proxy/ajp_utils.c
+++ b/modules/proxy/ajp_utils.c
@@ -31,7 +31,7 @@ apr_status_t ajp_handle_cping_cpong(apr_socket_t *sock,
     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");