mirror of
https://github.com/apache/httpd.git
synced 2025-11-06 16:49:32 +03:00
e75696f56e
* modules/proxy/ajp_header.c (ajp_send_data_msg): Use
APR_SIZE_T_FMT.
* modules/proxy/ajp_link.c (ajp_ilink_receive): Don't pass
\n to ap_log_error; do use APR_SIZE_T_FMT.
* modules/proxy/ajp_msg.c (ajp_msg_dump, ajp_msg_check_header,
ajp_msg_copy): Use APR_SIZE_T_FMT.
(ajp_log_overflow): New function.
(ajp_msg_{append,peek,get}_*): Use it.
* modules/proxy/proxy_ajp.c (ap_proxy_ajp_request): Use
APR_SIZE_T_FMT.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105071 13f79535-47bb-0310-9956-ffa450edef68
135 lines
3.6 KiB
C
135 lines
3.6 KiB
C
/* Copyright 1999-2004 The Apache Software Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "ajp.h"
|
|
|
|
|
|
apr_status_t ajp_ilink_send(apr_socket_t *sock, ajp_msg_t *msg)
|
|
{
|
|
char *buf;
|
|
apr_status_t status;
|
|
apr_size_t length;
|
|
|
|
if (sock == NULL) {
|
|
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
|
|
"ajp_ilink_send(): NULL socket provided");
|
|
return AJP_EINVAL;
|
|
}
|
|
|
|
ajp_msg_end(msg);
|
|
|
|
length = msg->len;
|
|
buf = (char *)msg->buf;
|
|
|
|
do {
|
|
apr_size_t written = length;
|
|
|
|
status = apr_socket_send(sock, buf, &written);
|
|
if (status != APR_SUCCESS) {
|
|
ap_log_error(APLOG_MARK, APLOG_ERR, status, NULL,
|
|
"ajp_ilink_send(): send failed");
|
|
return status;
|
|
}
|
|
length -= written;
|
|
buf += written;
|
|
} while (length);
|
|
|
|
return APR_SUCCESS;
|
|
}
|
|
|
|
|
|
static apr_status_t ilink_read(apr_socket_t *sock, char * buf,
|
|
apr_size_t len)
|
|
{
|
|
apr_size_t length;
|
|
apr_status_t status;
|
|
apr_size_t rdlen;
|
|
|
|
if (sock == NULL) {
|
|
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
|
|
"ajp_ilink_readN(): NULL socket provided");
|
|
return AJP_EINVAL;
|
|
}
|
|
|
|
rdlen = 0;
|
|
length = len;
|
|
|
|
while (rdlen < len) {
|
|
|
|
status = apr_socket_recv(sock, buf + rdlen, &length);
|
|
|
|
if (status == APR_EOF)
|
|
return status; /* socket closed. */
|
|
else if (APR_STATUS_IS_EAGAIN(status))
|
|
continue;
|
|
else if (status != APR_SUCCESS)
|
|
return status; /* any error. */
|
|
|
|
rdlen += length;
|
|
length = len - rdlen;
|
|
}
|
|
return APR_SUCCESS;
|
|
}
|
|
|
|
|
|
apr_status_t ajp_ilink_receive(apr_socket_t *sock, ajp_msg_t *msg)
|
|
{
|
|
apr_status_t status;
|
|
apr_size_t hlen;
|
|
apr_size_t blen;
|
|
|
|
if (sock == NULL) {
|
|
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
|
|
"ajp_ilink_receive(): NULL socket provided");
|
|
return AJP_EINVAL;
|
|
}
|
|
|
|
hlen = msg->header_len;
|
|
|
|
status = ilink_read(sock, msg->buf, hlen);
|
|
|
|
if (status != APR_SUCCESS) {
|
|
ap_log_error(APLOG_MARK, APLOG_ERR, status, NULL,
|
|
"ajp_ilink_receive() can't receive header");
|
|
return AJP_ENO_HEADER;
|
|
}
|
|
|
|
status = ajp_msg_check_header(msg, &blen);
|
|
|
|
if (status != APR_SUCCESS) {
|
|
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
|
|
"ajp_ilink_receive() received bad header");
|
|
return AJP_EBAD_HEADER;
|
|
}
|
|
|
|
status = ilink_read(sock, msg->buf + hlen, blen);
|
|
|
|
if (status != APR_SUCCESS) {
|
|
ap_log_error(APLOG_MARK, APLOG_ERR, status, NULL,
|
|
"ajp_ilink_receive() error while receiving message body "
|
|
"of length %" APR_SIZE_T_FMT,
|
|
hlen);
|
|
return AJP_EBAD_MESSAGE;
|
|
}
|
|
|
|
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
|
|
"ajp_ilink_receive() received packet len=%" APR_SIZE_T_FMT
|
|
"type=%d\n",
|
|
blen, (int)msg->buf[hlen]);
|
|
|
|
return APR_SUCCESS;
|
|
}
|
|
|