From cvs-return-66255-archive-asf-public=cust-asf.ponee.io@httpd.apache.org Wed Jan 1 23:14:11 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 04DDD180630 for ; Thu, 2 Jan 2020 00:14:10 +0100 (CET) Received: (qmail 42864 invoked by uid 500); 1 Jan 2020 23:14:10 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 42855 invoked by uid 99); 1 Jan 2020 23:14:10 -0000 Received: from Unknown (HELO svn01-us-east.apache.org) (13.90.137.153) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jan 2020 23:14:10 +0000 Received: from svn01-us-east.apache.org (svn01-us-east.apache.org [127.0.0.1]) by svn01-us-east.apache.org (ASF Mail Server at svn01-us-east.apache.org) with ESMTP id 019D417A010 for ; Wed, 1 Jan 2020 23:14:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1872228 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/http/http_request.c Date: Wed, 01 Jan 2020 23:14:09 -0000 To: cvs@httpd.apache.org From: minfrin@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20200101231410.019D417A010@svn01-us-east.apache.org> Author: minfrin Date: Wed Jan 1 23:14:08 2020 New Revision: 1872228 URL: http://svn.apache.org/viewvc?rev=1872228&view=rev Log: Backport r1765061 ap_check_pipeline: clarify/simplify !max_blank_lines logic, no functional change. Modified: httpd/httpd/branches/2.4.x/ (props changed) httpd/httpd/branches/2.4.x/CHANGES httpd/httpd/branches/2.4.x/STATUS httpd/httpd/branches/2.4.x/modules/http/http_request.c Propchange: httpd/httpd/branches/2.4.x/ ------------------------------------------------------------------------------ Merged /httpd/httpd/trunk:r1765061 Modified: httpd/httpd/branches/2.4.x/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1872228&r1=1872227&r2=1872228&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original) +++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Wed Jan 1 23:14:08 2020 @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.4.42 + *) ap_check_pipeline: clarify/simplify !max_blank_lines logic, no functional change. + [Christophe Jaillet] + *) mod_ssl: OCSP does not apply to proxy mode. [Yann Ylavic] *) mod_proxy_html, mod_xml2enc: Fix build issues with macOS due to r1864469 Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1872228&r1=1872227&r2=1872228&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Wed Jan 1 23:14:08 2020 @@ -132,13 +132,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) ap_check_pipeline: clarify/simplify !max_blank_lines logic, no functional change. - trunk patch: http://svn.apache.org/r1765061 - 2.4.x patch: svn merge -c 1765061 ^/httpd/httpd/trunk . - +1: jailletc36, ylavic, minfrin - jailletc36: this is fine because if !max_blank_lines, we break at the first - iteration, so we know that mode = AP_MODE_SPECULATIVE - PATCHES PROPOSED TO BACKPORT FROM TRUNK: Modified: httpd/httpd/branches/2.4.x/modules/http/http_request.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http/http_request.c?rev=1872228&r1=1872227&r2=1872228&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/http/http_request.c (original) +++ httpd/httpd/branches/2.4.x/modules/http/http_request.c Wed Jan 1 23:14:08 2020 @@ -249,7 +249,7 @@ AP_DECLARE(apr_status_t) ap_check_pipeli 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) @@ -257,23 +257,22 @@ AP_DECLARE(apr_status_t) ap_check_pipeli 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; }