Commit 0910bba8 authored by Joe Orton's avatar Joe Orton
Browse files

Merge r179763 from trunk: 

* modules/filters/mod_include.c (handle_include): Fix possible
variable corruption with nested includes.

PR: 12655
Reviewed by: jorton, nd, jerenkrantz


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

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.0.55









  *) mod_include: Fix possible environment variable corruption when 









     using nested includes.  PR 12655.  [Joe Orton]

















  *) Support the suppress-error-charset setting, as with Apache 1.3.x.









     PR 31274.  [Jeff Trawick]










































STATUS



+0
−8



























Changes for STATUS: 0 added lines, 8 removed lines.



Original line number
Diff line number
Diff line







@@ -198,14 +198,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:







         modules/proxy/mod_proxy_ftp.c: r231044









       +1: minfrin, jim, nd



















    *) mod_include: Fix possible variable corruption with nested









       includes.









         http://svn.apache.org/viewcvs?rev=179763&view=rev









       2.0.x patch: http://people.apache.org/~jorton/ap_pr12655.patch









       test case in perl-framework/t/modules/include.t









       PR: 12655









       +1: jorton, nd, jerenkrantz



















    *) mod_auth_digest: Fix hostinfo validation for CONNECT requests.









         http://svn.apache.org/viewcvs.cgi?rev=193127&view=rev









       +1: jorton, nd, jerenkrantz


































modules/filters/mod_include.c



+4
−4



























Changes for modules/filters/mod_include.c: 4 added lines, 4 removed lines.



Original line number
Diff line number
Diff line







@@ -789,10 +789,10 @@ static int handle_include(include_ctx_t *ctx, apr_bucket_brigade **bb,







                                        *inserted_head);









                }









                









                /* destroy the sub request */









                if (rr != NULL) {









                    ap_destroy_sub_req(rr);









                }









                /* Do *not* destroy the subrequest here; it may have allocated









                 * variables in this r->subprocess_env in the subrequest's









                 * r->pool, so that pool must survive as long as this request.









                 * Yes, this is a memory leak. */









            }









            else {









                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,