X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=121337bae962e0ad262a795a5448dda722b2057d;hp=b6d8de21a0d8cbdb293229e8a965cc1b20d7430f;hb=c92706acc1434773bc91c9acdeb85e48c88c5129;hpb=9f4226597c09ccdf74db2be0ef76d9e135e7c71c

diff --git a/http_message_object.c b/http_message_object.c
index b6d8de2..121337b 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -119,6 +119,7 @@ HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getParentMessage);
 HTTP_EMPTY_ARGS(send);
+HTTP_EMPTY_ARGS(__toString);
 HTTP_BEGIN_ARGS(toString, 0)
 	HTTP_ARG_VAL(include_parent, 0)
 HTTP_END_ARGS;
@@ -148,6 +149,8 @@ HTTP_EMPTY_ARGS(reverse);
 static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC);
 #define http_message_object_write_prop _http_message_object_write_prop
 static void _http_message_object_write_prop(zval *object, zval *member, zval *value 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 TSRMLS_DC);
 #define http_message_object_get_props _http_message_object_get_props
 static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC);
 
@@ -195,7 +198,7 @@ zend_function_entry http_message_object_fe[] = {
 	HTTP_MESSAGE_ME(key, ZEND_ACC_PUBLIC)
 	HTTP_MESSAGE_ME(next, ZEND_ACC_PUBLIC)
 
-	ZEND_MALIAS(HttpMessage, __toString, toString, HTTP_ARGS(HttpMessage, toString), ZEND_ACC_PUBLIC)
+	ZEND_MALIAS(HttpMessage, __toString, toString, HTTP_ARGS(HttpMessage, __toString), ZEND_ACC_PUBLIC)
 
 	HTTP_MESSAGE_ME(factory, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	ZEND_MALIAS(HttpMessage, fromString, factory, HTTP_ARGS(HttpMessage, factory), ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
@@ -227,7 +230,7 @@ PHP_MINIT_FUNCTION(http_message_object)
 	http_message_object_handlers.read_property = http_message_object_read_prop;
 	http_message_object_handlers.write_property = http_message_object_write_prop;
 	http_message_object_handlers.get_properties = http_message_object_get_props;
-	http_message_object_handlers.get_property_ptr_ptr = NULL;
+	http_message_object_handlers.get_property_ptr_ptr = http_message_object_get_prop_ptr;
 	
 	zend_declare_property_long(THIS_CE, ZEND_STRS("type")-1, HTTP_MSG_NONE, ZEND_ACC_PROTECTED TSRMLS_CC);
 	zend_declare_property_string(THIS_CE, ZEND_STRS("body")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC);
@@ -392,6 +395,10 @@ void _http_message_object_free(zend_object *object TSRMLS_DC)
 {
 	http_message_object *o = (http_message_object *) object;
 
+	if (o->iterator) {
+		zval_ptr_dtor(&o->iterator);
+		o->iterator = NULL;
+	}
 	if (o->message) {
 		http_message_dtor(o->message);
 		efree(o->message);
@@ -407,6 +414,17 @@ void _http_message_object_free(zend_object *object TSRMLS_DC)
 	freeObject(o);
 }
 
+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) {
+		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 NULL;
+}
+
 static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
 {
 	getObjectEx(http_message_object, obj, object);
@@ -417,7 +435,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 || pinfo->ce != http_message_object_ce) {
 		return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
 	}
 #endif
@@ -428,8 +446,13 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 	}
 	
 	ALLOC_ZVAL(return_value);
+#ifdef Z_SET_REFCOUNT
+	Z_SET_REFCOUNT_P(return_value, 0);
+	Z_UNSET_ISREF_P(return_value);
+#else
 	return_value->refcount = 0;
 	return_value->is_ref = 0;
+#endif
 
 #ifdef WONKY
 	switch (h)
@@ -505,11 +528,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,14 +545,12 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 #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 || pinfo->ce != http_message_object_ce) {
 		zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
 		return;
 	}
 #endif
 	
-	cpy = zval_copy(Z_TYPE_P(value), value);
-	
 #ifdef WONKY
 	switch (h)
 #else
@@ -541,26 +559,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);
+			cpy = http_zsep(IS_LONG, value);
 			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);
+			cpy = http_zsep(IS_DOUBLE, value);
 			msg->http.version = Z_DVAL_P(cpy);
 			break;
 
 		case HTTP_MSG_PROPHASH_BODY:
 		case HTTP_MSG_CHILD_PROPHASH_BODY:
-			convert_to_string(cpy);
+			cpy = http_zsep(IS_STRING, value);
 			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);
+			cpy = http_zsep(IS_ARRAY, value);
 			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;
@@ -581,7 +599,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);
+				cpy = http_zsep(IS_STRING, value);
 				STR_SET(msg->http.info.request.method, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
 			}
 			break;
@@ -589,7 +607,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);
+				cpy = http_zsep(IS_STRING, value);
 				STR_SET(msg->http.info.request.url, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
 			}
 			break;
@@ -597,7 +615,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);
+				cpy = http_zsep(IS_LONG, value);
 				msg->http.info.response.code = Z_LVAL_P(cpy);
 			}
 			break;
@@ -605,18 +623,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);
+				cpy = http_zsep(IS_STRING, value);
 				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) {
+		zval_ptr_dtor(&cpy);
+	}
 }
 
 static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
@@ -797,7 +815,7 @@ PHP_METHOD(HttpMessage, setBody)
 	
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &body, &len)) {
 		phpstr_dtor(PHPSTR(obj->message));
-		phpstr_from_string_ex(PHPSTR(obj->message), body, len);		
+		phpstr_from_string_ex(PHPSTR(obj->message), body, len);
 	}
 }
 /* }}} */
@@ -1129,9 +1147,9 @@ PHP_METHOD(HttpMessage, setHttpVersion)
 	}
 
 	convert_to_double(zv);
-	sprintf(v, "%1.1lf", Z_DVAL_P(zv));
+	snprintf(v, sizeof(v), "%1.1f", Z_DVAL_P(zv));
 	if (strcmp(v, "1.0") && strcmp(v, "1.1")) {
-		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid HTTP protocol version (1.0 or 1.1): %s", v);
+		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid HTTP protocol version (1.0 or 1.1): %g", Z_DVAL_P(zv));
 		RETURN_FALSE;
 	}
 
@@ -1271,6 +1289,7 @@ PHP_METHOD(HttpMessage, toMessageTypeObject)
 				zval_ptr_dtor(&array);
 				
 				if (PHPSTR_VAL(obj->message) && PHPSTR_LEN(obj->message)) {
+					phpstr_fix(PHPSTR(obj->message));
 					INIT_PZVAL(&body);
 					ZVAL_STRINGL(&body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message), 0);
 					if (method != HTTP_POST) {
@@ -1282,6 +1301,7 @@ PHP_METHOD(HttpMessage, toMessageTypeObject)
 						zval_copy_ctor(&body);
 						sapi_module.treat_data(PARSE_STRING, Z_STRVAL(body), &post TSRMLS_CC);
 						zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setpostfields", NULL, &post);
+						zval_dtor(&post);
 					}
 				}
 #else
@@ -1393,8 +1413,8 @@ PHP_METHOD(HttpMessage, unserialize)
 		if ((msg = http_message_parse_ex(obj->message, serialized, (size_t) length))) {
 			obj->message = msg;
 		} else {
-			http_error(HE_ERROR, HTTP_E_RUNTIME, "Could not unserialize HttpMessage");
 			http_message_init(obj->message);
+			http_error(HE_ERROR, HTTP_E_RUNTIME, "Could not unserialize HttpMessage");
 		}
 	}
 }