From: Michael Wallner <mike@php.net>
Date: Tue, 10 Dec 2013 08:38:43 +0000 (+0100)
Subject: Fixed bug #66250 (shutdown crash as shared extension)
X-Git-Tag: RELEASE_2_0_2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=6f4cec25ba28e123ad85146baf8c0d1b05b326b5;p=m6w6%2Fext-http

Fixed bug #66250 (shutdown crash as shared extension)

the curl clients MSHUTDOWN was missing an raphf cleanup call
---

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/
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
- <date>2013-11-26</date>
+ <date>2013-12-10</date>
  <version>
-  <release>2.0.1</release>
+  <release>2.0.2</release>
   <api>2.0.0</api>
  </version>
  <stability>
@@ -48,8 +48,7 @@ v2: http://dev.iworks.at/ext-http/lcov/ext/http/
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-* Fixed a bug with multiple ob_start(http\Env\Response) while replacing the body
-* Fixed build on Windows with libevent2
+* Fixed shutdown crash as shared extension
 ]]></notes>
  <contents>
   <dir name="/">
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;
 }