www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Improve logging for mod_proxy_ajp.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152452 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Rainer Jung
2011-07-30 10:58:34 +00:00
parent 3c52446a2b
commit 966df72b7c
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -2,6 +2,8 @@
Changes with Apache 2.3.14 Changes with Apache 2.3.14
*) mod_proxy_ajp: Improve trace logging. [Rainer Jung]
*) mod_proxy_ajp: Respect "reuse" flag in END_REPONSE packets. *) mod_proxy_ajp: Respect "reuse" flag in END_REPONSE packets.
[Rainer Jung] [Rainer Jung]

2
modules/proxy/ajp_header.c
View File

@@ -638,6 +638,7 @@ apr_status_t ajp_send_header(apr_socket_t *sock,
} }
rc = ajp_ilink_send(sock, msg); rc = ajp_ilink_send(sock, msg);
ajp_msg_log(r, msg, "ajp_send_header: ajp_ilink_send packet dump");
if (rc != APR_SUCCESS) { if (rc != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"ajp_send_header: ajp_ilink_send failed"); "ajp_send_header: ajp_ilink_send failed");
@@ -681,6 +682,7 @@ apr_status_t ajp_read_header(apr_socket_t *sock,
"ajp_read_header: ajp_ilink_receive failed"); "ajp_read_header: ajp_ilink_receive failed");
return rc; return rc;
} }
ajp_msg_log(r, *msg, "ajp_read_header: ajp_ilink_receive packet dump");
rc = ajp_msg_peek_uint8(*msg, &result); rc = ajp_msg_peek_uint8(*msg, &result);
ap_log_error(APLOG_MARK, APLOG_TRACE1, 0, r->server, ap_log_error(APLOG_MARK, APLOG_TRACE1, 0, r->server,
"ajp_read_header: ajp_ilink_received %s (0x%02x)", "ajp_read_header: ajp_ilink_received %s (0x%02x)",

2
modules/proxy/ajp_utils.c
View File

@@ -48,6 +48,7 @@ apr_status_t ajp_handle_cping_cpong(apr_socket_t *sock,
} }
rc = ajp_ilink_send(sock, msg); rc = ajp_ilink_send(sock, msg);
ajp_msg_log(r, msg, "ajp_handle_cping_cpong: ajp_ilink_send packet dump");
if (rc != APR_SUCCESS) { if (rc != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"ajp_handle_cping_cpong: ajp_ilink_send failed"); "ajp_handle_cping_cpong: ajp_ilink_send failed");
@@ -78,6 +79,7 @@ apr_status_t ajp_handle_cping_cpong(apr_socket_t *sock,
goto cleanup; goto cleanup;
} }
ajp_msg_log(r, msg, "ajp_handle_cping_cpong: ajp_ilink_receive packet dump");
rv = ajp_msg_get_uint8(msg, &result); rv = ajp_msg_get_uint8(msg, &result);
if (rv != APR_SUCCESS) { if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,

2
modules/proxy/mod_proxy_ajp.c
View File

@@ -289,6 +289,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
"proxy: got %" APR_SIZE_T_FMT " bytes of data", bufsiz); "proxy: got %" APR_SIZE_T_FMT " bytes of data", bufsiz);
if (bufsiz > 0) { if (bufsiz > 0) {
status = ajp_send_data_msg(conn->sock, msg, bufsiz); 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) { if (status != APR_SUCCESS) {
/* We had a failure: Close connection to backend */ /* We had a failure: Close connection to backend */
conn->close++; conn->close++;
@@ -410,6 +411,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
ajp_msg_reset(msg); ajp_msg_reset(msg);
/* will go in ajp_send_data_msg */ /* will go in ajp_send_data_msg */
status = ajp_send_data_msg(conn->sock, msg, bufsiz); 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) { if (status != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, status, r->server, ap_log_error(APLOG_MARK, APLOG_DEBUG, status, r->server,
"ajp_send_data_msg failed"); "ajp_send_data_msg failed");