X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=f741e65754ea7bdeebe2976d9c9861ff985444c9;hp=561b3508aa54003e5ad8441e8d87c2a082cb6212;hb=edc84b40eb2c5be04492fa98fec5833a030782eb;hpb=e103c61ca14d22e9507379810e980075c8323ca3 diff --git a/http_message_object.c b/http_message_object.c index 561b350..f741e65 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -1,16 +1,13 @@ /* - +----------------------------------------------------------------------+ - | PECL :: http | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, that | - | is bundled with this package in the file LICENSE, and is available | - | through the world-wide-web at http://www.php.net/license/3_0.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Copyright (c) 2004-2005 Michael Wallner | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: http | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2004-2005, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ @@ -19,18 +16,23 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include "php.h" + +#include "php_http.h" #ifdef ZEND_ENGINE_2 -#include "php_http.h" #include "php_http_api.h" -#include "php_http_std_defs.h" +#include "php_http_message_api.h" #include "php_http_message_object.h" #include "php_http_exception_object.h" -#include "phpstr/phpstr.h" -#include "missing.h" +#ifndef WONKY +# include "zend_interfaces.h" +# if defined(HAVE_SPL) +/* SPL doesn't install its headers */ +extern PHPAPI zend_class_entry *spl_ce_Countable; +# endif +#endif ZEND_EXTERN_MODULE_GLOBALS(http); @@ -92,6 +94,13 @@ HTTP_BEGIN_ARGS(toString, 0, 0) HTTP_ARG_VAL(include_parent, 0) HTTP_END_ARGS; +HTTP_EMPTY_ARGS(count, 0); + +HTTP_EMPTY_ARGS(serialize, 0); +HTTP_BEGIN_ARGS(unserialize, 0, 1) + HTTP_ARG_VAL(serialized, 0) +HTTP_END_ARGS; + #define http_message_object_declare_default_properties() _http_message_object_declare_default_properties(TSRMLS_C) static inline void _http_message_object_declare_default_properties(TSRMLS_D); #define http_message_object_read_prop _http_message_object_read_prop @@ -100,8 +109,6 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC); #define http_message_object_get_props _http_message_object_get_props static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC); -#define http_message_object_clone_obj _http_message_object_clone_obj -static inline zend_object_value _http_message_object_clone_obj(zval *object TSRMLS_DC); zend_class_entry *http_message_object_ce; zend_function_entry http_message_object_fe[] = { @@ -125,6 +132,13 @@ zend_function_entry http_message_object_fe[] = { HTTP_MESSAGE_ME(send, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(toString, ZEND_ACC_PUBLIC) + /* implements Countable */ + HTTP_MESSAGE_ME(count, ZEND_ACC_PUBLIC) + + /* implements Serializable */ + HTTP_MESSAGE_ME(serialize, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(unserialize, ZEND_ACC_PUBLIC) + ZEND_MALIAS(HttpMessage, __toString, toString, HTTP_ARGS(HttpMessage, toString), ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(fromString, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) @@ -136,12 +150,19 @@ static zend_object_handlers http_message_object_handlers; PHP_MINIT_FUNCTION(http_message_object) { HTTP_REGISTER_CLASS_EX(HttpMessage, http_message_object, NULL, 0); +#ifndef WONKY +# ifdef HAVE_SPL + zend_class_implements(http_message_object_ce TSRMLS_CC, 2, spl_ce_Countable, zend_ce_serializable); +# else + zend_class_implements(http_message_object_ce TSRMLS_CC, 1, zend_ce_serializable); +# endif +#endif HTTP_LONG_CONSTANT("HTTP_MSG_NONE", HTTP_MSG_NONE); HTTP_LONG_CONSTANT("HTTP_MSG_REQUEST", HTTP_MSG_REQUEST); HTTP_LONG_CONSTANT("HTTP_MSG_RESPONSE", HTTP_MSG_RESPONSE); - http_message_object_handlers.clone_obj = http_message_object_clone_obj; + http_message_object_handlers.clone_obj = _http_message_object_clone_obj; 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; @@ -152,21 +173,25 @@ PHP_MINIT_FUNCTION(http_message_object) zend_object_value _http_message_object_new(zend_class_entry *ce TSRMLS_DC) { - return http_message_object_new_ex(ce, NULL); + return http_message_object_new_ex(ce, NULL, NULL); } -zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message *msg TSRMLS_DC) +zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message *msg, http_message_object **ptr TSRMLS_DC) { zend_object_value ov; http_message_object *o; o = ecalloc(1, sizeof(http_message_object)); o->zo.ce = ce; + + if (ptr) { + *ptr = o; + } if (msg) { o->message = msg; if (msg->parent) { - o->parent = http_message_object_from_msg(msg->parent); + o->parent = http_message_object_new_ex(ce, msg->parent, NULL); } } @@ -179,9 +204,10 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message return ov; } -zend_object_value _http_message_object_clone(zval *this_ptr TSRMLS_DC) +zend_object_value _http_message_object_clone_obj(zval *this_ptr TSRMLS_DC) { - return http_message_object_clone_obj(this_ptr TSRMLS_CC); + getObject(http_message_object, obj); + return http_message_object_new_ex(Z_OBJCE_P(this_ptr), http_message_dup(obj->message), NULL); } static inline void _http_message_object_declare_default_properties(TSRMLS_D) @@ -219,12 +245,6 @@ void _http_message_object_free(zend_object *object TSRMLS_DC) efree(o); } -static inline zend_object_value _http_message_object_clone_obj(zval *this_ptr TSRMLS_DC) -{ - getObject(http_message_object, obj); - return http_message_object_from_msg(http_message_dup(obj->message)); -} - static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC) { getObjectEx(http_message_object, obj, object); @@ -240,7 +260,12 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type } #endif - return_value = &EG(uninitialized_zval); + if (type == BP_VAR_W) { + zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index"); + return NULL; + } + + ALLOC_ZVAL(return_value); return_value->refcount = 0; return_value->is_ref = 0; @@ -251,34 +276,29 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type #endif { case HTTP_MSG_PROPHASH_TYPE: + case HTTP_MSG_CHILD_PROPHASH_TYPE: RETVAL_LONG(msg->type); break; case HTTP_MSG_PROPHASH_HTTP_VERSION: + case HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION: RETVAL_DOUBLE(msg->http.version); break; case HTTP_MSG_PROPHASH_BODY: + case HTTP_MSG_CHILD_PROPHASH_BODY: phpstr_fix(PHPSTR(msg)); RETVAL_PHPSTR(PHPSTR(msg), 0, 1); break; case HTTP_MSG_PROPHASH_HEADERS: - /* This is needed for situations like - * $this->headers['foo'] = 'bar'; - */ - if (type == BP_VAR_W) { - return_value->refcount = 1; - return_value->is_ref = 1; - Z_TYPE_P(return_value) = IS_ARRAY; - Z_ARRVAL_P(return_value) = &msg->hdrs; - } else { - array_init(return_value); - zend_hash_copy(Z_ARRVAL_P(return_value), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - } + case HTTP_MSG_CHILD_PROPHASH_HEADERS: + array_init(return_value); + zend_hash_copy(Z_ARRVAL_P(return_value), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); break; case HTTP_MSG_PROPHASH_PARENT_MESSAGE: + case HTTP_MSG_CHILD_PROPHASH_PARENT_MESSAGE: if (msg->parent) { RETVAL_OBJVAL(obj->parent); } else { @@ -287,6 +307,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type break; case HTTP_MSG_PROPHASH_REQUEST_METHOD: + case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD: if (HTTP_MSG_TYPE(REQUEST, msg) && msg->http.info.request.method) { RETVAL_STRING(msg->http.info.request.method, 1); } else { @@ -295,6 +316,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type break; case HTTP_MSG_PROPHASH_REQUEST_URI: + case HTTP_MSG_CHILD_PROPHASH_REQUEST_URI: if (HTTP_MSG_TYPE(REQUEST, msg) && msg->http.info.request.URI) { RETVAL_STRING(msg->http.info.request.URI, 1); } else { @@ -303,6 +325,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type break; case HTTP_MSG_PROPHASH_RESPONSE_CODE: + case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE: if (HTTP_MSG_TYPE(RESPONSE, msg)) { RETVAL_LONG(msg->http.info.response.code); } else { @@ -311,6 +334,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type break; case HTTP_MSG_PROPHASH_RESPONSE_STATUS: + case HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS: if (HTTP_MSG_TYPE(RESPONSE, msg) && msg->http.info.response.status) { RETVAL_STRING(msg->http.info.response.status, 1); } else { @@ -334,6 +358,7 @@ 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; #ifdef WONKY ulong h = zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1); #else @@ -344,7 +369,12 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va return; } #endif - + + ALLOC_ZVAL(cpy); + *cpy = *value; + zval_copy_ctor(cpy); + INIT_PZVAL(cpy); + #ifdef WONKY switch (h) #else @@ -352,62 +382,73 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va #endif { case HTTP_MSG_PROPHASH_TYPE: - convert_to_long_ex(&value); - http_message_set_type(msg, Z_LVAL_P(value)); + case HTTP_MSG_CHILD_PROPHASH_TYPE: + convert_to_long(cpy); + http_message_set_type(msg, Z_LVAL_P(cpy)); break; case HTTP_MSG_PROPHASH_HTTP_VERSION: - convert_to_double_ex(&value); - msg->http.version = Z_DVAL_P(value); + case HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION: + convert_to_double(cpy); + msg->http.version = Z_DVAL_P(cpy); break; case HTTP_MSG_PROPHASH_BODY: - convert_to_string_ex(&value); + case HTTP_MSG_CHILD_PROPHASH_BODY: + convert_to_string(cpy); phpstr_dtor(PHPSTR(msg)); - phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(value), Z_STRLEN_P(value)); + phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)); break; case HTTP_MSG_PROPHASH_HEADERS: - convert_to_array_ex(&value); + case HTTP_MSG_CHILD_PROPHASH_HEADERS: + convert_to_array(cpy); zend_hash_clean(&msg->hdrs); - zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(value), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(cpy), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); break; case HTTP_MSG_PROPHASH_PARENT_MESSAGE: - if (msg->parent) { - zval tmp; - tmp.value.obj = obj->parent; - zend_objects_store_del_ref(&tmp TSRMLS_CC); + case HTTP_MSG_CHILD_PROPHASH_PARENT_MESSAGE: + if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), http_message_object_ce TSRMLS_CC)) { + if (msg->parent) { + zval tmp; + tmp.value.obj = obj->parent; + Z_OBJ_DELREF(tmp); + } + Z_OBJ_ADDREF_P(value); + obj->parent = value->value.obj; } - zend_objects_store_add_ref(value TSRMLS_CC); - obj->parent = value->value.obj; break; case HTTP_MSG_PROPHASH_REQUEST_METHOD: + case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD: if (HTTP_MSG_TYPE(REQUEST, msg)) { - convert_to_string_ex(&value); - STR_SET(msg->http.info.request.method, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value))); + convert_to_string(cpy); + STR_SET(msg->http.info.request.method, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); } break; case HTTP_MSG_PROPHASH_REQUEST_URI: + case HTTP_MSG_CHILD_PROPHASH_REQUEST_URI: if (HTTP_MSG_TYPE(REQUEST, msg)) { - convert_to_string_ex(&value); - STR_SET(msg->http.info.request.URI, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value))); + convert_to_string(cpy); + STR_SET(msg->http.info.request.URI, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); } break; case HTTP_MSG_PROPHASH_RESPONSE_CODE: + case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE: if (HTTP_MSG_TYPE(RESPONSE, msg)) { - convert_to_long_ex(&value); - msg->http.info.response.code = Z_LVAL_P(value); + convert_to_long(cpy); + msg->http.info.response.code = Z_LVAL_P(cpy); } break; case HTTP_MSG_PROPHASH_RESPONSE_STATUS: + case HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS: if (HTTP_MSG_TYPE(RESPONSE, msg)) { - convert_to_string_ex(&value); - STR_SET(msg->http.info.response.status, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value))); + convert_to_string(cpy); + STR_SET(msg->http.info.response.status, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); } break; @@ -417,6 +458,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va #endif break; } + zval_ptr_dtor(&cpy); } static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) @@ -499,18 +541,25 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) */ PHP_METHOD(HttpMessage, __construct) { - char *message = NULL; int length = 0; + char *message = NULL; + getObject(http_message_object, obj); - + SET_EH_THROW_HTTP(); if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &message, &length) && message && length) { - if (obj->message = http_message_parse(message, length)) { + http_message *msg = obj->message; + + http_message_dtor(msg); + if ((obj->message = http_message_parse_ex(msg, message, length))) { if (obj->message->parent) { - obj->parent = http_message_object_from_msg(obj->message->parent); + obj->parent = http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL); } + } else { + obj->message = http_message_init(msg); } - } else if (!obj->message) { + } + if (!obj->message) { obj->message = http_message_new(); } SET_EH_NORMAL(); @@ -538,9 +587,8 @@ PHP_METHOD(HttpMessage, fromString) SET_EH_THROW_HTTP(); if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &length)) { - if (msg = http_message_parse(string, length)) { - Z_TYPE_P(return_value) = IS_OBJECT; - return_value->value.obj = http_message_object_from_msg(msg); + if ((msg = http_message_parse(string, length))) { + ZVAL_OBJVAL(return_value, http_message_object_new_ex(http_message_object_ce, msg, NULL)); } } SET_EH_NORMAL(); @@ -960,6 +1008,66 @@ PHP_METHOD(HttpMessage, toString) } /* }}} */ +/* {{{ proto int HttpMessage::count() + * + * Implements Countable. + * + * Returns the number of parent messages + 1. + */ +PHP_METHOD(HttpMessage, count) +{ + NO_ARGS { + long i; + http_message *msg; + getObject(http_message_object, obj); + + for (i = 0, msg = obj->message; msg; msg = msg->parent, ++i); + RETURN_LONG(i); + } +} +/* }}} */ + +/* {{{ proto string HttpMessage::serialize() + * + * Implements Serializable. + * + * Returns the serialized representation of the HttpMessage. + */ +PHP_METHOD(HttpMessage, serialize) +{ + NO_ARGS { + char *string; + size_t length; + getObject(http_message_object, obj); + + http_message_serialize(obj->message, &string, &length); + RETURN_STRINGL(string, length, 0); + } +} +/* }}} */ + +/* {{{ proto void HttpMessage::unserialize(string serialized) + * + * Implements Serializable. + * + * Re-constructs the HttpMessage based upon the serialized string. + */ +PHP_METHOD(HttpMessage, unserialize) +{ + int length; + char *serialized; + getObject(http_message_object, obj); + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &serialized, &length)) { + http_message_dtor(obj->message); + if (!http_message_parse_ex(obj->message, serialized, (size_t) length)) { + http_error(HE_ERROR, HTTP_E_RUNTIME, "Could not unserialize HttpMessage"); + http_message_init(obj->message); + } + } +} +/* }}} */ + #endif /* ZEND_ENGINE_2 */ /*