Improve logging for mod_proxy_ajp.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152452 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index b0bff8759513bf4a62a2566835665bb86e36a6de..2896cb2a9483e47a046a7bf13b468dc22450585e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/modules/proxy/ajp_header.c b/modules/proxy/ajp_header.c
index 7a1aaddbe1e582ab0de0247d3b101b4ae4f36980..0c8a333dd45aa85c15aea35e27feb27cb979e506 100644 (file)
--- a/modules/proxy/ajp_header.c
+++ b/modules/proxy/ajp_header.c
@@ -638,6 +638,7 @@ apr_status_t ajp_send_header(apr_socket_t *sock,
     }
 
     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_t *sock,
                "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)",

diff --git a/modules/proxy/ajp_utils.c b/modules/proxy/ajp_utils.c
index b6cea731eb5028e8addabb6dbcf43fb69920f9a7..f89b10f61f5d182d11673678c312c1083ddf04fb 100644 (file)
--- a/modules/proxy/ajp_utils.c
+++ b/modules/proxy/ajp_utils.c
@@ -48,6 +48,7 @@ apr_status_t ajp_handle_cping_cpong(apr_socket_t *sock,
     }
 
     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_socket_t *sock,
         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,

diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c
index bf435f6b22cedf7b422aa86af50c95567c58f790..b17d7ae39a2fc9944a8d7facd10bd1d0c36c58d2 100644 (file)
--- a/modules/proxy/mod_proxy_ajp.c
+++ b/modules/proxy/mod_proxy_ajp.c
@@ -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);
         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_t *p, request_rec *r,
                     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");