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

Make AJP trace messages a bit less cryptic.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152450 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Rainer Jung
2011-07-30 10:54:04 +00:00
parent bed1021e56
commit a7fe66131c
3 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/proxy/ajp.h
View File

@@ -491,6 +491,15 @@ apr_status_t ajp_parse_reuse(request_rec *r, ajp_msg_t *msg,
apr_status_t ajp_handle_cping_cpong(apr_socket_t *sock, apr_status_t ajp_handle_cping_cpong(apr_socket_t *sock,
request_rec *r, request_rec *r,
apr_interval_time_t timeout); apr_interval_time_t timeout);
/**
* Convert numeric message type into string
* @param type AJP message type
* @return AJP message type as a string
*/
const char *ajp_type_str(int type);
/** @} */ /** @} */
#endif /* AJP_H */ #endif /* AJP_H */

21
modules/proxy/ajp_header.c
View File

@@ -683,7 +683,8 @@ apr_status_t ajp_read_header(apr_socket_t *sock,
} }
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 0x%02x", result); "ajp_read_header: ajp_ilink_received %s (0x%02x)",
ajp_type_str(result), result);
return APR_SUCCESS; return APR_SUCCESS;
} }
@@ -693,7 +694,8 @@ int ajp_parse_type(request_rec *r, ajp_msg_t *msg)
apr_byte_t result; apr_byte_t result;
ajp_msg_peek_uint8(msg, &result); ajp_msg_peek_uint8(msg, &result);
ap_log_error(APLOG_MARK, APLOG_TRACE6, 0, r->server, ap_log_error(APLOG_MARK, APLOG_TRACE6, 0, r->server,
"ajp_parse_type: got 0x%02x", result); "ajp_parse_type: got %s (0x%02x)",
ajp_type_str(result), result);
return (int) result; return (int) result;
} }
@@ -712,8 +714,9 @@ apr_status_t ajp_parse_header(request_rec *r, proxy_dir_conf *conf,
} }
if (result != CMD_AJP13_SEND_HEADERS) { if (result != CMD_AJP13_SEND_HEADERS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"ajp_parse_headers: wrong type 0x%02x expecting 0x%02x", "ajp_parse_headers: wrong type %s (0x%02x) expecting %s (0x%02x)",
result, CMD_AJP13_SEND_HEADERS); ajp_type_str(result), result,
ajp_type_str(CMD_AJP13_SEND_HEADERS), CMD_AJP13_SEND_HEADERS);
return AJP_EBAD_HEADER; return AJP_EBAD_HEADER;
} }
return ajp_unmarshal_response(msg, r, conf); return ajp_unmarshal_response(msg, r, conf);
@@ -735,8 +738,9 @@ apr_status_t ajp_parse_data(request_rec *r, ajp_msg_t *msg,
} }
if (result != CMD_AJP13_SEND_BODY_CHUNK) { if (result != CMD_AJP13_SEND_BODY_CHUNK) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"ajp_parse_data: wrong type 0x%02x expecting 0x%02x", "ajp_parse_data: wrong type %s (0x%02x) expecting %s (0x%02x)",
result, CMD_AJP13_SEND_BODY_CHUNK); ajp_type_str(result), result,
ajp_type_str(CMD_AJP13_SEND_BODY_CHUNK), CMD_AJP13_SEND_BODY_CHUNK);
return AJP_EBAD_HEADER; return AJP_EBAD_HEADER;
} }
rc = ajp_msg_get_uint16(msg, len); rc = ajp_msg_get_uint16(msg, len);
@@ -779,8 +783,9 @@ apr_status_t ajp_parse_reuse(request_rec *r, ajp_msg_t *msg,
} }
if (result != CMD_AJP13_END_RESPONSE) { if (result != CMD_AJP13_END_RESPONSE) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"ajp_parse_reuse: wrong type 0x%02x expecting 0x%02x", "ajp_parse_reuse: wrong type %s (0x%02x) expecting %s (0x%02x)",
result, CMD_AJP13_END_RESPONSE); ajp_type_str(result), result,
ajp_type_str(CMD_AJP13_END_RESPONSE), CMD_AJP13_END_RESPONSE);
return AJP_EBAD_HEADER; return AJP_EBAD_HEADER;
} }
return ajp_msg_get_uint8(msg, reuse); return ajp_msg_get_uint8(msg, reuse);

28
modules/proxy/ajp_utils.c
View File

@@ -105,3 +105,31 @@ cleanup:
"ajp_handle_cping_cpong: Done"); "ajp_handle_cping_cpong: Done");
return rv; return rv;
} }
#define case_to_str(x) case CMD_AJP13_##x:\
return #x;\
break;
/**<2A>
* Convert numeric message type into string
* @param type AJP message type
* @return AJP message type as a string
*/
const char *ajp_type_str(int type)
{
switch (type) {
case_to_str(FORWARD_REQUEST)
case_to_str(SEND_BODY_CHUNK)
case_to_str(SEND_HEADERS)
case_to_str(END_RESPONSE)
case_to_str(GET_BODY_CHUNK)
case_to_str(SHUTDOWN)
case_to_str(PING)
case_to_str(CPONG)
case_to_str(CPING)
default:
return "CMD_AJP13_UNKNOWN";
}
}