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 8288F200BF1 for ; Tue, 3 Jan 2017 18:47:52 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 81189160B43; Tue, 3 Jan 2017 17:47:52 +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 C06B2160B20 for ; Tue, 3 Jan 2017 18:47:51 +0100 (CET) Received: (qmail 82436 invoked by uid 500); 3 Jan 2017 17:47:50 -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 82416 invoked by uid 99); 3 Jan 2017 17:47:49 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jan 2017 17:47:49 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 6B3BC3A09A1 for ; Tue, 3 Jan 2017 17:47:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1777178 - /httpd/httpd/branches/2.2.x-merge-http-strict/server/protocol.c Date: Tue, 03 Jan 2017 17:47:49 -0000 To: cvs@httpd.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170103174749.6B3BC3A09A1@svn01-us-west.apache.org> archived-at: Tue, 03 Jan 2017 17:47:52 -0000 Author: covener Date: Tue Jan 3 17:47:49 2017 New Revision: 1777178 URL: http://svn.apache.org/viewvc?rev=1777178&view=rev Log: restore r = NULL; dropped by hand-merge. Confirmed with Bill over email. Modified: httpd/httpd/branches/2.2.x-merge-http-strict/server/protocol.c Modified: httpd/httpd/branches/2.2.x-merge-http-strict/server/protocol.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x-merge-http-strict/server/protocol.c?rev=1777178&r1=1777177&r2=1777178&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x-merge-http-strict/server/protocol.c (original) +++ httpd/httpd/branches/2.2.x-merge-http-strict/server/protocol.c Tue Jan 3 17:47:49 2017 @@ -1274,6 +1274,7 @@ request_rec *ap_read_request(conn_rec *c return r; default: apr_brigade_destroy(tmp_bb); + r = NULL; return r; } }