www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

[mod_proxy_]http: follow up to r1750392.

Browse Source 
Export [ap_]check_pipeline() and use it also for ap_proxy_check_connection().

[Reverted by r1756065]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756060 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2016-08-11 22:32:42 +00:00
parent d79b514c4b
commit 2023d56eea
8 changed files with 127 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
modules/http/http_request.c
View File

@@ -229,41 +229,45 @@ AP_DECLARE(void) ap_die(int type, request_rec *r)
ap_die_r(type, r, r->status);
}
static void check_pipeline(conn_rec *c, apr_bucket_brigade *bb)
AP_DECLARE(apr_status_t) ap_check_pipeline(conn_rec *c, apr_bucket_brigade *bb,
unsigned int max_blank_lines)
{
apr_status_t rv;
int num_blank_lines = DEFAULT_LIMIT_BLANK_LINES;
apr_status_t rv = APR_EOF;
ap_input_mode_t mode = AP_MODE_SPECULATIVE;
unsigned int num_blank_lines = 0;
apr_size_t cr = 0;
char buf[2];
c->data_in_input_filters = 0;
while (c->keepalive != AP_CONN_CLOSE && !c->aborted) {
apr_size_t len = cr + 1;
apr_brigade_cleanup(bb);
rv = ap_get_brigade(c->input_filters, bb, mode,
APR_NONBLOCK_READ, len);
if (rv != APR_SUCCESS || APR_BRIGADE_EMPTY(bb)) {
/*
* Error or empty brigade: There is no data present in the input
* filter
*/
if (rv != APR_SUCCESS || APR_BRIGADE_EMPTY(bb) || !max_blank_lines) {
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;
rv = APR_EGENERAL;
}
else if (rv == APR_SUCCESS && !APR_BRIGADE_EMPTY(bb)) {
/* Single read asked, data available */
rv = APR_ENOTEMPTY;
}
else if (APR_STATUS_IS_EAGAIN(rv)) {
/* Pipe is empty and ready */
rv = APR_SUCCESS;
}
else {
/* Pipe is dead, rv up to date */
c->keepalive = AP_CONN_CLOSE;
}
break;
}
/* Ignore trailing blank lines (which must not be interpreted as
* pipelined requests) up to the limit, otherwise we would block
* on the next read without flushing data, and hence possibly delay
* pending response(s) until the next/real request comes in or the
* keepalive timeout expires.
*/
/* Lookup and consume blank lines */
rv = apr_brigade_flatten(bb, buf, &len);
if (rv != APR_SUCCESS || len != cr + 1) {
int log_level;
@@ -271,14 +275,17 @@ static void check_pipeline(conn_rec *c, apr_bucket_brigade *bb)
/* Unexpected error, stop with this connection */
c->keepalive = AP_CONN_CLOSE;
log_level = APLOG_ERR;
if (rv == APR_SUCCESS) {
rv = APR_EGENERAL;
}
}
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;
log_level = APLOG_DEBUG;
rv = APR_ENOTEMPTY;
}
ap_log_cerror(APLOG_MARK, log_level, rv, c, APLOGNO(02968)
"Can't check pipelined data");
@@ -286,40 +293,48 @@ static void check_pipeline(conn_rec *c, apr_bucket_brigade *bb)
}
if (mode == AP_MODE_READBYTES) {
/* [CR]LF consumed, try next */
mode = AP_MODE_SPECULATIVE;
cr = 0;
}
else if (cr) {
AP_DEBUG_ASSERT(len == 2 && buf[0] == APR_ASCII_CR);
if (buf[1] == APR_ASCII_LF) {
/* consume this CRLF */
mode = AP_MODE_READBYTES;
num_blank_lines--;
num_blank_lines++;
}
else {
c->data_in_input_filters = 1;
/* CR(?!LF) is data */
rv = APR_ENOTEMPTY;
break;
}
}
else {
if (buf[0] == APR_ASCII_LF) {
mode = AP_MODE_READBYTES;
num_blank_lines--;
/* consume this LF */
num_blank_lines++;
}
else if (buf[0] == APR_ASCII_CR) {
cr = 1;
}
else {
c->data_in_input_filters = 1;
/* Not [CR]LF, some data */
rv = APR_ENOTEMPTY;
break;
}
}
/* Enough blank lines with this connection?
* Stop and don't recycle it.
*/
if (num_blank_lines < 0) {
if (num_blank_lines > max_blank_lines) {
/* Enough blank lines with this connection,
* stop and don't recycle it.
*/
c->keepalive = AP_CONN_CLOSE;
rv = APR_NOTFOUND;
break;
}
}
return rv;
}
@@ -328,6 +343,7 @@ AP_DECLARE(void) ap_process_request_after_handler(request_rec *r)
apr_bucket_brigade *bb;
apr_bucket *b;
conn_rec *c = r->connection;
apr_status_t rv;
/* Send an EOR bucket through the output filter chain. When
* this bucket is destroyed, the request will be logged and
@@ -360,8 +376,15 @@ AP_DECLARE(void) ap_process_request_after_handler(request_rec *r)
* already by the EOR bucket's cleanup function.
*/
check_pipeline(c, bb);
/* Check pipeline consuming blank lines, they must not be interpreted as
* the next pipelined request, otherwise we would block on the next read
* without flushing data, and hence possibly delay pending response(s)
* until the next/real request comes in or the keepalive timeout expires.
*/
rv = ap_check_pipeline(c, bb, DEFAULT_LIMIT_BLANK_LINES);
c->data_in_input_filters = (rv == APR_ENOTEMPTY);
apr_brigade_destroy(bb);
if (c->cs)
c->cs->state = (c->aborted) ? CONN_STATE_LINGER
: CONN_STATE_WRITE_COMPLETION;