Commit 8cb011e7 authored May 07, 2007 by Jim Jagielski

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

parent 6a415d08

CHANGES

+4 −0

Original line number	Diff line number	Diff line
		-- 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]

STATUS

+0 −6

Original line number	Diff line number	Diff line
		@@ -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

modules/generators/mod_cgi.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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) {

modules/generators/mod_cgid.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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) {