Merge r442758 from trunk:

PR 31759 (mutated) - reported by Jo Rhett
Don't return apr_status_t error value from input filter chain.

Submitted by: niq
Reviewed by: root

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@535859 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index bc1891e81edd834704308ba7a89c5365b77f86a7..baae62ef6d2f9c2faf95df92d883baade9ab4a92 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.60
 
+  *) mod_cgi, mod_cgid: Don't return apr_status_t error value
+     from input filter chain. PR 31759 (mutated). [Jo Rhett,
+     Nick Kew]
+
   *) htdbm: Fix crash processing -d option in 64-bit mode on HP-UX.
      [Jeff Trawick]
 

diff --git a/STATUS b/STATUS
index 433972d5edf7551e35f03897b19502a009430d3f..4b7d4f9898bf8a67b82dce937d2d263cb2a31769 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -120,12 +120,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       Patch; http://issues.apache.org/bugzilla/attachment.cgi?id=16495
       +1: wrowe, rpluem, sctemme
 
-    * mod_cgi and mod_cgid: Don't use apr_status_t error return
-      from input filters as HTTP return value from the handler.
-      PR#31579.
-      Trunk: http://svn.apache.org/viewvc?view=rev&revision=442758
-      +1: niq, wrowe, rpluem
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are!  Add all new

diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index ef30a6a4c35d3cfbd0b51585b953384a71f89a64..32902c101f471657990354ed6def4a984d86ee41 100644 (file)
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -826,7 +826,9 @@ static int cgi_handler(request_rec *r)
                             APR_BLOCK_READ, HUGE_STRING_LEN);
        
         if (rv != APR_SUCCESS) {
-            return rv;
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                          "Error reading request entity data");
+            return HTTP_INTERNAL_SERVER_ERROR;
         }
 
         APR_BRIGADE_FOREACH(bucket, bb) {

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index aba96d155d2c2e7be46db314fead4836dd441476..55ac3b04375426c751f798b65ae177279d9303b1 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -1347,7 +1347,9 @@ static int cgid_handler(request_rec *r)
                             APR_BLOCK_READ, HUGE_STRING_LEN);
        
         if (rv != APR_SUCCESS) {
-            return rv;
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                          "Error reading request entity data");
+            return HTTP_INTERNAL_SERVER_ERROR;
         }
  
         APR_BRIGADE_FOREACH(bucket, bb) {