1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1629467 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christophe Jaillet
2014-10-05 05:48:35 +00:00
parent 17fbce4077
commit e40d0a618f

View File

@@ -82,7 +82,7 @@ static apr_status_t brigade_peek(apr_bucket_brigade *bbIn,
len = pos - str; len = pos - str;
if (len > bufflen - readbytes) if (len > bufflen - readbytes)
len = bufflen - readbytes; len = bufflen - readbytes;
memcpy (buff + readbytes, str, len); memcpy(buff + readbytes, str, len);
readbytes += len; readbytes += len;
buff[readbytes] = '\0'; buff[readbytes] = '\0';
@@ -151,7 +151,7 @@ static int process_echo_connection(conn_rec *c)
if (((rv = ap_get_brigade(c->input_filters, bb, AP_MODE_GETLINE, if (((rv = ap_get_brigade(c->input_filters, bb, AP_MODE_GETLINE,
APR_BLOCK_READ, 0)) != APR_SUCCESS)) { APR_BLOCK_READ, 0)) != APR_SUCCESS)) {
apr_brigade_cleanup(bb); apr_brigade_cleanup(bb);
if (!APR_STATUS_IS_EOF(rv) && ! APR_STATUS_IS_TIMEUP(rv)) if (!APR_STATUS_IS_EOF(rv) && !APR_STATUS_IS_TIMEUP(rv))
ap_log_error(APLOG_MARK, APLOG_INFO, rv, c->base_server, APLOGNO(01611) ap_log_error(APLOG_MARK, APLOG_INFO, rv, c->base_server, APLOGNO(01611)
"ProtocolEcho: Failure reading from %s", "ProtocolEcho: Failure reading from %s",
c->client_ip); c->client_ip);