X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=ae4254a2621810a73074912f3c62d0abde9ff237;hp=027cbdfcd5c7ad221b09911f2ba0ff45746d900b;hb=d046681a7b929ef813849cfe38fbceb333f0b0eb;hpb=e6d4ae260275041fcc32f06f3487cdef6613c646 diff --git a/http_message_object.c b/http_message_object.c index 027cbdf..ae4254a 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -1,35 +1,43 @@ /* - +----------------------------------------------------------------------+ - | 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-2006, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif -#include "php.h" +#define HTTP_WANT_SAPI +#define HTTP_WANT_CURL +#include "php_http.h" #ifdef ZEND_ENGINE_2 -#include "php_http.h" +#include "ext/standard/url.h" + #include "php_http_api.h" -#include "php_http_std_defs.h" +#include "php_http_send_api.h" +#include "php_http_url_api.h" +#include "php_http_message_api.h" #include "php_http_message_object.h" #include "php_http_exception_object.h" - -#include "phpstr/phpstr.h" +#include "php_http_response_object.h" +#include "php_http_request_method_api.h" +#include "php_http_request_api.h" +#include "php_http_request_object.h" + +#ifndef WONKY +# include "zend_interfaces.h" +# ifdef HAVE_SPL +/* SPL doesn't install its headers */ +extern PHPAPI zend_class_entry *spl_ce_Countable; +# endif +#endif #define HTTP_BEGIN_ARGS(method, ret_ref, req_args) HTTP_BEGIN_ARGS_EX(HttpMessage, method, ret_ref, req_args) #define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpMessage, method, ret_ref) @@ -44,6 +52,10 @@ HTTP_BEGIN_ARGS(fromString, 1, 1) HTTP_END_ARGS; HTTP_EMPTY_ARGS(getBody, 0); +HTTP_BEGIN_ARGS(setBody, 0, 1) + HTTP_ARG_VAL(body, 0) +HTTP_END_ARGS; + HTTP_EMPTY_ARGS(getHeaders, 0); HTTP_BEGIN_ARGS(setHeaders, 0, 1) HTTP_ARG_VAL(headers, 0) @@ -69,9 +81,9 @@ HTTP_BEGIN_ARGS(setRequestMethod, 0, 1) HTTP_ARG_VAL(request_method, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getRequestUri, 0); -HTTP_BEGIN_ARGS(setRequestUri, 0, 1) - HTTP_ARG_VAL(uri, 0) +HTTP_EMPTY_ARGS(getRequestUrl, 0); +HTTP_BEGIN_ARGS(setRequestUrl, 0, 1) + HTTP_ARG_VAL(url, 0) HTTP_END_ARGS; HTTP_EMPTY_ARGS(getHttpVersion, 0); @@ -79,12 +91,32 @@ HTTP_BEGIN_ARGS(setHttpVersion, 0, 1) HTTP_ARG_VAL(http_version, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getParentMessage, 1); +HTTP_EMPTY_ARGS(getParentMessage, 0); HTTP_EMPTY_ARGS(send, 0); HTTP_BEGIN_ARGS(toString, 0, 0) HTTP_ARG_VAL(include_parent, 0) HTTP_END_ARGS; +HTTP_EMPTY_ARGS(toMessageTypeObject, 0); + +HTTP_EMPTY_ARGS(count, 0); + +HTTP_EMPTY_ARGS(serialize, 0); +HTTP_BEGIN_ARGS(unserialize, 0, 1) + HTTP_ARG_VAL(serialized, 0) +HTTP_END_ARGS; + +HTTP_EMPTY_ARGS(rewind, 0); +HTTP_EMPTY_ARGS(valid, 0); +HTTP_EMPTY_ARGS(key, 0); +HTTP_EMPTY_ARGS(current, 0); +HTTP_EMPTY_ARGS(next, 0); + +HTTP_EMPTY_ARGS(detach, 0); +HTTP_BEGIN_ARGS(prepend, 0, 1) + HTTP_ARG_OBJ(HttpMessage, message, 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 @@ -93,13 +125,12 @@ 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[] = { HTTP_MESSAGE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) HTTP_MESSAGE_ME(getBody, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(setBody, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(getHeaders, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(setHeaders, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(addHeaders, ZEND_ACC_PUBLIC) @@ -109,56 +140,87 @@ zend_function_entry http_message_object_fe[] = { HTTP_MESSAGE_ME(setResponseCode, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(getRequestMethod, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(setRequestMethod, ZEND_ACC_PUBLIC) - HTTP_MESSAGE_ME(getRequestUri, ZEND_ACC_PUBLIC) - HTTP_MESSAGE_ME(setRequestUri, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(getRequestUrl, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(setRequestUrl, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(getHttpVersion, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(setHttpVersion, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(getParentMessage, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(send, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(toString, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(toMessageTypeObject, 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) + + /* implements Iterator */ + HTTP_MESSAGE_ME(rewind, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(valid, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(current, ZEND_ACC_PUBLIC) + 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) HTTP_MESSAGE_ME(fromString, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) - {NULL, NULL, NULL} + + HTTP_MESSAGE_ME(detach, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(prepend, ZEND_ACC_PUBLIC) + + EMPTY_FUNCTION_ENTRY }; static zend_object_handlers http_message_object_handlers; -void _http_message_object_init(INIT_FUNC_ARGS) +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, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator); +# else + zend_class_implements(http_message_object_ce TSRMLS_CC, 2, zend_ce_serializable, zend_ce_iterator); +# endif +#else + zend_class_implements(http_message_object_ce TSRMLS_CC, 1, zend_ce_iterator); +#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; http_message_object_handlers.get_property_ptr_ptr = NULL; + + return SUCCESS; } 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; - o->message = NULL; - o->parent.handle = 0; - o->parent.handlers = NULL; + + 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); } } @@ -171,19 +233,26 @@ 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) { zend_class_entry *ce = http_message_object_ce; +#ifndef WONKY + DCL_CONST(long, "TYPE_NONE", HTTP_MSG_NONE); + DCL_CONST(long, "TYPE_REQUEST", HTTP_MSG_REQUEST); + DCL_CONST(long, "TYPE_RESPONSE", HTTP_MSG_RESPONSE); +#endif + DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE); DCL_PROP(PROTECTED, string, body, ""); DCL_PROP(PROTECTED, string, requestMethod, ""); - DCL_PROP(PROTECTED, string, requestUri, ""); + DCL_PROP(PROTECTED, string, requestUrl, ""); DCL_PROP(PROTECTED, long, responseCode, 0); DCL_PROP_N(PROTECTED, httpVersion); DCL_PROP_N(PROTECTED, headers); @@ -202,114 +271,120 @@ void _http_message_object_free(zend_object *object TSRMLS_DC) http_message_dtor(o->message); efree(o->message); } + if (o->parent.handle) { + zval p; + + INIT_PZVAL(&p); + p.type = IS_OBJECT; + p.value.obj = o->parent; + zend_objects_store_del_ref(&p TSRMLS_CC); + } 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); http_message *msg = obj->message; zval *return_value; +#ifdef WONKY + ulong h = zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member)+1); +#else + zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC); + + if (!pinfo || ACC_PROP_PUBLIC(pinfo->flags)) { + return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC); + } +#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; -#if 0 - fprintf(stderr, "Read HttpMessage::$%s\n", Z_STRVAL_P(member)); +#ifdef WONKY + switch (h) +#else + switch (pinfo->h) #endif - if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) { - zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member)); - return EG(uninitialized_zval_ptr); - } - - switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1)) { case HTTP_MSG_PROPHASH_TYPE: + case HTTP_MSG_CHILD_PROPHASH_TYPE: RETVAL_LONG(msg->type); break; case HTTP_MSG_PROPHASH_HTTP_VERSION: - switch (msg->type) - { - case HTTP_MSG_REQUEST: - RETVAL_DOUBLE(msg->info.request.http_version); - break; - - case HTTP_MSG_RESPONSE: - RETVAL_DOUBLE(msg->info.response.http_version); - break; - - case HTTP_MSG_NONE: - default: - RETVAL_NULL(); - break; - } + 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); - Z_TYPE_P(return_value) = IS_OBJECT; - return_value->value.obj = obj->parent; - zend_objects_store_add_ref(return_value TSRMLS_CC); + RETVAL_OBJVAL(obj->parent, 1); } else { RETVAL_NULL(); } break; case HTTP_MSG_PROPHASH_REQUEST_METHOD: - if (HTTP_MSG_TYPE(REQUEST, msg) && msg->info.request.method) { - RETVAL_STRING(msg->info.request.method, 1); + 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 { RETVAL_NULL(); } break; - case HTTP_MSG_PROPHASH_REQUEST_URI: - if (HTTP_MSG_TYPE(REQUEST, msg) && msg->info.request.URI) { - RETVAL_STRING(msg->info.request.URI, 1); + case HTTP_MSG_PROPHASH_REQUEST_URL: + case HTTP_MSG_CHILD_PROPHASH_REQUEST_URL: + if (HTTP_MSG_TYPE(REQUEST, msg) && msg->http.info.request.url) { + RETVAL_STRING(msg->http.info.request.url, 1); } else { RETVAL_NULL(); } break; case HTTP_MSG_PROPHASH_RESPONSE_CODE: + case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE: if (HTTP_MSG_TYPE(RESPONSE, msg)) { - RETVAL_LONG(msg->info.response.code); + RETVAL_LONG(msg->http.info.response.code); } else { RETVAL_NULL(); } 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 { + RETVAL_NULL(); + } + break; + default: +#ifdef WONKY + return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC); +#else RETVAL_NULL(); +#endif break; } @@ -320,99 +395,104 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va { getObjectEx(http_message_object, obj, object); http_message *msg = obj->message; - -#if 0 - fprintf(stderr, "Write HttpMessage::$%s\n", Z_STRVAL_P(member)); -#endif - if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) { - zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member)); + zval *cpy = NULL; +#ifdef WONKY + ulong h = zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1); +#else + zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC); + + if (!pinfo || ACC_PROP_PUBLIC(pinfo->flags)) { + zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC); + return; } - - switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1)) +#endif + + cpy = zval_copy(Z_TYPE_P(value), value); + +#ifdef WONKY + switch (h) +#else + switch (pinfo->h) +#endif { case HTTP_MSG_PROPHASH_TYPE: - convert_to_long_ex(&value); - if ((http_message_type) Z_LVAL_P(value) != msg->type) { - if (HTTP_MSG_TYPE(REQUEST, msg)) { - if (msg->info.request.method) { - efree(msg->info.request.method); - } - if (msg->info.request.URI) { - efree(msg->info.request.URI); - } - } - msg->type = Z_LVAL_P(value); - if (HTTP_MSG_TYPE(REQUEST, msg)) { - msg->info.request.method = NULL; - msg->info.request.URI = NULL; - } - } - + 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); - switch (msg->type) - { - case HTTP_MSG_REQUEST: - msg->info.request.http_version = Z_DVAL_P(value); - break; - - case HTTP_MSG_RESPONSE: - msg->info.response.http_version = Z_DVAL_P(value); - break; - } + 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: - convert_to_string_ex(&value); + case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD: if (HTTP_MSG_TYPE(REQUEST, msg)) { - if (msg->info.request.method) { - efree(msg->info.request.method); - } - msg->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: - convert_to_string_ex(&value); + case HTTP_MSG_PROPHASH_REQUEST_URL: + case HTTP_MSG_CHILD_PROPHASH_REQUEST_URL: if (HTTP_MSG_TYPE(REQUEST, msg)) { - if (msg->info.request.URI) { - efree(msg->info.request.URI); - } - msg->info.request.URI = estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)); + convert_to_string(cpy); + STR_SET(msg->http.info.request.url, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); } break; case HTTP_MSG_PROPHASH_RESPONSE_CODE: - convert_to_long_ex(&value); + case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE: if (HTTP_MSG_TYPE(RESPONSE, msg)) { - msg->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(cpy); + 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); } static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) @@ -420,63 +500,63 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) zval *headers; getObjectEx(http_message_object, obj, object); http_message *msg = obj->message; + HashTable *props = OBJ_PROP(obj); + zval array; + + INIT_ZARR(array, props); -#define ASSOC_PROP(obj, ptype, name, val) \ +#define ASSOC_PROP(array, ptype, name, val) \ { \ - zval array; \ char *m_prop_name; \ int m_prop_len; \ - Z_ARRVAL(array) = OBJ_PROP(obj); \ - zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \ - add_assoc_ ##ptype## _ex(&array, m_prop_name, sizeof(name)+4, val); \ + zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 0); \ + add_assoc_ ##ptype## _ex(&array, m_prop_name, sizeof(name)+3, val); \ + efree(m_prop_name); \ } -#define ASSOC_STRING(obj, name, val) ASSOC_STRINGL(obj, name, val, strlen(val)) -#define ASSOC_STRINGL(obj, name, val, len) \ +#define ASSOC_STRING(array, name, val) ASSOC_STRINGL(array, name, val, strlen(val)) +#define ASSOC_STRINGL(array, name, val, len) \ { \ - zval array; \ char *m_prop_name; \ int m_prop_len; \ - Z_ARRVAL(array) = OBJ_PROP(obj); \ - zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \ - add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+4, val, len, 1); \ + zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 0); \ + add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+3, val, len, 1); \ + efree(m_prop_name); \ } - zend_hash_clean(OBJ_PROP(obj)); - - ASSOC_PROP(obj, long, "type", msg->type); - ASSOC_STRINGL(obj, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg)); - - MAKE_STD_ZVAL(headers); - array_init(headers); - - zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - ASSOC_PROP(obj, zval, "headers", headers); + ASSOC_PROP(array, long, "type", msg->type); + ASSOC_PROP(array, double, "httpVersion", msg->http.version); switch (msg->type) { case HTTP_MSG_REQUEST: - ASSOC_PROP(obj, double, "httpVersion", msg->info.request.http_version); - ASSOC_PROP(obj, long, "responseCode", 0); - ASSOC_STRING(obj, "requestMethod", msg->info.request.method); - ASSOC_STRING(obj, "requestUri", msg->info.request.URI); + ASSOC_PROP(array, long, "responseCode", 0); + ASSOC_STRINGL(array, "responseStatus", "", 0); + ASSOC_STRING(array, "requestMethod", msg->http.info.request.method); + ASSOC_STRING(array, "requestUrl", msg->http.info.request.url); break; case HTTP_MSG_RESPONSE: - ASSOC_PROP(obj, double, "httpVersion", msg->info.response.http_version); - ASSOC_PROP(obj, long, "responseCode", msg->info.response.code); - ASSOC_STRING(obj, "requestMethod", ""); - ASSOC_STRING(obj, "requestUri", ""); + ASSOC_PROP(array, long, "responseCode", msg->http.info.response.code); + ASSOC_STRING(array, "responseStatus", msg->http.info.response.status); + ASSOC_STRINGL(array, "requestMethod", "", 0); + ASSOC_STRINGL(array, "requestUrl", "", 0); break; case HTTP_MSG_NONE: default: - ASSOC_PROP(obj, double, "httpVersion", 0.0); - ASSOC_PROP(obj, long, "responseCode", 0); - ASSOC_STRING(obj, "requestMethod", ""); - ASSOC_STRING(obj, "requestUri", ""); + ASSOC_PROP(array, long, "responseCode", 0); + ASSOC_STRINGL(array, "responseStatus", "", 0); + ASSOC_STRINGL(array, "requestMethod", "", 0); + ASSOC_STRINGL(array, "requestUrl", "", 0); break; } + MAKE_STD_ZVAL(headers); + array_init(headers); + zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + ASSOC_PROP(array, zval, "headers", headers); + ASSOC_STRINGL(array, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg)); + return OBJ_PROP(obj); } @@ -485,53 +565,86 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) /* {{{ proto void HttpMessage::__construct([string message]) * * Instantiate a new HttpMessage object. + * + * Accepts an optional string parameter containing a single or several + * consecutive HTTP messages. The constructed object will actually + * represent the *last* message of the passed string. If there were + * prior messages, those can be accessed by HttpMessage::getParentMessage(). + * + * Throws HttpMalformedHeaderException. */ 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(); } /* }}} */ -/* {{{ proto static HttpMessage HttpMessage::fromString(string raw_message) +/* {{{ proto static HttpMessage HttpMessage::fromString(string raw_message[, string class_name = "HttpMessage"]) * - * Create an HttpMessage object from a string. + * Create an HttpMessage object from a string. Kind of a static constructor. + * + * Expects a string parameter containing a sinlge or several consecutive + * HTTP messages. Accepts an optionsl string parameter specifying the class to use. + * + * Returns an HttpMessage object on success or NULL on failure. + * + * Throws HttpMalformedHeadersException. */ PHP_METHOD(HttpMessage, fromString) { - char *string = NULL; - int length = 0; + char *string = NULL, *class_name = NULL; + int length = 0, class_length = 0; http_message *msg = NULL; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &length)) { - RETURN_NULL(); - } - - if (!(msg = http_message_parse(string, length))) { - RETURN_NULL(); + RETVAL_NULL(); + + SET_EH_THROW_HTTP(); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &string, &length, &class_name, &class_length)) { + if ((msg = http_message_parse(string, length))) { + zend_class_entry *ce = http_message_object_ce; + + if (class_name && *class_name) { + ce = zend_fetch_class(class_name, class_length, ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC); + if (ce && !instanceof_function(ce, http_message_object_ce TSRMLS_CC)) { + http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Class %s does not extend HttpMessage", class_name); + ce = NULL; + } + } + if (ce) { + RETVAL_OBJVAL(http_message_object_new_ex(ce, msg, NULL), 0); + } + } } - - Z_TYPE_P(return_value) = IS_OBJECT; - return_value->value.obj = http_message_object_from_msg(msg); + SET_EH_NORMAL(); } /* }}} */ /* {{{ proto string HttpMessage::getBody() * - * Get the body of the parsed Message. + * Get the body of the parsed HttpMessage. + * + * Returns the message body as string. */ PHP_METHOD(HttpMessage, getBody) { @@ -544,9 +657,31 @@ PHP_METHOD(HttpMessage, getBody) } /* }}} */ +/* {{{ proto void HttpMessage::setBody(string body) + * + * Set the body of the HttpMessage. + * NOTE: Don't forget to update any headers accordingly. + * + * Expects a string parameter containing the new body of the message. + */ +PHP_METHOD(HttpMessage, setBody) +{ + char *body; + int len; + getObject(http_message_object, obj); + + 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); + } +} +/* }}} */ + /* {{{ proto array HttpMessage::getHeaders() * * Get Message Headers. + * + * Returns an associative array containing the messages HTTP headers. */ PHP_METHOD(HttpMessage, getHeaders) { @@ -556,7 +691,7 @@ PHP_METHOD(HttpMessage, getHeaders) zval headers; getObject(http_message_object, obj); - Z_ARRVAL(headers) = &obj->message->hdrs; + INIT_ZARR(headers, &obj->message->hdrs); array_init(return_value); array_copy(&headers, return_value); } @@ -566,6 +701,9 @@ PHP_METHOD(HttpMessage, getHeaders) /* {{{ proto void HttpMessage::setHeaders(array headers) * * Sets new headers. + * + * Expects an associative array as parameter containing the new HTTP headers, + * which will replace *all* previous HTTP headers of the message. */ PHP_METHOD(HttpMessage, setHeaders) { @@ -577,7 +715,7 @@ PHP_METHOD(HttpMessage, setHeaders) } zend_hash_clean(&obj->message->hdrs); - Z_ARRVAL(old_headers) = &obj->message->hdrs; + INIT_ZARR(old_headers, &obj->message->hdrs); array_copy(new_headers, &old_headers); } /* }}} */ @@ -585,6 +723,12 @@ PHP_METHOD(HttpMessage, setHeaders) /* {{{ proto void HttpMessage::addHeaders(array headers[, bool append = false]) * * Add headers. If append is true, headers with the same name will be separated, else overwritten. + * + * Expects an associative array as parameter containing the additional HTTP headers + * to add to the messages existing headers. If the optional bool parameter is true, + * and a header with the same name of one to add exists already, this respective + * header will be converted to an array containing both header values, otherwise + * it will be overwritten with the new header value. */ PHP_METHOD(HttpMessage, addHeaders) { @@ -596,7 +740,7 @@ PHP_METHOD(HttpMessage, addHeaders) return; } - Z_ARRVAL(old_headers) = &obj->message->hdrs; + INIT_ZARR(old_headers, &obj->message->hdrs); if (append) { array_append(new_headers, &old_headers); } else { @@ -605,9 +749,11 @@ PHP_METHOD(HttpMessage, addHeaders) } /* }}} */ -/* {{{ proto long HttpMessage::getType() +/* {{{ proto int HttpMessage::getType() * * Get Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE) + * + * Returns the HttpMessage::TYPE. */ PHP_METHOD(HttpMessage, getType) { @@ -620,9 +766,11 @@ PHP_METHOD(HttpMessage, getType) } /* }}} */ -/* {{{ proto void HttpMessage::setType(long type) +/* {{{ proto void HttpMessage::setType(int type) * * Set Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE) + * + * Exptects an int parameter, the HttpMessage::TYPE. */ PHP_METHOD(HttpMessage, setType) { @@ -636,9 +784,12 @@ PHP_METHOD(HttpMessage, setType) } /* }}} */ -/* {{{ proto long HttpMessage::getResponseCode() +/* {{{ proto int HttpMessage::getResponseCode() * * Get the Response Code of the Message. + * + * Returns the HTTP response code if the message is of type + * HttpMessage::TYPE_RESPONSE, else FALSE. */ PHP_METHOD(HttpMessage, getResponseCode) { @@ -646,42 +797,37 @@ PHP_METHOD(HttpMessage, getResponseCode) IF_RETVAL_USED { getObject(http_message_object, obj); - - if (!HTTP_MSG_TYPE(RESPONSE, obj->message)) { - http_error(E_NOTICE, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_RESPONSE"); - RETURN_NULL(); - } - - RETURN_LONG(obj->message->info.response.code); + HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE); + RETURN_LONG(obj->message->http.info.response.code); } } /* }}} */ -/* {{{ proto bool HttpMessage::setResponseCode(long code) +/* {{{ proto bool HttpMessage::setResponseCode(int code) * * Set the response code of an HTTP Response Message. - * Returns false if the Message is not of type HTTP_MSG_RESPONSE, - * or if the response code is out of range (100-510). + * + * Expects an int parameter with the HTTP response code. + * + * Returns TRUE on success, or FALSE if the message is not of type + * HttpMessage::TYPE_RESPONSE or the response code is out of range (100-510). */ PHP_METHOD(HttpMessage, setResponseCode) { long code; getObject(http_message_object, obj); - if (!HTTP_MSG_TYPE(RESPONSE, obj->message)) { - http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_RESPONSE"); - RETURN_FALSE; - } + HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) { RETURN_FALSE; } if (code < 100 || code > 510) { - http_error_ex(E_WARNING, HTTP_E_PARAM, "Invalid response code (100-510): %ld", code); + http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid response code (100-510): %ld", code); RETURN_FALSE; } - obj->message->info.response.code = code; + obj->message->http.info.response.code = code; RETURN_TRUE; } /* }}} */ @@ -689,7 +835,9 @@ PHP_METHOD(HttpMessage, setResponseCode) /* {{{ proto string HttpMessage::getRequestMethod() * * Get the Request Method of the Message. - * Returns false if the Message is not of type HTTP_MSG_REQUEST. + * + * Returns the request method name on success, or FALSE if the message is + * not of type HttpMessage::TYPE_REQUEST. */ PHP_METHOD(HttpMessage, getRequestMethod) { @@ -697,13 +845,8 @@ PHP_METHOD(HttpMessage, getRequestMethod) IF_RETVAL_USED { getObject(http_message_object, obj); - - if (!HTTP_MSG_TYPE(REQUEST, obj->message)) { - http_error(E_NOTICE, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST"); - RETURN_NULL(); - } - - RETURN_STRING(obj->message->info.request.method, 1); + HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE); + RETURN_STRING(obj->message->http.info.request.method, 1); } } /* }}} */ @@ -711,7 +854,11 @@ PHP_METHOD(HttpMessage, getRequestMethod) /* {{{ proto bool HttpMessage::setRequestMethod(string method) * * Set the Request Method of the HTTP Message. - * Returns false if the Message is not of type HTTP_MSG_REQUEST. + * + * Expects a string parameter containing the request method name. + * + * Returns TRUE on success, or FALSE if the message is not of type + * HttpMessage::TYPE_REQUEST or an invalid request method was supplied. */ PHP_METHOD(HttpMessage, setRequestMethod) { @@ -719,74 +866,69 @@ PHP_METHOD(HttpMessage, setRequestMethod) int method_len; getObject(http_message_object, obj); - if (!HTTP_MSG_TYPE(REQUEST, obj->message)) { - http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST"); - RETURN_FALSE; - } + HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len)) { RETURN_FALSE; } if (method_len < 1) { - http_error(E_WARNING, HTTP_E_PARAM, "Cannot set HttpMessage::requestMethod to an empty string"); + http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Cannot set HttpMessage::requestMethod to an empty string"); RETURN_FALSE; } if (SUCCESS != http_check_method(method)) { - http_error_ex(E_WARNING, HTTP_E_PARAM, "Unkown request method: %s", method); + http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unkown request method: %s", method); RETURN_FALSE; } - STR_SET(obj->message->info.request.method, estrndup(method, method_len)); + STR_SET(obj->message->http.info.request.method, estrndup(method, method_len)); RETURN_TRUE; } /* }}} */ -/* {{{ proto string HttpMessage::getRequestUri() +/* {{{ proto string HttpMessage::getRequestUrl() * - * Get the Request URI of the Message. + * Get the Request URL of the Message. + * + * Returns the request url as string on success, or FALSE if the message + * is not of type HttpMessage::TYPE_REQUEST. */ -PHP_METHOD(HttpMessage, getRequestUri) +PHP_METHOD(HttpMessage, getRequestUrl) { NO_ARGS; IF_RETVAL_USED { getObject(http_message_object, obj); - - if (!HTTP_MSG_TYPE(REQUEST, obj->message)) { - http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST"); - RETURN_NULL(); - } - - RETURN_STRING(obj->message->info.request.URI, 1); + HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE); + RETURN_STRING(obj->message->http.info.request.url, 1); } } /* }}} */ -/* {{{ proto bool HttpMessage::setRequestUri(string URI) +/* {{{ proto bool HttpMessage::setRequestUrl(string url) * - * Set the Request URI of the HTTP Message. - * Returns false if the Message is not of type HTTP_MSG_REQUEST, - * or if paramtere URI was empty. + * Set the Request URL of the HTTP Message. + * + * Expects a string parameters containing the request url. + * + * Returns TRUE on success, or FALSE if the message is not of type + * HttpMessage::TYPE_REQUEST or supplied URL was empty. */ -PHP_METHOD(HttpMessage, setRequestUri) +PHP_METHOD(HttpMessage, setRequestUrl) { char *URI; int URIlen; getObject(http_message_object, obj); - if (!HTTP_MSG_TYPE(REQUEST, obj->message)) { - http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST"); - RETURN_FALSE; - } if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &URI, &URIlen)) { RETURN_FALSE; } + HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE); if (URIlen < 1) { - http_error(E_WARNING, HTTP_E_PARAM, "Cannot set HttpMessage::requestUri to an empty string"); + http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Cannot set HttpMessage::requestUrl to an empty string"); RETURN_FALSE; } - STR_SET(obj->message->info.request.URI, estrndup(URI, URIlen)); + STR_SET(obj->message->http.info.request.url, estrndup(URI, URIlen)); RETURN_TRUE; } /* }}} */ @@ -794,6 +936,8 @@ PHP_METHOD(HttpMessage, setRequestUri) /* {{{ proto string HttpMessage::getHttpVersion() * * Get the HTTP Protocol Version of the Message. + * + * Returns the HTTP protocol version as string. */ PHP_METHOD(HttpMessage, getHttpVersion) { @@ -801,24 +945,9 @@ PHP_METHOD(HttpMessage, getHttpVersion) IF_RETVAL_USED { char ver[4] = {0}; - double version; getObject(http_message_object, obj); - switch (obj->message->type) - { - case HTTP_MSG_RESPONSE: - version = obj->message->info.response.http_version; - break; - - case HTTP_MSG_REQUEST: - version = obj->message->info.request.http_version; - break; - - case HTTP_MSG_NONE: - default: - RETURN_NULL(); - } - sprintf(ver, "%1.1lf", version); + sprintf(ver, "%1.1lf", obj->message->http.version); RETURN_STRINGL(ver, 3, 1); } } @@ -827,7 +956,10 @@ PHP_METHOD(HttpMessage, getHttpVersion) /* {{{ proto bool HttpMessage::setHttpVersion(string version) * * Set the HTTP Protocol version of the Message. - * Returns false if version is invalid (1.0 and 1.1). + * + * Expects a string parameter containing the HTTP protocol version. + * + * Returns TRUE on success, or FALSE if supplied version is out of range (1.0/1.1). */ PHP_METHOD(HttpMessage, setHttpVersion) { @@ -839,23 +971,14 @@ PHP_METHOD(HttpMessage, setHttpVersion) return; } - if (HTTP_MSG_TYPE(NONE, obj->message)) { - http_error(E_WARNING, HTTP_E_MSG, "Message is neither of type HTTP_MSG_RESPONSE nor HTTP_MSG_REQUEST"); - RETURN_FALSE; - } - convert_to_double(zv); sprintf(v, "%1.1lf", Z_DVAL_P(zv)); if (strcmp(v, "1.0") && strcmp(v, "1.1")) { - http_error_ex(E_WARNING, HTTP_E_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): %s", v); RETURN_FALSE; } - if (HTTP_MSG_TYPE(RESPONSE, obj->message)) { - obj->message->info.response.http_version = Z_DVAL_P(zv); - } else { - obj->message->info.request.http_version = Z_DVAL_P(zv); - } + obj->message->http.version = Z_DVAL_P(zv); RETURN_TRUE; } /* }}} */ @@ -863,6 +986,8 @@ PHP_METHOD(HttpMessage, setHttpVersion) /* {{{ proto HttpMessage HttpMessage::getParentMessage() * * Get parent Message. + * + * Returns the parent HttpMessage on success, or NULL if there's none. */ PHP_METHOD(HttpMessage, getParentMessage) { @@ -872,7 +997,7 @@ PHP_METHOD(HttpMessage, getParentMessage) getObject(http_message_object, obj); if (obj->message->parent) { - RETVAL_OBJVAL(obj->parent); + RETVAL_OBJVAL(obj->parent, 1); } else { RETVAL_NULL(); } @@ -883,6 +1008,9 @@ PHP_METHOD(HttpMessage, getParentMessage) /* {{{ proto bool HttpMessage::send() * * Send the Message according to its type as Response or Request. + * This provides limited functionality compared to HttpRequest and HttpResponse. + * + * Returns TRUE on success, or FALSE on failure. */ PHP_METHOD(HttpMessage, send) { @@ -894,16 +1022,21 @@ PHP_METHOD(HttpMessage, send) } /* }}} */ -/* {{{ proto string HttpMessage::toString([bool include_parent = true]) +/* {{{ proto string HttpMessage::toString([bool include_parent = false]) * * Get the string representation of the Message. + * + * Accepts a bool parameter which specifies whether the returned string + * should also contain any parent messages. + * + * Returns the full message as string. */ PHP_METHOD(HttpMessage, toString) { IF_RETVAL_USED { char *string; size_t length; - zend_bool include_parent = 1; + zend_bool include_parent = 0; getObject(http_message_object, obj); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &include_parent)) { @@ -920,6 +1053,354 @@ PHP_METHOD(HttpMessage, toString) } /* }}} */ +/* {{{ proto HttpRequest|HttpResponse HttpMessage::toMessageTypeObject(void) + * + * Creates an object regarding to the type of the message. + * + * Returns either an HttpRequest or HttpResponse object on success, or NULL on failure. + * + * Throws HttpRuntimeException, HttpMessageTypeException, HttpHeaderException. + */ +PHP_METHOD(HttpMessage, toMessageTypeObject) +{ + SET_EH_THROW_HTTP(); + + NO_ARGS; + + IF_RETVAL_USED { + getObject(http_message_object, obj); + + switch (obj->message->type) + { + case HTTP_MSG_REQUEST: + { +#ifdef HTTP_HAVE_CURL + int method; + char *url; + zval tmp, body, *array, *headers, *host = http_message_header(obj->message, "Host"); + php_url hurl, *purl = php_url_parse(obj->message->http.info.request.url); + + MAKE_STD_ZVAL(array); + array_init(array); + + memset(&hurl, 0, sizeof(php_url)); + hurl.host = host ? Z_STRVAL_P(host) : NULL; + http_build_url(HTTP_URL_REPLACE, purl, &hurl, NULL, &url, NULL); + php_url_free(purl); + add_assoc_string(array, "url", url, 0); + + if ( (method = http_request_method_exists(1, 0, obj->message->http.info.request.method)) || + (method = http_request_method_register(obj->message->http.info.request.method, strlen(obj->message->http.info.request.method)))) { + add_assoc_long(array, "method", method); + } + + if (10 == (int) (obj->message->http.version * 10)) { + add_assoc_long(array, "protocol", CURL_HTTP_VERSION_1_0); + } + + MAKE_STD_ZVAL(headers); + array_init(headers); + INIT_ZARR(tmp, &obj->message->hdrs); + array_copy(&tmp, headers); + add_assoc_zval(array, "headers", headers); + + object_init_ex(return_value, http_request_object_ce); + zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setoptions", NULL, array); + zval_ptr_dtor(&array); + + INIT_PZVAL(&body); + ZVAL_STRINGL(&body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message), 0); + zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setrawpostdata", NULL, &body); +#else + http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot transform HttpMessage to HttpRequest (missing curl support)"); +#endif + } + break; + + case HTTP_MSG_RESPONSE: + { +#ifndef WONKY + HashPosition pos1, pos2; + ulong idx; + uint key_len; + char *key = NULL; + zval **header, **h, *body; + + if (obj->message->http.info.response.code) { + http_send_status(obj->message->http.info.response.code); + } + + object_init_ex(return_value, http_response_object_ce); + + FOREACH_HASH_KEYLENVAL(pos1, &obj->message->hdrs, key, key_len, idx, header) { + if (key) { + zval zkey; + + INIT_PZVAL(&zkey); + ZVAL_STRINGL(&zkey, key, key_len, 0); + + switch (Z_TYPE_PP(header)) + { + case IS_ARRAY: + case IS_OBJECT: + FOREACH_HASH_VAL(pos2, HASH_OF(*header), h) { + ZVAL_ADDREF(*h); + zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, &zkey, *h); + zval_ptr_dtor(h); + } + break; + + default: + ZVAL_ADDREF(*header); + zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, &zkey, *header); + zval_ptr_dtor(header); + break; + } + key = NULL; + } + } + + MAKE_STD_ZVAL(body); + ZVAL_STRINGL(body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message), 1); + zend_call_method_with_1_params(&return_value, http_response_object_ce, NULL, "setdata", NULL, body); + zval_ptr_dtor(&body); +#else + http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot transform HttpMessage to HttpResponse (need PHP 5.1+)"); +#endif + } + break; + + default: + http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is neither of type HttpMessage::TYPE_REQUEST nor HttpMessage::TYPE_RESPONSE"); + break; + } + } + SET_EH_NORMAL(); +} +/* }}} */ + +/* {{{ 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); + } + } +} +/* }}} */ + +/* {{{ proto HttpMessage HttpMessage::detach(void) + * + * Returns a clone of an HttpMessage object detached from any parent messages. + */ +PHP_METHOD(HttpMessage, detach) +{ + http_info info; + http_message *msg; + getObject(http_message_object, obj); + + NO_ARGS; + + info.type = obj->message->type; + memcpy(&HTTP_INFO(&info), &HTTP_INFO(obj->message), sizeof(struct http_info)); + + msg = http_message_new(); + http_message_set_info(msg, &info); + + zend_hash_copy(&msg->hdrs, &obj->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + phpstr_append(&msg->body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message)); + + RETVAL_OBJVAL(http_message_object_new_ex(Z_OBJCE_P(getThis()), msg, NULL), 0); +} +/* }}} */ + +/* {{{ proto void HttpMessage::prepend(HttpMessage message) + * + * Prepends message(s) to the HTTP message. + * + * Expects an HttpMessage object as parameter. + */ +PHP_METHOD(HttpMessage, prepend) +{ + zval *prepend; + zend_bool top = 1; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|b", &prepend, http_message_object_ce, &top)) { + zval m; + http_message *save_parent_msg; + zend_object_value save_parent_obj; + getObject(http_message_object, obj); + getObjectEx(http_message_object, prepend_obj, prepend); + + INIT_PZVAL(&m); + m.type = IS_OBJECT; + + if (!top) { + save_parent_obj = obj->parent; + save_parent_msg = obj->message->parent; + } else { + /* iterate to the most parent object */ + while (obj->parent.handle) { + m.value.obj = obj->parent; + obj = zend_object_store_get_object(&m TSRMLS_CC); + } + } + + /* prepend */ + obj->parent = prepend->value.obj; + obj->message->parent = prepend_obj->message; + + /* add ref */ + zend_objects_store_add_ref(prepend TSRMLS_CC); + while (prepend_obj->parent.handle) { + m.value.obj = prepend_obj->parent; + zend_objects_store_add_ref(&m TSRMLS_CC); + prepend_obj = zend_object_store_get_object(&m TSRMLS_CC); + } + + if (!top) { + prepend_obj->parent = save_parent_obj; + prepend_obj->message->parent = save_parent_msg; + } + } +} +/* }}} */ + +/* {{{ proto void HttpMessage::rewind(void) + * + * Implements Iterator. + */ +PHP_METHOD(HttpMessage, rewind) +{ + NO_ARGS { + getObject(http_message_object, obj); + + if (obj->iterator) { + zval_ptr_dtor(&obj->iterator); + } + ZVAL_ADDREF(getThis()); + obj->iterator = getThis(); + } +} +/* }}} */ + +/* {{{ proto bool HttpMessage::valid(void) + * + * Implements Iterator. + */ +PHP_METHOD(HttpMessage, valid) +{ + NO_ARGS { + getObject(http_message_object, obj); + + RETURN_BOOL(obj->iterator != NULL); + } +} +/* }}} */ + +/* {{{ proto void HttpMessage::next(void) + * + * Implements Iterator. + */ +PHP_METHOD(HttpMessage, next) +{ + NO_ARGS { + getObject(http_message_object, obj); + getObjectEx(http_message_object, itr, obj->iterator); + + if (itr && itr->parent.handle) { + zval *old = obj->iterator; + MAKE_STD_ZVAL(obj->iterator); + ZVAL_OBJVAL(obj->iterator, itr->parent, 1); + zval_ptr_dtor(&old); + } else { + zval_ptr_dtor(&obj->iterator); + obj->iterator = NULL; + } + } +} +/* }}} */ + +/* {{{ proto int HttpMessage::key(void) + * + * Implements Iterator. + */ +PHP_METHOD(HttpMessage, key) +{ + NO_ARGS { + getObject(http_message_object, obj); + + RETURN_LONG(obj->iterator ? obj->iterator->value.obj.handle:0); + } +} +/* }}} */ + +/* {{{ proto HttpMessage HttpMessage::current(void) + * + * Implements Iterator. + */ +PHP_METHOD(HttpMessage, current) +{ + NO_ARGS { + getObject(http_message_object, obj); + + if (obj->iterator) { + RETURN_ZVAL(obj->iterator, 1, 0); + } + } +} +/* }}} */ + #endif /* ZEND_ENGINE_2 */ /*