You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2011/07/30 12:58:35 UTC
svn commit: r1152452 - in /httpd/httpd/trunk: CHANGES
modules/proxy/ajp_header.c modules/proxy/ajp_utils.c
modules/proxy/mod_proxy_ajp.c
Author: rjung
Date: Sat Jul 30 10:58:34 2011
New Revision: 1152452
URL: http://svn.apache.org/viewvc?rev=1152452&view=rev
Log:
Improve logging for mod_proxy_ajp.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/proxy/ajp_header.c
httpd/httpd/trunk/modules/proxy/ajp_utils.c
httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1152452&r1=1152451&r2=1152452&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat Jul 30 10:58:34 2011
@@ -2,6 +2,8 @@
Changes with Apache 2.3.14
+ *) mod_proxy_ajp: Improve trace logging. [Rainer Jung]
+
*) mod_proxy_ajp: Respect "reuse" flag in END_REPONSE packets.
[Rainer Jung]
Modified: httpd/httpd/trunk/modules/proxy/ajp_header.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/ajp_header.c?rev=1152452&r1=1152451&r2=1152452&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/ajp_header.c (original)
+++ httpd/httpd/trunk/modules/proxy/ajp_header.c Sat Jul 30 10:58:34 2011
@@ -638,6 +638,7 @@ apr_status_t ajp_send_header(apr_socket_
}
rc = ajp_ilink_send(sock, msg);
+ ajp_msg_log(r, msg, "ajp_send_header: ajp_ilink_send packet dump");
if (rc != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"ajp_send_header: ajp_ilink_send failed");
@@ -681,6 +682,7 @@ apr_status_t ajp_read_header(apr_socket_
"ajp_read_header: ajp_ilink_receive failed");
return rc;
}
+ ajp_msg_log(r, *msg, "ajp_read_header: ajp_ilink_receive packet dump");
rc = ajp_msg_peek_uint8(*msg, &result);
ap_log_error(APLOG_MARK, APLOG_TRACE1, 0, r->server,
"ajp_read_header: ajp_ilink_received %s (0x%02x)",
Modified: httpd/httpd/trunk/modules/proxy/ajp_utils.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/ajp_utils.c?rev=1152452&r1=1152451&r2=1152452&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/ajp_utils.c (original)
+++ httpd/httpd/trunk/modules/proxy/ajp_utils.c Sat Jul 30 10:58:34 2011
@@ -48,6 +48,7 @@ apr_status_t ajp_handle_cping_cpong(apr_
}
rc = ajp_ilink_send(sock, msg);
+ ajp_msg_log(r, msg, "ajp_handle_cping_cpong: ajp_ilink_send packet dump");
if (rc != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"ajp_handle_cping_cpong: ajp_ilink_send failed");
@@ -78,6 +79,7 @@ apr_status_t ajp_handle_cping_cpong(apr_
goto cleanup;
}
+ ajp_msg_log(r, msg, "ajp_handle_cping_cpong: ajp_ilink_receive packet dump");
rv = ajp_msg_get_uint8(msg, &result);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c?rev=1152452&r1=1152451&r2=1152452&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c Sat Jul 30 10:58:34 2011
@@ -289,6 +289,7 @@ static int ap_proxy_ajp_request(apr_pool
"proxy: got %" APR_SIZE_T_FMT " bytes of data", bufsiz);
if (bufsiz > 0) {
status = ajp_send_data_msg(conn->sock, msg, bufsiz);
+ ajp_msg_log(r, msg, "First ajp_send_data_msg: ajp_ilink_send packet dump");
if (status != APR_SUCCESS) {
/* We had a failure: Close connection to backend */
conn->close++;
@@ -410,6 +411,7 @@ static int ap_proxy_ajp_request(apr_pool
ajp_msg_reset(msg);
/* will go in ajp_send_data_msg */
status = ajp_send_data_msg(conn->sock, msg, bufsiz);
+ ajp_msg_log(r, msg, "ajp_send_data_msg after CMD_AJP13_GET_BODY_CHUNK: ajp_ilink_send packet dump");
if (status != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, status, r->server,
"ajp_send_data_msg failed");