X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=f1a6705cdccea600e1ccb1473fcf9fc272a06ebb;hp=6ebb751f1bcb3c6ff37898bdd3c51879b218ad6a;hb=16ea91ddd08d15dd9b7206229fec6158f212adaf;hpb=c2b4f0332ead5425b183d2487ab5f25663f1009f diff --git a/http_message_object.c b/http_message_object.c index 6ebb751..f1a6705 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -26,6 +26,8 @@ #include "php_http_std_defs.h" #include "php_http_message_object.h" +#include "phpstr/phpstr.h" + #ifdef ZEND_ENGINE_2 #define http_message_object_declare_default_properties() _http_message_object_declare_default_properties(TSRMLS_C) @@ -57,7 +59,7 @@ zend_function_entry http_message_object_fe[] = { PHP_ME(HttpMessage, getParentMessage, NULL, ZEND_ACC_PUBLIC) PHP_ME(HttpMessage, send, NULL, ZEND_ACC_PUBLIC) PHP_ME(HttpMessage, toString, NULL, ZEND_ACC_PUBLIC) - + ZEND_MALIAS(HttpMessage, __toString, toString, NULL, ZEND_ACC_PUBLIC) PHP_ME(HttpMessage, fromString, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) @@ -124,7 +126,7 @@ static inline void _http_message_object_declare_default_properties(TSRMLS_D) DCL_PROP_N(PROTECTED, parentMessage); } -static void _http_message_object_free(zend_object *object TSRMLS_DC) +void _http_message_object_free(zend_object *object TSRMLS_DC) { http_message_object *o = (http_message_object *) object; @@ -154,10 +156,6 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type return EG(uninitialized_zval_ptr); } -#if 1 - fprintf(stderr, "Reading property: %s(%d==%d)\n", Z_STRVAL_P(member), Z_STRLEN_P(member), strlen(Z_STRVAL_P(member))); -#endif - switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1)) { case HTTP_MSG_PROPHASH_TYPE: @@ -244,10 +242,6 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member)); } -#if 1 - fprintf(stderr, "Writing property: %s(%d==%d)\n", Z_STRVAL_P(member), Z_STRLEN_P(member), strlen(Z_STRVAL_P(member))); -#endif - switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1)) { case HTTP_MSG_PROPHASH_TYPE: @@ -271,7 +265,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va break; case HTTP_MSG_PROPHASH_HTTP_VERSION: - convert_to_long_ex(&value); + convert_to_double_ex(&value); switch (msg->type) { case HTTP_MSG_REQUEST: