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

ap_check_pipeline: clarify/simplify !max_blank_lines logic, no functional change.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1765061 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2016-10-15 13:31:31 +00:00
parent 84ce5d25db
commit 81cdebf482
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/http/http_request.c
View File

@@ -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;
}