X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_message.c;h=1bbc53cefce10150da3d7d03de434c19bec48895;hp=55225d3173b3662dd347c9952baa1007d099865a;hb=640b762aa5a5fdf571e44f7a66725c097b7dc0f1;hpb=13662c61792685435496cd25c95ee1c1950cd9d7 diff --git a/src/php_http_message.c b/src/php_http_message.c index 55225d3..1bbc53c 100644 --- a/src/php_http_message.c +++ b/src/php_http_message.c @@ -332,7 +332,7 @@ static void message_headers(php_http_message_t *msg, php_http_buffer_t *str) char *tmp = NULL; size_t len = 0; - php_http_info_to_string((php_http_info_t *) msg, &tmp, &len, PHP_HTTP_CRLF TSRMLS_CC); + php_http_info_to_string((php_http_info_t *) msg, &tmp, &len, PHP_HTTP_CRLF); php_http_message_update_headers(msg); php_http_buffer_append(str, tmp, len); @@ -509,8 +509,8 @@ zend_class_entry *php_http_message_get_class_entry(void) return php_http_message_class_entry; } -static zval *php_http_message_object_read_prop(zval *object, zval *member, int type, void **cache_slot, zval *rv); -static void php_http_message_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot); +static zval *php_http_message_object_read_prop(zend_object *object, zend_string *member, int type, void **cache_slot, zval *rv); +static zval *php_http_message_object_write_prop(zend_object *object, zend_string *member, zval *value, void **cache_slot); static zend_object_handlers php_http_message_object_handlers; static HashTable php_http_message_object_prophandlers; @@ -776,7 +776,7 @@ ZEND_RESULT_CODE php_http_message_object_set_body(php_http_message_object_t *msg case IS_RESOURCE: php_stream_from_zval_no_verify(s, zbody); if (!s) { - php_http_throw(unexpected_val, "The stream is not a valid resource", NULL); + php_http_throw(unexpected_val, "The stream is not a valid resource"); return FAILURE; } @@ -856,10 +856,10 @@ php_http_message_object_t *php_http_message_object_new_ex(zend_class_entry *ce, return o; } -zend_object *php_http_message_object_clone(zval *this_ptr) +zend_object *php_http_message_object_clone(zend_object *this_ptr) { - php_http_message_object_t *new_obj = NULL; - php_http_message_object_t *old_obj = PHP_HTTP_OBJ(NULL, this_ptr); + php_http_message_object_t *new_obj; + php_http_message_object_t *old_obj = PHP_HTTP_OBJ(this_ptr, NULL); new_obj = php_http_message_object_new_ex(old_obj->zo.ce, php_http_message_copy(old_obj->message, NULL)); zend_objects_clone_members(&new_obj->zo, &old_obj->zo); @@ -894,56 +894,45 @@ void php_http_message_object_free(zend_object *object) zend_object_std_dtor(object); } -static zval *php_http_message_object_read_prop(zval *object, zval *member, int type, void **cache_slot, zval *tmp) +static zval *php_http_message_object_get_prop_ptr(zend_object *object, zend_string *member, int type, void **cache_slot) +{ + return NULL; +} + +static zval *php_http_message_object_read_prop(zend_object *object, zend_string *member, int type, void **cache_slot, zval *tmp) { zval *return_value; - zend_string *member_name = zval_get_string(member); - php_http_message_object_prophandler_t *handler = php_http_message_object_get_prophandler(member_name); + php_http_message_object_prophandler_t *handler = php_http_message_object_get_prophandler(member); return_value = zend_get_std_object_handlers()->read_property(object, member, type, cache_slot, tmp); if (handler && handler->read) { - if (type == BP_VAR_R || type == BP_VAR_IS) { - php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, object); - - handler->read(obj, return_value); - } else { - php_property_proxy_t *proxy; - php_property_proxy_object_t *proxy_obj; + php_http_message_object_t *obj = PHP_HTTP_OBJ(object, NULL); - proxy = php_property_proxy_init(object, member_name); - proxy_obj = php_property_proxy_object_new_ex(NULL, proxy); - - ZVAL_OBJ(tmp, &proxy_obj->zo); - return_value = tmp; - } + handler->read(obj, return_value); } - - zend_string_release(member_name); return return_value; } -static void php_http_message_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot) +static zval *php_http_message_object_write_prop(zend_object *object, zend_string *member, zval *value, void **cache_slot) { - php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, object); + php_http_message_object_t *obj = PHP_HTTP_OBJ(object, NULL); php_http_message_object_prophandler_t *handler; - zend_string *member_name = zval_get_string(member); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - if ((handler = php_http_message_object_get_prophandler(member_name))) { + if ((handler = php_http_message_object_get_prophandler(member))) { handler->write(obj, value); } else { zend_get_std_object_handlers()->write_property(object, member, value, cache_slot); } - - zend_string_release(member_name); + return value; } -static HashTable *php_http_message_object_get_debug_info(zval *object, int *is_temp) +static HashTable *php_http_message_object_get_debug_info(zend_object *object, int *is_temp) { zval tmp; - php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, object); + php_http_message_object_t *obj = PHP_HTTP_OBJ(object, NULL); HashTable *props = zend_get_std_object_handlers()->get_properties(object); char *ver_str, *url_str = NULL; size_t ver_len, url_len = 0; @@ -1019,10 +1008,10 @@ static HashTable *php_http_message_object_get_debug_info(zval *object, int *is_t return props; } -static HashTable *php_http_message_object_get_gc(zval *object, zval **table, int *n) +static HashTable *php_http_message_object_get_gc(zend_object *object, zval **table, int *n) { - php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, object); - HashTable *props = Z_OBJPROP_P(object); + php_http_message_object_t *obj = PHP_HTTP_OBJ(object, NULL); + HashTable *props = object->handlers->get_properties(object); uint32_t count = 2 + zend_hash_num_elements(props); zval *val; @@ -1045,6 +1034,30 @@ static HashTable *php_http_message_object_get_gc(zval *object, zval **table, int return NULL; } +static int php_http_message_object_cast(zend_object *object, zval *return_value, int type) +{ + php_http_message_object_t *obj = PHP_HTTP_OBJ(object, NULL); + char *string; + size_t length; + + switch (type) { + case IS_STRING: + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); + php_http_message_to_string(obj->message, &string, &length); + if (string) { + RETVAL_STR(php_http_cs2zs(string, length)); + } else { + RETVAL_EMPTY_STRING(); + } + return SUCCESS; + case _IS_BOOL: + RETVAL_TRUE; + return SUCCESS; + default: + return FAILURE; + } +} + ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage___construct, 0, 0, 0) ZEND_ARG_INFO(0, message) ZEND_ARG_INFO(0, greedy) @@ -1076,7 +1089,7 @@ static PHP_METHOD(HttpMessage, __construct) php_http_buffer_init_ex(&buf, 0x1000, PHP_HTTP_BUFFER_INIT_PREALLOC); if (PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE == php_http_message_parser_parse_stream(&p, &buf, s, flags, &msg)) { if (!EG(exception)) { - php_http_throw(bad_message, "Could not parse message from stream", NULL); + php_http_throw(bad_message, "Could not parse message from stream"); } } php_http_buffer_dtor(&buf); @@ -1084,7 +1097,7 @@ static PHP_METHOD(HttpMessage, __construct) } if (!msg && !EG(exception)) { - php_http_throw(bad_message, "Empty message received from stream", NULL); + php_http_throw(bad_message, "Empty message received from stream"); } } else if (zmessage) { zend_string *zs_msg = zval_get_string(zmessage); @@ -1092,7 +1105,7 @@ static PHP_METHOD(HttpMessage, __construct) msg = php_http_message_parse(NULL, zs_msg->val, zs_msg->len, greedy); if (!msg && !EG(exception)) { - php_http_throw(bad_message, "Could not parse message: %.*s", MIN(25, zs_msg->len), zs_msg->val); + php_http_throw(bad_message, "Could not parse message: %.*s", (int) MIN(25, zs_msg->len), zs_msg->val); } zend_string_release(zs_msg); } @@ -1468,7 +1481,7 @@ static PHP_METHOD(HttpMessage, getResponseCode) PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (obj->message->type != PHP_HTTP_RESPONSE) { - php_error_docref(NULL, E_WARNING, "http\\Message is not if type response"); + php_error_docref(NULL, E_WARNING, "http\\Message is not of type response"); RETURN_FALSE; } @@ -1492,7 +1505,7 @@ static PHP_METHOD(HttpMessage, setResponseCode) PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (obj->message->type != PHP_HTTP_RESPONSE) { - php_http_throw(bad_method_call, "http\\Message is not of type response", NULL); + php_http_throw(bad_method_call, "http\\Message is not of type response"); return; } @@ -1544,7 +1557,7 @@ static PHP_METHOD(HttpMessage, setResponseStatus) PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (obj->message->type != PHP_HTTP_RESPONSE) { - php_http_throw(bad_method_call, "http\\Message is not of type response", NULL); + php_http_throw(bad_method_call, "http\\Message is not of type response"); } PTR_SET(obj->message->http.info.response.status, estrndup(status, status_len)); @@ -1589,12 +1602,12 @@ static PHP_METHOD(HttpMessage, setRequestMethod) PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (obj->message->type != PHP_HTTP_REQUEST) { - php_http_throw(bad_method_call, "http\\Message is not of type request", NULL); + php_http_throw(bad_method_call, "http\\Message is not of type request"); return; } if (method_len < 1) { - php_http_throw(invalid_arg, "Cannot set http\\Message's request method to an empty string", NULL); + php_http_throw(invalid_arg, "Cannot set http\\Message's request method to an empty string"); return; } @@ -1645,7 +1658,7 @@ static PHP_METHOD(HttpMessage, setRequestUrl) PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (obj->message->type != PHP_HTTP_REQUEST) { - php_http_throw(bad_method_call, "http\\Message is not of type request", NULL); + php_http_throw(bad_method_call, "http\\Message is not of type request"); return; } @@ -1655,7 +1668,7 @@ static PHP_METHOD(HttpMessage, setRequestUrl) if (url && php_http_url_is_empty(url)) { php_http_url_free(&url); - php_http_throw(invalid_arg, "Cannot set http\\Message's request url to an empty string", NULL); + php_http_throw(invalid_arg, "Cannot set http\\Message's request url to an empty string"); } else if (url) { PTR_SET(obj->message->http.info.request.url, url); } @@ -1675,7 +1688,7 @@ static PHP_METHOD(HttpMessage, getParentMessage) PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (!obj->message->parent) { - php_http_throw(unexpected_val, "http\\Message has not parent message", NULL); + php_http_throw(unexpected_val, "http\\Message has no parent message"); return; } @@ -1832,7 +1845,7 @@ static PHP_METHOD(HttpMessage, prepend) for (msg[0] = obj->message; msg[0]; msg[0] = msg[0]->parent) { for (msg[1] = prepend_obj->message; msg[1]; msg[1] = msg[1]->parent) { if (msg[0] == msg[1]) { - php_http_throw(unexpected_val, "Cannot prepend a message located within the same message chain", NULL); + php_http_throw(unexpected_val, "Cannot prepend a message located within the same message chain"); return; } } @@ -1892,7 +1905,7 @@ static PHP_METHOD(HttpMessage, splitMultipartBody) PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (!php_http_message_is_multipart(obj->message, &boundary)) { - php_http_throw(bad_method_call, "http\\Message is not a multipart message", NULL); + php_http_throw(bad_method_call, "http\\Message is not a multipart message"); return; } @@ -1993,7 +2006,7 @@ static PHP_METHOD(HttpMessage, current) } static zend_function_entry php_http_message_methods[] = { - PHP_ME(HttpMessage, __construct, ai_HttpMessage___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_ME(HttpMessage, __construct, ai_HttpMessage___construct, ZEND_ACC_PUBLIC) PHP_ME(HttpMessage, getBody, ai_HttpMessage_getBody, ZEND_ACC_PUBLIC) PHP_ME(HttpMessage, setBody, ai_HttpMessage_setBody, ZEND_ACC_PUBLIC) PHP_ME(HttpMessage, addBody, ai_HttpMessage_addBody, ZEND_ACC_PUBLIC) @@ -2062,8 +2075,13 @@ PHP_MINIT_FUNCTION(http_message) php_http_message_object_handlers.read_property = php_http_message_object_read_prop; php_http_message_object_handlers.write_property = php_http_message_object_write_prop; php_http_message_object_handlers.get_debug_info = php_http_message_object_get_debug_info; +#if PHP_VERSION_ID >= 70400 + php_http_message_object_handlers.get_property_ptr_ptr = php_http_message_object_get_prop_ptr; +#else php_http_message_object_handlers.get_property_ptr_ptr = NULL; +#endif php_http_message_object_handlers.get_gc = php_http_message_object_get_gc; + php_http_message_object_handlers.cast_object = php_http_message_object_cast; zend_class_implements(php_http_message_class_entry, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator);