Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C4F22200C13 for ; Mon, 6 Feb 2017 13:31:25 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C39E7160B53; Mon, 6 Feb 2017 12:31:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 183D0160B49 for ; Mon, 6 Feb 2017 13:31:24 +0100 (CET) Received: (qmail 65977 invoked by uid 500); 6 Feb 2017 12:31:23 -0000 Mailing-List: contact dev-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 dev@httpd.apache.org Received: (qmail 65967 invoked by uid 99); 6 Feb 2017 12:31:23 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Feb 2017 12:31:23 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 3C166C205A for ; Mon, 6 Feb 2017 12:31:23 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.321 X-Spam-Level: X-Spam-Status: No, score=-0.321 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_SORBS_SPAM=0.5, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd1-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id TOXdRcMqvAMf for ; Mon, 6 Feb 2017 12:31:22 +0000 (UTC) Received: from mail-qt0-f173.google.com (mail-qt0-f173.google.com [209.85.216.173]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTPS id 376BF5F5C7 for ; Mon, 6 Feb 2017 12:31:22 +0000 (UTC) Received: by mail-qt0-f173.google.com with SMTP id v23so103258277qtb.0 for ; Mon, 06 Feb 2017 04:31:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :content-transfer-encoding; bh=/c9yHZDhQCfSMuo8OdKxeY6Zl+kSibtP3cIqQCjS0Yk=; b=Yl4BVbdlqxODpYb2y/KXTRxE2N7gs/JnehVieRxNWbWBl1UfW9ZGqqdLOStCab6mzE plvXXXHDgki//EM7vEg/S9w9CzhyXGwuCmmjJnrskY6b2+9G8W/AicCEXn/RV59CuZRe Eii6+9nhaosUXps5024xM6LeiulfAcq6cKromqI+PC8S7wtVWG1MBtVvs3yBKDLNKYY/ BNlGCXKJsa8yLpcw0y9o4Lu9coOC3C/ZG411ThuxK3eFCaxHcaO07xmp4u5X2W5jn1nK sngk7gCO0TsqQ47fxOx9inuIBBjtlIjHnqUFhDKePmxu9sAmVu2r/8nSFTCGmImS6eDi es1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:content-transfer-encoding; bh=/c9yHZDhQCfSMuo8OdKxeY6Zl+kSibtP3cIqQCjS0Yk=; b=rrlOyEOsv61xCxRv6pOAbB51cynuoyFBXjIwM+rkUTtunrNlt7oWqa+81wkv1aq6oa UDZqCSIw1P+IDtFcr9yonOyNfCEzj2j4l7ETvHDOyOgwa0iI/xCGT+S5IyZRUr1gr6Ch xczlJ9Nl/QSZrcqljUuaNGQC4GeKBx9teuHdGOpufc3MjNw7eRCWikzByiC57I46HvFk 12KYYGY5npd0qcCxTb6mGa7o33J2vnxXGfa2+dHWUBAwQZZmZfLVobxSm6qSbk+czpx+ S7Ar/9DyTrVa8+pINI4RHJBxQ88S8ziP6dNlra24FVlVO3ASAon+TFE78+QBIUpzDKf8 01lA== X-Gm-Message-State: AMke39mM4hypcA7lYcx99g/8NkoYR/9WsihAUlO6KIILtEyxWMQubZdd6ouOBgHZH9y7pFqqgyAOMRj0wlrAlg== X-Received: by 10.237.35.130 with SMTP id j2mr10006906qtc.45.1486384275526; Mon, 06 Feb 2017 04:31:15 -0800 (PST) MIME-Version: 1.0 Received: by 10.55.102.18 with HTTP; Mon, 6 Feb 2017 04:31:15 -0800 (PST) In-Reply-To: References: From: Yann Ylavic Date: Mon, 6 Feb 2017 13:31:15 +0100 Message-ID: Subject: Re: ssl_io_filter_output vs EOC To: httpd-dev Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable archived-at: Mon, 06 Feb 2017 12:31:26 -0000 On Mon, Feb 6, 2017 at 12:53 PM, Pl=C3=BCm, R=C3=BCdiger, Vodafone Group wrote: > > IMHO we currently fail after we processed an EOC (no matter if in the > same brigade or in a follow up brigade) and we should continue doing > so. We fail in the same brigade thanks to ssl_filter_write() when pssl is NULL, but I think that if we wanted to also fail for subsequent brigades, we need something like: Index: modules/ssl/ssl_engine_io.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/ssl/ssl_engine_io.c (revision 1781582) +++ modules/ssl/ssl_engine_io.c (working copy) @@ -1777,14 +1775,15 @@ static apr_status_t ssl_io_filter_output(ap_filter return APR_ECONNABORTED; } - /* Reinstate any buffered content */ - ap_filter_reinstate_brigade(f, bb, &flush_upto); - if (!filter_ctx->pssl) { /* ssl_filter_io_shutdown was called */ - return ap_pass_brigade(f->next, bb); + apr_brigade_cleanup(bb); + return APR_EGENERAL; } + /* Reinstate any buffered content */ + ap_filter_reinstate_brigade(f, bb, &flush_upto); + inctx =3D (bio_filter_in_ctx_t *)BIO_get_data(filter_ctx->pbioRead); outctx =3D (bio_filter_out_ctx_t *)BIO_get_data(filter_ctx->pbioWrite)= ; _ Regards, Yann.