You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2006/12/08 14:07:15 UTC
svn commit: r483980 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
include/util_mutex.h modules/generators/mod_cgi.c
modules/generators/mod_cgid.c server/util_mutex.c
Author: jim
Date: Fri Dec 8 05:07:14 2006
New Revision: 483980
URL: http://svn.apache.org/viewvc?view=rev&rev=483980
Log:
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: jim
Added:
httpd/httpd/branches/2.2.x/include/util_mutex.h
- copied unchanged from r467326, httpd/httpd/trunk/include/util_mutex.h
httpd/httpd/branches/2.2.x/server/util_mutex.c
- copied unchanged from r467326, httpd/httpd/trunk/server/util_mutex.c
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/generators/mod_cgi.c
httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=483980&r1=483979&r2=483980
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Dec 8 05:07:14 2006
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.4
+ * 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.
+
*) mod_cache: Eliminate a bogus error in the log when a filter returns
AP_FILTER_ERROR. [Niklas Edmundsson <nikke acc.umu.se>]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=483980&r1=483979&r2=483980
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Dec 8 05:07:14 2006
@@ -78,12 +78,6 @@
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * 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, bnicholes, wrowe
-
* mod_mem_cache: Convert mod_mem_cache to use APR memory pool functions
by creating a root pool for object persistence across requests. This
also eliminates the need for custom serialization code.
Modified: httpd/httpd/branches/2.2.x/modules/generators/mod_cgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/generators/mod_cgi.c?view=diff&rev=483980&r1=483979&r2=483980
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/generators/mod_cgi.c (original)
+++ httpd/httpd/branches/2.2.x/modules/generators/mod_cgi.c Fri Dec 8 05:07:14 2006
@@ -837,7 +837,9 @@
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;
}
for (bucket = APR_BRIGADE_FIRST(bb);
Modified: httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c?view=diff&rev=483980&r1=483979&r2=483980
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c (original)
+++ httpd/httpd/branches/2.2.x/modules/generators/mod_cgid.c Fri Dec 8 05:07:14 2006
@@ -1387,7 +1387,9 @@
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;
}
for (bucket = APR_BRIGADE_FIRST(bb);
Re: svn commit: r483980 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS include/util_mutex.h modules/generators/mod_cgi.c modules/generators/mod_cgid.c server/util_mutex.c
Posted by Jim Jagielski <ji...@jaguNET.com>.
On Dec 8, 2006, at 8:07 AM, jim@apache.org wrote:
> Author: jim
> Date: Fri Dec 8 05:07:14 2006
> New Revision: 483980
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=483980
> Log:
> 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: jim
>
> Added:
> httpd/httpd/branches/2.2.x/include/util_mutex.h
> - copied unchanged from r467326, httpd/httpd/trunk/include/
> util_mutex.h
> httpd/httpd/branches/2.2.x/server/util_mutex.c
> - copied unchanged from r467326, httpd/httpd/trunk/server/
> util_mutex.c
Oops... removing.
Re: svn commit: r483980 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS include/util_mutex.h modules/generators/mod_cgi.c modules/generators/mod_cgid.c server/util_mutex.c
Posted by Jim Jagielski <ji...@jaguNET.com>.
On Dec 8, 2006, at 8:07 AM, jim@apache.org wrote:
> Author: jim
> Date: Fri Dec 8 05:07:14 2006
> New Revision: 483980
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=483980
> Log:
> 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: jim
>
> Added:
> httpd/httpd/branches/2.2.x/include/util_mutex.h
> - copied unchanged from r467326, httpd/httpd/trunk/include/
> util_mutex.h
> httpd/httpd/branches/2.2.x/server/util_mutex.c
> - copied unchanged from r467326, httpd/httpd/trunk/server/
> util_mutex.c
Oops... removing.