From: Michael Wallner <mike@php.net>
Date: Mon, 2 Apr 2012 09:42:38 +0000 (+0000)
Subject: fix bug #61372 (undefined symbol: Z_ADDREF_P - possibly wrong dependency?)
X-Git-Tag: RELEASE_1_7_4~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a82a43116a750e478d0d4be079a5fa5bac7e199b;p=m6w6%2Fext-http

fix bug #61372 (undefined symbol: Z_ADDREF_P - possibly wrong dependency?)
---

diff --git a/package.xml b/package.xml
index 31b71bf..1440438 100644
--- a/package.xml
+++ b/package.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>2012-03-08</date>
+ <date>2012-04-02</date>
  <version>
-  <release>1.7.3</release>
+  <release>1.7.4</release>
   <api>1.7.0</api>
  </version>
  <stability>
@@ -39,7 +39,7 @@ support. Parallel requests are available for PHP 5 and greater.
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-* Fixed Bug #61310: Bundled pecl_http-1.7.2.tgz is invalid 
+* Fixed Bug #61372 (build fails with "undefined symbol Z_ADDREF_P)
 ]]></notes>
  <contents>
   <dir name="/">
diff --git a/php_http.h b/php_http.h
index d4b00bb..0762c07 100644
--- a/php_http.h
+++ b/php_http.h
@@ -15,7 +15,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_HTTP_VERSION "1.7.3"
+#define PHP_HTTP_VERSION "1.7.4"
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
diff --git a/php_http_api.h b/php_http_api.h
index 45efd6e..3a64350 100644
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -257,7 +257,7 @@ static inline zval *_http_zset(int type, zval *z)
 #define http_zsep(t, z) _http_zsep_ex((t), (z), NULL)
 #define http_zsep_ex(t, z, p) _http_zsep_ex((t), (z), (p))
 static inline zval *_http_zsep_ex(int type, zval *z, zval **p) {
-	Z_ADDREF_P(z);
+	ZVAL_ADDREF(z);
 	if (Z_TYPE_P(z) != type) {
 		switch (type) {
 			case IS_NULL:	convert_to_null_ex(&z);		break;