From: Jim Jagielski Date: Mon, 28 Jan 2008 16:20:44 +0000 (+0000) Subject: Merge r467259, r467274 from trunk: X-Git-Tag: 2.2.9~392 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a0a759ce2949ea268be85676f9781aabe3c565d;p=thirdparty%2Fapache%2Fhttpd.git 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 dbdb347c40c..5dbb46295ee 100644 --- 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 8c022fb351b..8327e8d454c 100644 --- 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 5a0e8772690..780aeb48560 100644 --- 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");