From: Michael Wallner <mike@php.net>
Date: Fri, 21 Nov 2008 10:14:34 +0000 (+0000)
Subject: fixed another new 5_3 incompatibility (bug #15065)
X-Git-Tag: RELEASE_1_6_2~7
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=12253a8360a79b01a0747fe83cf1ec37132fd916;hp=e135e473c0e4b37ec7266508cc6803d8dae28d73

fixed another new 5_3 incompatibility (bug #15065)
---

diff --git a/missing.h b/missing.h
index fa3eda8..d767f40 100644
--- a/missing.h
+++ b/missing.h
@@ -24,6 +24,7 @@
 #	define GLOBAL_ERROR_HANDLING EG(error_handling)
 #	define GLOBAL_EXCEPTION_CLASS EG(exception_class)
 #	define IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp) TSRMLS_CC)
+#	define HTTP_STATIC_ARG_INFO
 #else
 #	define HTTP_ZAPI_HASH_TSRMLS_CC
 #	define HTTP_ZAPI_HASH_TSRMLS_DC
@@ -31,6 +32,7 @@
 #	define GLOBAL_ERROR_HANDLING PG(error_handling)
 #	define GLOBAL_EXCEPTION_CLASS PG(exception_class)
 #	define IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp))
+#	define HTTP_STATIC_ARG_INFO static
 #endif
 
 #if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION == 0)
diff --git a/package2.xml b/package2.xml
index cfdc087..4a0e384 100644
--- a/package2.xml
+++ b/package2.xml
@@ -28,9 +28,9 @@ support. Parallel requests are available for PHP 5 and greater.
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
- <date>2008-07-23</date>
+ <date>2008-10-20</date>
  <version>
-  <release>1.6.1</release>
+  <release>1.6.2</release>
   <api>1.6.0</api>
  </version>
  <stability>
@@ -39,9 +39,10 @@ support. Parallel requests are available for PHP 5 and greater.
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-* Fixed bug #13362 (PHP-5.3 build)
-* Fixed bug #14168 (st->errorbuffer not cleared between uses of persistent handles)
-* Fixed bug #14218 (properties of class extending HttpMessage inaccessible)
+* Fixed PHP-5.3 API incompatibilities (including bug #15065)
+* Fixed memory corruption with headers and HttpRequest
+* Fixed crash in HttpMessage::unserialize()
+* Fixed bug #14826 (race condition in http_request_dtor)
 ]]></notes>
  <contents>
   <dir name="/">
diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index fdbfafa..1930933 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -266,8 +266,8 @@ typedef int STATUS;
 #define HTTP_E_QUERYSTRING			13L
 
 #ifdef ZEND_ENGINE_2
-#	define HTTP_BEGIN_ARGS_EX(class, method, ret_ref, req_args)	static ZEND_BEGIN_ARG_INFO_EX(args_for_ ##class## _ ##method , 0, ret_ref, req_args)
-#	define HTTP_BEGIN_ARGS_AR(class, method, ret_ref, req_args)	static ZEND_BEGIN_ARG_INFO_EX(args_for_ ##class## _ ##method , 1, ret_ref, req_args)
+#	define HTTP_BEGIN_ARGS_EX(class, method, ret_ref, req_args)	HTTP_STATIC_ARG_INFO ZEND_BEGIN_ARG_INFO_EX(args_for_ ##class## _ ##method , 0, ret_ref, req_args)
+#	define HTTP_BEGIN_ARGS_AR(class, method, ret_ref, req_args)	HTTP_STATIC_ARG_INFO ZEND_BEGIN_ARG_INFO_EX(args_for_ ##class## _ ##method , 1, ret_ref, req_args)
 #	define HTTP_END_ARGS										}
 #	define HTTP_EMPTY_ARGS_EX(class, method, ret_ref)			HTTP_BEGIN_ARGS_EX(class, method, ret_ref, 0) HTTP_END_ARGS
 #	define HTTP_ARGS(class, method)								args_for_ ##class## _ ##method
@@ -284,20 +284,20 @@ typedef int STATUS;
 #ifdef HTTP_HAVE_CURL
 #	ifdef ZEND_ENGINE_2
 #		define HTTP_DECLARE_ARG_PASS_INFO() \
-			static \
+			HTTP_STATIC_ARG_INFO \
 			ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_2, 0) \
 				ZEND_ARG_PASS_INFO(0) \
 				ZEND_ARG_PASS_INFO(1) \
 			ZEND_END_ARG_INFO(); \
  \
-			static \
+			HTTP_STATIC_ARG_INFO \
 			ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_3, 0) \
 				ZEND_ARG_PASS_INFO(0) \
 				ZEND_ARG_PASS_INFO(0) \
 				ZEND_ARG_PASS_INFO(1) \
 			ZEND_END_ARG_INFO(); \
  \
-			static \
+			HTTP_STATIC_ARG_INFO \
 			ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_4, 0) \
 				ZEND_ARG_PASS_INFO(0) \
 				ZEND_ARG_PASS_INFO(0) \
@@ -305,7 +305,7 @@ typedef int STATUS;
 				ZEND_ARG_PASS_INFO(1) \
 			ZEND_END_ARG_INFO(); \
  \
-			static \
+			HTTP_STATIC_ARG_INFO \
 			ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_5, 0) \
 				ZEND_ARG_PASS_INFO(0) \
 				ZEND_ARG_PASS_INFO(0) \
@@ -324,13 +324,13 @@ typedef int STATUS;
 #else
 #	ifdef ZEND_ENGINE_2
 #		define HTTP_DECLARE_ARG_PASS_INFO() \
-			static \
+			HTTP_STATIC_ARG_INFO \
 			ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_2, 0) \
 				ZEND_ARG_PASS_INFO(0) \
 				ZEND_ARG_PASS_INFO(1) \
 			ZEND_END_ARG_INFO(); \
 \
-			static \
+			HTTP_STATIC_ARG_INFO \
 			ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_4, 0) \
 				ZEND_ARG_PASS_INFO(0) \
 				ZEND_ARG_PASS_INFO(0) \