From 6f4cec25ba28e123ad85146baf8c0d1b05b326b5 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 10 Dec 2013 09:38:43 +0100 Subject: [PATCH] Fixed bug #66250 (shutdown crash as shared extension) the curl clients MSHUTDOWN was missing an raphf cleanup call --- package.xml | 7 +++---- php_http.h | 2 +- php_http_client_curl.c | 4 ++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package.xml b/package.xml index 13906c4..5bc5694 100644 --- a/package.xml +++ b/package.xml @@ -37,9 +37,9 @@ v2: http://dev.iworks.at/ext-http/lcov/ext/http/ mike@php.net yes - 2013-11-26 + 2013-12-10 - 2.0.1 + 2.0.2 2.0.0 @@ -48,8 +48,7 @@ v2: http://dev.iworks.at/ext-http/lcov/ext/http/ BSD, revised diff --git a/php_http.h b/php_http.h index b0cbeac..ae89427 100644 --- a/php_http.h +++ b/php_http.h @@ -13,7 +13,7 @@ #ifndef PHP_EXT_HTTP_H #define PHP_EXT_HTTP_H -#define PHP_PECL_HTTP_VERSION "2.0.1" +#define PHP_PECL_HTTP_VERSION "2.0.2" extern zend_module_entry http_module_entry; #define phpext_http_ptr &http_module_entry diff --git a/php_http_client_curl.c b/php_http_client_curl.c index ce7c3db..4339625 100644 --- a/php_http_client_curl.c +++ b/php_http_client_curl.c @@ -1980,7 +1980,11 @@ PHP_MINIT_FUNCTION(http_client_curl) PHP_MSHUTDOWN_FUNCTION(http_client_curl) { + php_persistent_handles_cleanup(ZEND_STRL("http\\Client\\Curl"), NULL, 0 TSRMLS_CC); + php_persistent_handles_cleanup(ZEND_STRL("http\\Client\\Curl\\Request"), NULL, 0 TSRMLS_CC); + php_http_options_dtor(&php_http_curle_options); + return SUCCESS; } -- 2.30.2