X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=0856aefc66afd28b7447f2524e51c30ea4d61387;hp=3129193147c2404e8bb66d804f2dd43c292d5e78;hb=d49be1d46a5015f4b7daf1cb56754ba791cf9ec5;hpb=7e20868975f5c23ccd74af0d8f7147c506d2b8cf

diff --git a/http_message_object.c b/http_message_object.c
index 3129193..0856aef 100644
--- 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
-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);
 
@@ -513,13 +513,14 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message
 		}
 	}
 
-#if PHP_VERSION_ID < 50399
+	
+#ifdef ZEND_ENGINE_2_4
+	zend_object_std_init(o, ce TSRMLS_CC);
+	object_properties_init(o, ce);
+#else
 	ALLOC_HASHTABLE(OBJ_PROP(o));
 	zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
 	zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
-#else
-	zend_object_std_init(&o->zo, ce TSRMLS_CC);
-	object_properties_init(&o->zo, ce);
 #endif
 
 	ov.handle = putObject(http_message_object, o);
@@ -563,7 +564,7 @@ void _http_message_object_free(zend_object *object TSRMLS_DC)
 	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;
 	
@@ -572,31 +573,18 @@ static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_
 		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)
 {
 	getObjectEx(http_message_object, obj, object);
 	http_message_object_prophandler *handler;
-	zval *return_value, *tmp_member = NULL;
-	
-	if (Z_TYPE_P(member) != IS_STRING) {
-		ALLOC_ZVAL(tmp_member);
-		MAKE_COPY_ZVAL(&member, tmp_member);
-		convert_to_string(tmp_member);
-		member = tmp_member;
-#if PHP_VERSION_ID >= 50399
-		_zend_literal_key = NULL;
-#endif
-	}
+	zval *return_value;
 
 	if (SUCCESS == http_message_object_get_prophandler(Z_STRVAL_P(member), Z_STRLEN_P(member), &handler)) {
 		if (type == BP_VAR_W) {
 			zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index");
-			if (tmp_member) {
-				zval_ptr_dtor(&tmp_member);
-			}
 			return NULL;
 		}
 
@@ -615,9 +603,6 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 		return_value = zend_get_std_object_handlers()->read_property(object, member, type ZEND_LITERAL_KEY_CC TSRMLS_CC);
 	}
 	
-	if (tmp_member) {
-		zval_ptr_dtor(&tmp_member);
-	}
 	return return_value;
 }
 
@@ -625,26 +610,12 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 {
 	getObjectEx(http_message_object, obj, object);
 	http_message_object_prophandler *handler;
-	zval *tmp_member = NULL;
-	
-	if (Z_TYPE_P(member) != IS_STRING) {
-		ALLOC_ZVAL(tmp_member);
-		MAKE_COPY_ZVAL(&member, tmp_member);
-		convert_to_string(tmp_member);
-		member = tmp_member;
-#if PHP_VERSION_ID >= 50399
-		_zend_literal_key = NULL;
-#endif
-	}
 	
 	if (SUCCESS == http_message_object_get_prophandler(Z_STRVAL_P(member), Z_STRLEN_P(member), &handler)) {
 		handler->write(obj, value TSRMLS_CC);
 	} else {
 		zend_get_std_object_handlers()->write_property(object, member, value ZEND_LITERAL_KEY_CC TSRMLS_CC);
 	}
-	if (tmp_member) {
-		zval_ptr_dtor(&tmp_member);
-	}
 }
 
 static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
@@ -652,13 +623,12 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
 	zval *headers;
 	getObjectEx(http_message_object, obj, object);
 	http_message *msg = obj->message;
-#if PHP_VERSION_ID < 50399
-	HashTable *props = OBJ_PROP(obj);
+	zval array, *parent;
+#ifdef ZEND_ENGINE_2_4
+	HashTable *props = zend_get_std_object_handlers()->get_properties(object TSRMLS_CC);
 #else
-	HashTable *props = zend_std_get_properties(object TSRMLS_CC);
+	HashTable *props = OBJ_PROP(obj);
 #endif
-	zval array, *parent;
-	
 	INIT_ZARR(array, props);
 
 #define ASSOC_PROP(array, ptype, name, val) \
@@ -720,7 +690,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
 	}
 	ASSOC_PROP(array, zval, "parentMessage", parent);
 
-	return OBJ_PROP(obj);
+	return props;
 }
 
 /* ### USERLAND ### */
@@ -1039,7 +1009,7 @@ PHP_METHOD(HttpMessage, setResponseStatus)
 	
 	HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE);
 	
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len)) {
 		RETURN_FALSE;
 	}
 	STR_SET(obj->message->http.info.response.status, estrndup(status, status_len));