diff options
| author | Yann Ylavic <ylavic@apache.org> | 2016-10-15 15:31:31 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2016-10-15 15:31:31 +0200 |
| commit | 81cdebf4826152fb4494ae0611621c5a8b49da1a (patch) | |
| tree | 685d9cf22a7a14fe88268adf296ec496c620ce75 /modules/http | |
| parent | Dropped the never-released ap_has_cntrls() as it had very limited (diff) | |
| download | apache2-81cdebf4826152fb4494ae0611621c5a8b49da1a.tar.xz apache2-81cdebf4826152fb4494ae0611621c5a8b49da1a.zip | |
ap_check_pipeline: clarify/simplify !max_blank_lines logic, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1765061 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http')
| -rw-r--r-- | modules/http/http_request.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/modules/http/http_request.c b/modules/http/http_request.c index aa0511277d..2eff6f4e13 100644 --- a/modules/http/http_request.c +++ b/modules/http/http_request.c @@ -244,7 +244,7 @@ AP_DECLARE(apr_status_t) ap_check_pipeline(conn_rec *c, apr_bucket_brigade *bb, 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) || !max_blank_lines) { + if (rv != APR_SUCCESS || APR_BRIGADE_EMPTY(bb)) { if (mode == AP_MODE_READBYTES) { /* Unexpected error, stop with this connection */ ap_log_cerror(APLOG_MARK, APLOG_ERR, rv, c, APLOGNO(02967) @@ -252,23 +252,22 @@ AP_DECLARE(apr_status_t) ap_check_pipeline(conn_rec *c, apr_bucket_brigade *bb, c->keepalive = AP_CONN_CLOSE; rv = APR_EGENERAL; } - else if (rv != APR_SUCCESS || APR_BRIGADE_EMPTY(bb)) { - if (rv != APR_SUCCESS && !APR_STATUS_IS_EAGAIN(rv)) { - /* Pipe is dead */ - c->keepalive = AP_CONN_CLOSE; - } - else { - /* Pipe is up and empty */ - rv = APR_EAGAIN; - } + else if (rv != APR_SUCCESS && !APR_STATUS_IS_EAGAIN(rv)) { + /* Pipe is dead */ + c->keepalive = AP_CONN_CLOSE; } else { - apr_off_t n = 0; - /* Single read asked, (non-meta-)data available? */ - rv = apr_brigade_length(bb, 0, &n); - if (rv == APR_SUCCESS && n <= 0) { - rv = APR_EAGAIN; - } + /* Pipe is up and empty */ + rv = APR_EAGAIN; + } + break; + } + if (!max_blank_lines) { + apr_off_t n = 0; + /* Single read asked, (non-meta-)data available? */ + rv = apr_brigade_length(bb, 0, &n); + if (rv == APR_SUCCESS && n <= 0) { + rv = APR_EAGAIN; } break; } |