Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 43493 invoked from network); 28 May 2008 12:58:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 May 2008 12:58:42 -0000 Received: (qmail 38788 invoked by uid 500); 28 May 2008 12:58:35 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 38739 invoked by uid 500); 28 May 2008 12:58:35 -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 38718 invoked by uid 99); 28 May 2008 12:58:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 May 2008 05:58:34 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 May 2008 12:57:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7068A2388A05; Wed, 28 May 2008 05:58:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r660934 - in /httpd/httpd/branches/2.2.x: STATUS support/ab.c Date: Wed, 28 May 2008 12:58:01 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080528125801.7068A2388A05@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jim Date: Wed May 28 05:58:01 2008 New Revision: 660934 URL: http://svn.apache.org/viewvc?rev=660934&view=rev Log: Merge r656400 from trunk: * Check for failure of apr_file_info_get call Reported By: BOYA SUN Submitted by: rpluem Reviewed by: jim Modified: httpd/httpd/branches/2.2.x/STATUS httpd/httpd/branches/2.2.x/support/ab.c Modified: httpd/httpd/branches/2.2.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=660934&r1=660933&r2=660934&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Wed May 28 05:58:01 2008 @@ -94,14 +94,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * ab.c: Check for failure of apr_file_info_get call - [rpluem] Reported By: BOYA SUN - Trunk version of patch: - http://svn.apache.org/viewvc?view=rev&revision=656400 - Backport version for 2.2.x of patch: - Trunk version of patch works - +1: fielding, rpluem, jim - * mod_proxy: Fix a regression to 2.2.8!!! that is caused by backport r657443. This regression causes blank pages to be displayed if the backend connection is faulty and mod_deflate is in place. Modified: httpd/httpd/branches/2.2.x/support/ab.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/support/ab.c?rev=660934&r1=660933&r2=660934&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/support/ab.c (original) +++ httpd/httpd/branches/2.2.x/support/ab.c Wed May 28 05:58:01 2008 @@ -1947,7 +1947,12 @@ return rv; } - apr_file_info_get(&finfo, APR_FINFO_NORM, postfd); + rv = apr_file_info_get(&finfo, APR_FINFO_NORM, postfd); + if (rv != APR_SUCCESS) { + fprintf(stderr, "ab: Could not stat POST data file (%s): %s\n", pfile, + apr_strerror(rv, errmsg, sizeof errmsg)); + return rv; + } postlen = (apr_size_t)finfo.size; postdata = malloc(postlen); if (!postdata) {