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 13906c4a8f30f7a1b0e0da54c828c2dbcff221ab..5bc56946eb399cc376e488648dfb25f794cabe75 100644 (file)
--- 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>
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>

- <date>2013-11-26</date>
+ <date>2013-12-10</date>

  <version>
  <version>

-  <release>2.0.1</release>
+  <release>2.0.2</release>

   <api>2.0.0</api>
  </version>
  <stability>
   <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[
  </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="/">
 ]]></notes>
  <contents>
   <dir name="/">

diff --git a/php_http.h b/php_http.h
index b0cbeac85b25b49e0f5a9bbc02b1497674fc7dcd..ae89427d2e5f19d08a664dbaeb8227b5da810ac6 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -13,7 +13,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
 #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
 
 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 ce7c3db1ba5d752ff1e0db5f481fe8a0b173b5d3..43396255994dc87fbdc8b729bca30435198579f4 100644 (file)
--- 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_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);
        php_http_options_dtor(&php_http_curle_options);

+

        return SUCCESS;
 }
 
        return SUCCESS;
 }