components/php-5_2/php-sapi/patches/a0_php_20936509.patch
branchs11u2-sru
changeset 4534 058d7630f55f
equal deleted inserted replaced
4529:a1c54f9eb8de 4534:058d7630f55f
       
     1 CVE-2015-3330
       
     2 Community BUG:
       
     3 https://bugs.php.net/bug.php?id=69218
       
     4 Community CODE:
       
     5 http://git.php.net/?p=php-src.git;a=commit;h=809610f5ea38a83b284e1125d1fff129bdd615e7
       
     6 This patch was created from the community reports above.
       
     7 
       
     8 
       
     9 --- php-5.3.29/sapi/apache2handler/sapi_apache2.c_orig	2015-06-10 13:38:01.218738017 -0700
       
    10 +++ php-5.3.29/sapi/apache2handler/sapi_apache2.c	2015-06-10 13:38:30.440222529 -0700
       
    11 @@ -690,6 +690,7 @@
       
    12  } zend_end_try();
       
    13  		}
       
    14  		apr_brigade_cleanup(brigade);
       
    15 +		apr_pool_cleanup_run(r->pool, (void *)&SG(server_context), php_server_context_cleanup);
       
    16  	} else {
       
    17  		ctx->r = parent_req;
       
    18  	}