X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=b6b3aafcac271f5c12dd3305031618cdd1b875fb;hp=3853231249f5a4be047f3d4dcaafa9a63b516b4b;hb=1c2f839129e85a8ddde41c1984e8f89fd4409614;hpb=6da3520587f9f79c7429501289512d2a2415b517

diff --git a/http_message_object.c b/http_message_object.c
index 3853231..b6b3aaf 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -418,7 +418,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 #else
 	zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
 	
-	if (!pinfo || ACC_PROP_PUBLIC(pinfo->flags)) {
+	if (!pinfo) {
 		return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
 	}
 #endif
@@ -511,11 +511,8 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 			break;
 		
 		default:
-#ifdef WONKY
+			FREE_ZVAL(return_value);
 			return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
-#else
-			RETVAL_NULL();
-#endif
 	}
 
 	return return_value;
@@ -525,19 +522,19 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 {
 	getObjectEx(http_message_object, obj, object);
 	http_message *msg = obj->message;
-	zval *cpy = NULL;
+	zval *cpy;
 #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 || ACC_PROP_PUBLIC(pinfo->flags)) {
+	if (!pinfo) {
 		zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
 		return;
 	}
 #endif
 	
-	cpy = zval_copy(Z_TYPE_P(value), value);
+	cpy = value;
 	
 #ifdef WONKY
 	switch (h)
@@ -547,26 +544,26 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 	{
 		case HTTP_MSG_PROPHASH_TYPE:
 		case HTTP_MSG_CHILD_PROPHASH_TYPE:
-			convert_to_long(cpy);
+			convert_to_long_ex(&cpy);
 			http_message_set_type(msg, Z_LVAL_P(cpy));
 			break;
 
 		case HTTP_MSG_PROPHASH_HTTP_VERSION:
 		case HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION:
-			convert_to_double(cpy);
+			convert_to_double_ex(&cpy);
 			msg->http.version = Z_DVAL_P(cpy);
 			break;
 
 		case HTTP_MSG_PROPHASH_BODY:
 		case HTTP_MSG_CHILD_PROPHASH_BODY:
-			convert_to_string(cpy);
+			convert_to_string_ex(&cpy);
 			phpstr_dtor(PHPSTR(msg));
 			phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
 			break;
 
 		case HTTP_MSG_PROPHASH_HEADERS:
 		case HTTP_MSG_CHILD_PROPHASH_HEADERS:
-			convert_to_array(cpy);
+			convert_to_array_ex(&cpy);
 			zend_hash_clean(&msg->hdrs);
 			zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(cpy), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 			break;
@@ -587,7 +584,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 		case HTTP_MSG_PROPHASH_REQUEST_METHOD:
 		case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD:
 			if (HTTP_MSG_TYPE(REQUEST, msg)) {
-				convert_to_string(cpy);
+				convert_to_string_ex(&cpy);
 				STR_SET(msg->http.info.request.method, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
 			}
 			break;
@@ -595,7 +592,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 		case HTTP_MSG_PROPHASH_REQUEST_URL:
 		case HTTP_MSG_CHILD_PROPHASH_REQUEST_URL:
 			if (HTTP_MSG_TYPE(REQUEST, msg)) {
-				convert_to_string(cpy);
+				convert_to_string_ex(&cpy);
 				STR_SET(msg->http.info.request.url, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
 			}
 			break;
@@ -603,7 +600,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 		case HTTP_MSG_PROPHASH_RESPONSE_CODE:
 		case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE:
 			if (HTTP_MSG_TYPE(RESPONSE, msg)) {
-				convert_to_long(cpy);
+				convert_to_long_ex(&cpy);
 				msg->http.info.response.code = Z_LVAL_P(cpy);
 			}
 			break;
@@ -611,18 +608,18 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 		case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
 		case HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS:
 			if (HTTP_MSG_TYPE(RESPONSE, msg)) {
-				convert_to_string(cpy);
+				convert_to_string_ex(&cpy);
 				STR_SET(msg->http.info.response.status, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
 			}
 			break;
 		
 		default:
-#ifdef WONKY
 			zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
-#endif
 			break;
 	}
-	zval_free(&cpy);
+	if (cpy != value) {
+		zval_ptr_dtor(&cpy);
+	}
 }
 
 static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)