httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r264762 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS modules/filters/mod_include.c
Date Tue, 30 Aug 2005 11:49:33 GMT
Author: jorton
Date: Tue Aug 30 04:49:27 2005
New Revision: 264762

URL: http://svn.apache.org/viewcvs?rev=264762&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/modules/filters/mod_include.c

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?rev=264762&r1=264761&r2=264762&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Tue Aug 30 04:49:27 2005
@@ -1,6 +1,9 @@
                                                          -*- 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]
 

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?rev=264762&r1=264761&r2=264762&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Tue Aug 30 04:49:27 2005
@@ -198,14 +198,6 @@
          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

Modified: httpd/httpd/branches/2.0.x/modules/filters/mod_include.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/filters/mod_include.c?rev=264762&r1=264761&r2=264762&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/filters/mod_include.c (original)
+++ httpd/httpd/branches/2.0.x/modules/filters/mod_include.c Tue Aug 30 04:49:27 2005
@@ -788,11 +788,11 @@
                     CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, 
                                         *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,



Mime
View raw message