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

core: follow up to r1710095.

Browse Source 
Simplify logic in check_pipeline(), and log unexpected errors.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1710105 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2015-10-22 21:19:52 +00:00
parent f9b56afc0e
commit 2590be0587
2 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/log-message-tags/next-number
View File

@@ -1 +1 @@
2967 2969

69
modules/http/http_request.c
View File

@@ -234,20 +234,25 @@ static void check_pipeline(conn_rec *c, apr_bucket_brigade *bb)
if (c->keepalive != AP_CONN_CLOSE && !c->aborted) { if (c->keepalive != AP_CONN_CLOSE && !c->aborted) {
apr_status_t rv; apr_status_t rv;
int num_blank_lines = DEFAULT_LIMIT_BLANK_LINES; int num_blank_lines = DEFAULT_LIMIT_BLANK_LINES;
char buf[2], cr = 0; ap_input_mode_t mode = AP_MODE_SPECULATIVE;
apr_size_t len; apr_size_t len, cr = 0;
char buf[2];
do { do {
const apr_size_t n = (cr) ? 2 : 1;
apr_brigade_cleanup(bb); apr_brigade_cleanup(bb);
rv = ap_get_brigade(c->input_filters, bb, AP_MODE_SPECULATIVE, rv = ap_get_brigade(c->input_filters, bb, mode,
APR_NONBLOCK_READ, n); APR_NONBLOCK_READ, cr + 1);
if (rv != APR_SUCCESS || APR_BRIGADE_EMPTY(bb)) { if (rv != APR_SUCCESS || APR_BRIGADE_EMPTY(bb)) {
/* /*
* Error or empty brigade: There is no data present in the input * Error or empty brigade: There is no data present in the input
* filter * filter
*/ */
if (mode == AP_MODE_READBYTES) {
/* Unexpected error, stop with this connection */
ap_log_cerror(APLOG_MARK, APLOG_ERR, rv, c, APLOGNO(02967)
"Can't consume pipelined empty lines");
c->keepalive = AP_CONN_CLOSE;
}
return; return;
} }
@@ -257,29 +262,48 @@ static void check_pipeline(conn_rec *c, apr_bucket_brigade *bb)
* pending response(s) until the next/real request comes in or the * pending response(s) until the next/real request comes in or the
* keepalive timeout expires. * keepalive timeout expires.
*/ */
len = n; len = cr + 1;
rv = apr_brigade_flatten(bb, buf, &len); rv = apr_brigade_flatten(bb, buf, &len);
if (rv != APR_SUCCESS || len != n) { if (rv != APR_SUCCESS || len != cr + 1) {
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, rv, c, int level;
"check pipeline can't fetch CRLF " if (mode == AP_MODE_READBYTES) {
"(%" APR_SIZE_T_FMT "/%" APR_SIZE_T_FMT ")", /* Unexpected error, stop with this connection */
len, n); c->keepalive = AP_CONN_CLOSE;
c->data_in_input_filters = 1; level = APLOG_ERR;
}
else {
/* Let outside (non-speculative/blocking) read determine
* where this possible failure comes from (metadata,
* morphed EOF socket => empty bucket? debug only here).
*/
c->data_in_input_filters = 1;
level = APLOG_DEBUG;
}
ap_log_cerror(APLOG_MARK, level, rv, c, APLOGNO(02968)
"Can't check pipelined data");
return; return;
} }
if (mode == AP_MODE_READBYTES) {
mode = AP_MODE_SPECULATIVE;
cr = 0;
continue;
}
if (cr) { if (cr) {
AP_DEBUG_ASSERT(len == 2 && buf[0] == APR_ASCII_CR); AP_DEBUG_ASSERT(len == 2 && buf[0] == APR_ASCII_CR);
if (buf[1] != APR_ASCII_LF) { if (buf[1] != APR_ASCII_LF) {
return; return;
} }
mode = AP_MODE_READBYTES;
num_blank_lines--; num_blank_lines--;
cr = 0;
} }
else { else {
if (buf[0] == APR_ASCII_CR) { if (buf[0] == APR_ASCII_CR) {
cr = 1; cr = 1;
} }
else if (buf[0] == APR_ASCII_LF) { else if (buf[0] == APR_ASCII_LF) {
mode = AP_MODE_READBYTES;
num_blank_lines--; num_blank_lines--;
} }
else { else {
@@ -287,23 +311,6 @@ static void check_pipeline(conn_rec *c, apr_bucket_brigade *bb)
return; return;
} }
} }
if (!cr) {
/* Consume this [CR]LF, then next */
apr_brigade_cleanup(bb);
rv = ap_get_brigade(c->input_filters, bb, AP_MODE_READBYTES,
APR_NONBLOCK_READ, n);
if (rv == APR_SUCCESS) {
rv = apr_brigade_flatten(bb, buf, &len);
}
if (rv != APR_SUCCESS || len != n) {
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, rv, c,
"check pipeline can't read CRLF "
"(%" APR_SIZE_T_FMT "/%" APR_SIZE_T_FMT ")",
len, n);
c->data_in_input_filters = 1;
return;
}
}
} while (num_blank_lines >= 0); } while (num_blank_lines >= 0);
/* Don't recycle this (abused) connection */ /* Don't recycle this (abused) connection */