fix access of HttpMessage properties across 5.x branches
-static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRMLS_DC) {
- getObjectEx(http_message_object, obj, object);
- zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
-
- if (!pinfo || pinfo->ce != http_message_object_ce) {
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRMLS_DC)
+{
+ int member_len = Z_STRLEN_P(member);
+
+#ifndef WONKY
+ member_len += 1;
+#endif
+
+ if (!zend_hash_exists(&http_message_object_ce->properties_info, Z_STRVAL_P(member), member_len)) {
return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member TSRMLS_CC);
}
zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index");
return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member TSRMLS_CC);
}
zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index");
getObjectEx(http_message_object, obj, object);
http_message *msg = obj->message;
zval *return_value;
getObjectEx(http_message_object, obj, object);
http_message *msg = obj->message;
zval *return_value;
-#ifdef WONKY
- ulong h = zend_hash_func(Z_STRVAL_P(member), Z_STRLEN_P(member)+1);
-#else
- zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
-
- if (!pinfo || pinfo->ce != http_message_object_ce) {
- return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
- }
+ int member_len = Z_STRLEN_P(member);
+
+#ifndef WONKY
+ member_len += 1;
- if (type == BP_VAR_W) {
+ if (!zend_hash_exists(&http_message_object_ce->properties_info, Z_STRVAL_P(member), member_len)) {
+ return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
+ }
+ if (type != BP_VAR_R) {
zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index");
return NULL;
}
zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index");
return NULL;
}
return_value->is_ref = 0;
#endif
return_value->is_ref = 0;
#endif
-#ifdef WONKY
- switch (h)
-#else
- switch (pinfo->h)
-#endif
+ switch (zend_hash_func(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1))
{
case HTTP_MSG_PROPHASH_TYPE:
case HTTP_MSG_CHILD_PROPHASH_TYPE:
{
case HTTP_MSG_PROPHASH_TYPE:
case HTTP_MSG_CHILD_PROPHASH_TYPE:
default:
FREE_ZVAL(return_value);
default:
FREE_ZVAL(return_value);
+ zend_error(E_WARNING, "possible bug accessing HttpMessage property");
return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
}
return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
}
getObjectEx(http_message_object, obj, object);
http_message *msg = obj->message;
zval *cpy = NULL;
getObjectEx(http_message_object, obj, object);
http_message *msg = obj->message;
zval *cpy = NULL;
-#ifdef WONKY
- ulong h = zend_hash_func(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1);
-#else
- zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
-
- if (!pinfo || pinfo->ce != http_message_object_ce) {
+ int member_len = Z_STRLEN_P(member);
+
+#ifndef WONKY
+ member_len += 1;
+#endif
+
+ if (!zend_hash_exists(&http_message_object_ce->properties_info, Z_STRVAL_P(member), member_len)) {
zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
return;
}
zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
return;
}
-#ifdef WONKY
- switch (h)
-#else
- switch (pinfo->h)
-#endif
+ switch (zend_hash_func(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1))
{
case HTTP_MSG_PROPHASH_TYPE:
case HTTP_MSG_CHILD_PROPHASH_TYPE:
{
case HTTP_MSG_PROPHASH_TYPE:
case HTTP_MSG_CHILD_PROPHASH_TYPE:
</lead>
<date>2009-07-24</date>
<version>
</lead>
<date>2009-07-24</date>
<version>
- <release>1.6.4</release>
+ <release>1.6.5-dev</release>
<api>1.6.0</api>
</version>
<stability>
<api>1.6.0</api>
</version>
<stability>
</stability>
<license>BSD, revised</license>
<notes><![CDATA[
</stability>
<license>BSD, revised</license>
<notes><![CDATA[
-* Fixed PHP4 build
-* Fixed PHP5.3 issue in the negotiation API
-* Fixed HttpMessage::toMessageTypeObject() to honor non-string arguments
-* Fixed memory leaks and unterminated string issues with HttpMessage
-* Fixed bug #16577 typo in http_request_object.c (HttpRequest::addBody)
-* Fixed bug #16700 child classes of HttpMessage cannot not have array properties
]]></notes>
<contents>
<dir name="/">
]]></notes>
<contents>
<dir name="/">
#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.6.4"
+#define PHP_HTTP_VERSION "1.6.5-dev"
#ifdef HAVE_CONFIG_H
# include "config.h"
#ifdef HAVE_CONFIG_H
# include "config.h"