diff options
author | Mladen Turk <mturk@apache.org> | 2004-09-17 14:59:44 +0200 |
---|---|---|
committer | Mladen Turk <mturk@apache.org> | 2004-09-17 14:59:44 +0200 |
commit | 8a33fdf6fb24abb281847858c792ae7242962e77 (patch) | |
tree | 324704bb984d6e09bf2dad9703a1a19cccde37cd /modules/proxy/ajp_header.c | |
parent | Remove logging inside ajp_send_data_msg. If send fails it is logged (diff) | |
download | apache2-8a33fdf6fb24abb281847858c792ae7242962e77.tar.xz apache2-8a33fdf6fb24abb281847858c792ae7242962e77.zip |
Remove duplicate logging from alloc and send data_msg.
The logging is already done in the proxy_ajp. Also remove
unused function params.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105185 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/proxy/ajp_header.c')
-rw-r--r-- | modules/proxy/ajp_header.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/modules/proxy/ajp_header.c b/modules/proxy/ajp_header.c index 2a513c9098..c383f959dd 100644 --- a/modules/proxy/ajp_header.c +++ b/modules/proxy/ajp_header.c @@ -680,17 +680,13 @@ apr_status_t ajp_parse_data(request_rec *r, ajp_msg_t *msg, /* * Allocate a msg to send data */ -apr_status_t ajp_alloc_data_msg(request_rec *r, char **ptr, apr_size_t *len, +apr_status_t ajp_alloc_data_msg(apr_pool_t *pool, char **ptr, apr_size_t *len, ajp_msg_t **msg) { apr_status_t rc; - rc = ajp_msg_create(r->pool, msg); - if (rc != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, - "ajp_alloc_data_msg: ajp_msg_create failed"); + if ((rc = ajp_msg_create(pool, msg)) != APR_SUCCESS) return rc; - } ajp_msg_reset(*msg); *ptr = (char *)&((*msg)->buf[6]); *len = AJP_MSG_BUFFER_SZ-6; @@ -701,7 +697,7 @@ apr_status_t ajp_alloc_data_msg(request_rec *r, char **ptr, apr_size_t *len, /* * Send the data message */ -apr_status_t ajp_send_data_msg(apr_socket_t *sock, request_rec *r, +apr_status_t ajp_send_data_msg(apr_socket_t *sock, ajp_msg_t *msg, apr_size_t len) { @@ -710,9 +706,6 @@ apr_status_t ajp_send_data_msg(apr_socket_t *sock, request_rec *r, msg->len += len + 2; /* + 1 XXXX where is '\0' */ - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, - "ajp_send_data_msg: sending %" APR_SIZE_T_FMT, len); - return ajp_ilink_send(sock, msg); } |