X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=e7a564f2ba58349720d4a8a2336fb40e3e39091d;hp=40001b5375c2e31f750046a536a8b95a4f318e08;hb=e97eb4951a19e934d25e9c5c2f147f4b009bbdfe;hpb=6e57bd8181dc682eb8694a458c354eaa1c1d5520

diff --git a/http_message_object.c b/http_message_object.c
index 40001b5..e7a564f 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -146,11 +146,11 @@ HTTP_END_ARGS;
 HTTP_EMPTY_ARGS(reverse);
 
 #define http_message_object_read_prop _http_message_object_read_prop
-static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC);
+static zval *_http_message_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC 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);
+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 TSRMLS_DC);
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member 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);
 
@@ -214,7 +214,7 @@ static zend_object_handlers http_message_object_handlers;
 
 static HashTable http_message_object_prophandlers;
 
-typedef void (*http_message_object_prophandler_func)(http_message_object *, zval *);
+typedef void (*http_message_object_prophandler_func)(http_message_object *o, zval *v TSRMLS_DC);
 
 typedef struct _http_message_object_prophandler {
 	http_message_object_prophandler_func read;
@@ -228,106 +228,106 @@ static STATUS http_message_object_add_prophandler(const char *prop_str, size_t p
 static STATUS http_message_object_get_prophandler(const char *prop_str, size_t prop_len, http_message_object_prophandler **handler) {
 	return zend_hash_find(&http_message_object_prophandlers, prop_str, prop_len, (void *) handler);
 }
-static void http_message_object_prophandler_get_type(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_type(http_message_object *obj, zval *return_value TSRMLS_DC) {
 	RETVAL_LONG(obj->message->type);
 }
-static void http_message_object_prophandler_set_type(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_type(http_message_object *obj, zval *value TSRMLS_DC) {
 	zval *cpy = http_zsep(IS_LONG, value);
 	http_message_set_type(obj->message, Z_LVAL_P(cpy));
 	zval_ptr_dtor(&cpy);
 }
-static void http_message_object_prophandler_get_body(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_body(http_message_object *obj, zval *return_value TSRMLS_DC) {
 	phpstr_fix(PHPSTR(obj->message));
 	RETVAL_PHPSTR(PHPSTR(obj->message), 0, 1);
 }
-static void http_message_object_prophandler_set_body(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_body(http_message_object *obj, zval *value TSRMLS_DC) {
 	zval *cpy = http_zsep(IS_STRING, value);
 	phpstr_dtor(PHPSTR(obj->message));
 	phpstr_from_string_ex(PHPSTR(obj->message), Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
 	zval_ptr_dtor(&cpy);
 }
-static void http_message_object_prophandler_get_request_method(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_request_method(http_message_object *obj, zval *return_value TSRMLS_DC) {
 	if (HTTP_MSG_TYPE(REQUEST, obj->message) && obj->message->http.info.request.method) {
 		RETVAL_STRING(obj->message->http.info.request.method, 1);
 	} else {
 		RETVAL_NULL();
 	}
 }
-static void http_message_object_prophandler_set_request_method(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_request_method(http_message_object *obj, zval *value TSRMLS_DC) {
 	if (HTTP_MSG_TYPE(REQUEST, obj->message)) {
 		zval *cpy = http_zsep(IS_STRING, value);
 		STR_SET(obj->message->http.info.request.method, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
 		zval_ptr_dtor(&cpy);
 	}
 }
-static void http_message_object_prophandler_get_request_url(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_request_url(http_message_object *obj, zval *return_value TSRMLS_DC) {
 	if (HTTP_MSG_TYPE(REQUEST, obj->message) && obj->message->http.info.request.url) {
 		RETVAL_STRING(obj->message->http.info.request.url, 1);
 	} else {
 		RETVAL_NULL();
 	}
 }
-static void http_message_object_prophandler_set_request_url(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_request_url(http_message_object *obj, zval *value TSRMLS_DC) {
 	if (HTTP_MSG_TYPE(REQUEST, obj->message)) {
 		zval *cpy = http_zsep(IS_STRING, value);
 		STR_SET(obj->message->http.info.request.url, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
 		zval_ptr_dtor(&cpy);
 	}
 }
-static void http_message_object_prophandler_get_response_status(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_response_status(http_message_object *obj, zval *return_value TSRMLS_DC) {
 	if (HTTP_MSG_TYPE(RESPONSE, obj->message) && obj->message->http.info.response.status) {
 		RETVAL_STRING(obj->message->http.info.response.status, 1);
 	} else {
 		RETVAL_NULL();
 	}
 }
-static void http_message_object_prophandler_set_response_status(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_response_status(http_message_object *obj, zval *value TSRMLS_DC) {
 	if (HTTP_MSG_TYPE(RESPONSE, obj->message)) {
 		zval *cpy = http_zsep(IS_STRING, value);
 		STR_SET(obj->message->http.info.response.status, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
 		zval_ptr_dtor(&cpy);
 	}
 }
-static void http_message_object_prophandler_get_response_code(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_response_code(http_message_object *obj, zval *return_value TSRMLS_DC) {
 	if (HTTP_MSG_TYPE(RESPONSE, obj->message)) {
 		RETVAL_LONG(obj->message->http.info.response.code);
 	} else {
 		RETVAL_NULL();
 	}
 }
-static void http_message_object_prophandler_set_response_code(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_response_code(http_message_object *obj, zval *value TSRMLS_DC) {
 	if (HTTP_MSG_TYPE(RESPONSE, obj->message)) {
 		zval *cpy = http_zsep(IS_LONG, value);
 		obj->message->http.info.response.code = Z_LVAL_P(cpy);
 		zval_ptr_dtor(&cpy);
 	}
 }
-static void http_message_object_prophandler_get_http_version(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_http_version(http_message_object *obj, zval *return_value TSRMLS_DC) {
 	RETVAL_DOUBLE(obj->message->http.version);
 }
-static void http_message_object_prophandler_set_http_version(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_http_version(http_message_object *obj, zval *value TSRMLS_DC) {
 	zval *cpy = http_zsep(IS_DOUBLE, value);
 	obj->message->http.version = Z_DVAL_P(cpy);
 	zval_ptr_dtor(&cpy);
 }
-static void http_message_object_prophandler_get_headers(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_headers(http_message_object *obj, zval *return_value TSRMLS_DC) {
 	array_init(return_value);
 	zend_hash_copy(Z_ARRVAL_P(return_value), &obj->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 }
-static void http_message_object_prophandler_set_headers(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_headers(http_message_object *obj, zval *value TSRMLS_DC) {
 	zval *cpy = http_zsep(IS_ARRAY, value);
 	zend_hash_clean(&obj->message->hdrs);
 	zend_hash_copy(&obj->message->hdrs, Z_ARRVAL_P(cpy), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 	zval_ptr_dtor(&cpy);
 }
-static void http_message_object_prophandler_get_parent_message(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_parent_message(http_message_object *obj, zval *return_value TSRMLS_DC) {
 	if (obj->message->parent) {
 		RETVAL_OBJVAL(obj->parent, 1);
 	} else {
 		RETVAL_NULL();
 	}
 }
-static void http_message_object_prophandler_set_parent_message(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_parent_message(http_message_object *obj, zval *value TSRMLS_DC) {
 	if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), http_message_object_ce TSRMLS_CC)) {
 		if (obj->message->parent) {
 			zval tmp;
@@ -558,7 +558,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 TSRMLS_DC) {
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_LITERAL_KEY_DC TSRMLS_DC) {
 	getObjectEx(http_message_object, obj, object);
 	http_message_object_prophandler *handler;
 	
@@ -567,10 +567,10 @@ static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRML
 		return NULL;
 	}
 
-	return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member TSRMLS_CC);
+	return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member ZEND_LITERAL_KEY_CC TSRMLS_CC);
 }
 
-static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
+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;
@@ -591,24 +591,24 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 		return_value->is_ref = 0;
 #endif
 
-		handler->read(obj, return_value);
+		handler->read(obj, return_value TSRMLS_CC);
 
 	} else {
-		return_value = zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
+		return_value = zend_get_std_object_handlers()->read_property(object, member, type ZEND_LITERAL_KEY_CC TSRMLS_CC);
 	}
 	
 	return return_value;
 }
 
-static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC)
+static void _http_message_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC)
 {
 	getObjectEx(http_message_object, obj, object);
 	http_message_object_prophandler *handler;
 	
 	if (SUCCESS == http_message_object_get_prophandler(Z_STRVAL_P(member), Z_STRLEN_P(member), &handler)) {
-		handler->write(obj, value);
+		handler->write(obj, value TSRMLS_CC);
 	} else {
-		zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
+		zend_get_std_object_handlers()->write_property(object, member, value ZEND_LITERAL_KEY_CC TSRMLS_CC);
 	}
 }
 
@@ -1000,7 +1000,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));
@@ -1100,11 +1100,11 @@ PHP_METHOD(HttpMessage, getHttpVersion)
 	NO_ARGS;
 
 	if (return_value_used) {
-		char ver[4] = {0};
+		char *version;
 		getObject(http_message_object, obj);
 
-		sprintf(ver, "%1.1lf", obj->message->http.version);
-		RETURN_STRINGL(ver, 3, 1);
+		spprintf(&version, 0, "%1.1F", obj->message->http.version);
+		RETURN_STRING(version, 0);
 	}
 }
 /* }}} */
@@ -1113,8 +1113,8 @@ PHP_METHOD(HttpMessage, getHttpVersion)
 	Set the HTTP Protocol version of the Message. */
 PHP_METHOD(HttpMessage, setHttpVersion)
 {
-	char v[4];
 	zval *zv;
+	char *version;
 	getObject(http_message_object, obj);
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &zv)) {
@@ -1122,12 +1122,13 @@ PHP_METHOD(HttpMessage, setHttpVersion)
 	}
 
 	convert_to_double(zv);
-	snprintf(v, sizeof(v), "%1.1f", Z_DVAL_P(zv));
-	if (strcmp(v, "1.0") && strcmp(v, "1.1")) {
+	spprintf(&version, 0, "%1.1F", Z_DVAL_P(zv));
+	if (strcmp(version, "1.0") && strcmp(version, "1.1")) {
+		efree(version);
 		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;
 	}
-
+	efree(version);
 	obj->message->http.version = Z_DVAL_P(zv);
 	RETURN_TRUE;
 }