httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r660934 - in /httpd/httpd/branches/2.2.x: STATUS support/ab.c
Date Wed, 28 May 2008 12:58:01 GMT
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 <boya.sun case.edu>

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 <boya.sun case.edu>
-   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) {



Mime
View raw message