fix bug #64380 (http_message_object.c build fails in 5.5.0alpha6)

diff --git a/http_message_object.c b/http_message_object.c
index b7d8261752b675d8166bbe8ba78bbc49d82f367d..0856aefc66afd28b7447f2524e51c30ea4d61387 100644 (file)
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -150,7 +150,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 #define http_message_object_write_prop _http_message_object_write_prop
 static void _http_message_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC);
 #define http_message_object_get_prop_ptr _http_message_object_get_prop_ptr
 #define http_message_object_write_prop _http_message_object_write_prop
 static void _http_message_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC);
 #define http_message_object_get_prop_ptr _http_message_object_get_prop_ptr

-static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_LITERAL_KEY_DC TSRMLS_DC);
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_GET_PPTR_TYPE_DC ZEND_LITERAL_KEY_DC TSRMLS_DC);

 #define http_message_object_get_props _http_message_object_get_props
 static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC);
 
 #define http_message_object_get_props _http_message_object_get_props
 static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC);
 


@@ -564,7 +564,7 @@ void _http_message_object_free(zend_object *object TSRMLS_DC)
        freeObject(o);
 }
 
        freeObject(o);
 }
 

-static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_LITERAL_KEY_DC TSRMLS_DC) {
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_GET_PPTR_TYPE_DC ZEND_LITERAL_KEY_DC TSRMLS_DC) {

        getObjectEx(http_message_object, obj, object);
        http_message_object_prophandler *handler;
        
        getObjectEx(http_message_object, obj, object);
        http_message_object_prophandler *handler;
        


@@ -573,7 +573,7 @@ static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_
                return NULL;
        }
 
                return NULL;
        }
 

-       return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member ZEND_LITERAL_KEY_CC TSRMLS_CC);
+       return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member ZEND_GET_PPTR_TYPE_CC ZEND_LITERAL_KEY_CC TSRMLS_CC);

 }
 
 static zval *_http_message_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC TSRMLS_DC)
 }
 
 static zval *_http_message_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC TSRMLS_DC)

diff --git a/missing.h b/missing.h
index 6afa3acbfef9eb1e1dbf8575f098e0a5d6f7b85f..0186ea50b3f8efb7c5a2207e62d945e1b52a4aee 100644 (file)
--- a/missing.h
+++ b/missing.h
@@ -22,6 +22,10 @@
 #endif
 
 #if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50399)
 #endif
 
 #if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50399)

+#      if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50500)
+#              define ZEND_GET_PPTR_TYPE_DC , int type
+#              define ZEND_GET_PPTR_TYPE_CC , type
+#endif

 #      define ZEND_LITERAL_KEY_DC , const zend_literal *_zend_literal_key
 #      define ZEND_LITERAL_KEY_CC , _zend_literal_key
 #      define ZEND_LITERAL_NIL_CC , NULL
 #      define ZEND_LITERAL_KEY_DC , const zend_literal *_zend_literal_key
 #      define ZEND_LITERAL_KEY_CC , _zend_literal_key
 #      define ZEND_LITERAL_NIL_CC , NULL


@@ -42,6 +46,8 @@
        }
 
 #else
        }
 
 #else

+#      define ZEND_GET_PPTR_TYPE_DC
+#      define ZEND_GET_PPTR_TYPE_CC

 #      define ZEND_LITERAL_KEY_DC
 #      define ZEND_LITERAL_KEY_CC
 #      define ZEND_LITERAL_NIL_CC
 #      define ZEND_LITERAL_KEY_DC
 #      define ZEND_LITERAL_KEY_CC
 #      define ZEND_LITERAL_NIL_CC

diff --git a/package.xml b/package.xml
index 70b255cccb00a5d7f349c8bef11d59e5d54f976f..93c94b6ba736681589cdcbedc0117a300060b7ff 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>
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>

- <date>2013-03-03</date>
+ <date>2013-03-08</date>

  <version>
  <version>

-  <release>1.7.5</release>
+  <release>1.7.6dev</release>

   <api>1.7.0</api>
  </version>
  <stability>
   <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[
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[

-* Fixed Bug #64310 (weak etags W/"abc" are quoted as "W/"abc"")
+* Fixed PHP-5.5 build

 ]]></notes>
  <contents>
   <dir name="/">
 ]]></notes>
  <contents>
   <dir name="/">

diff --git a/php_http.h b/php_http.h
index 60c88cf1bdbf846591ef70400c167032e4e010c0..b682983ac665fad26813fa9148f8563ad46ea254 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -15,7 +15,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 

-#define PHP_HTTP_VERSION "1.7.5"
+#define PHP_HTTP_VERSION "1.7.6dev"

 
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 
 #ifdef HAVE_CONFIG_H
 #      include "config.h"