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

diff --git a/package.xml b/package.xml
index 31b71bf7ae4e6a22d79fe874819e5caca536a138..144043839d5303da3fbbe4dd486f0bc12b3317db 100644 (file)
--- 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 d4b00bbd1dc568610cbfd09612aede0dabac9c69..0762c076deb483804dacecb55fc248726b736aac 100644 (file)
--- 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 45efd6e7616cd5f1189d10978ac1d8e664b85955..3a64350eca71abc1458be02aaf14b433839a5199 100644 (file)
--- 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;