Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8E73718772 for ; Tue, 19 Jan 2016 09:55:33 +0000 (UTC) Received: (qmail 74896 invoked by uid 500); 19 Jan 2016 09:55:28 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 74809 invoked by uid 500); 19 Jan 2016 09:55:28 -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 74800 invoked by uid 99); 19 Jan 2016 09:55:28 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jan 2016 09:55:28 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 0D2061A09BE for ; Tue, 19 Jan 2016 09:55:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.446 X-Spam-Level: X-Spam-Status: No, score=0.446 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id QIocGkTw1mfP for ; Tue, 19 Jan 2016 09:55:27 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTP id 1B1D920CB8 for ; Tue, 19 Jan 2016 09:55:27 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 2DC88E0678 for ; Tue, 19 Jan 2016 09:55:26 +0000 (UTC) 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 105B33A188D for ; Tue, 19 Jan 2016 09:55:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1725456 - /httpd/httpd/trunk/server/util_filter.c Date: Tue, 19 Jan 2016 09:55:26 -0000 To: cvs@httpd.apache.org From: jailletc36@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160119095526.105B33A188D@svn01-us-west.apache.org> Author: jailletc36 Date: Tue Jan 19 09:55:25 2016 New Revision: 1725456 URL: http://svn.apache.org/viewvc?rev=1725456&view=rev Log: Fix a typo when building a TRACE8 message. 'flush_upto' can never be NULL (or there would be a NULL pointer deference earlier in the code), so the alternate message can never trigger. Modified: httpd/httpd/trunk/server/util_filter.c Modified: httpd/httpd/trunk/server/util_filter.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_filter.c?rev=1725456&r1=1725455&r2=1725456&view=diff ============================================================================== --- httpd/httpd/trunk/server/util_filter.c (original) +++ httpd/httpd/trunk/server/util_filter.c Tue Jan 19 09:55:25 2016 @@ -871,8 +871,8 @@ AP_DECLARE(apr_status_t) ap_filter_reins "seen in brigade%s: bytes: %" APR_SIZE_T_FMT ", non-file bytes: %" APR_SIZE_T_FMT ", eor " "buckets: %d, morphing buckets: %d", - flush_upto == NULL ? " so far" - : " since last flush point", + *flush_upto == NULL ? " so far" + : " since last flush point", bytes_in_brigade, non_file_bytes_in_brigade, eor_buckets_in_brigade,