X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=495cd28759e0f5728713edfae56b7a9a23dba142;hp=aa63cab0b47fc8b98c325a6371a313606912954d;hb=0e0def98a4ea4463bf8c21c6f161b2b37aa8c49d;hpb=960586b99568624a207faa24fe56233582b6d0dc diff --git a/http_message_object.c b/http_message_object.c index aa63cab..495cd28 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -6,101 +6,131 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2005, Michael Wallner | + | Copyright (c) 2004-2006, Michael Wallner | +--------------------------------------------------------------------+ */ /* $Id$ */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - +#define HTTP_WANT_SAPI +#define HTTP_WANT_CURL +#define HTTP_WANT_MAGIC #include "php_http.h" #ifdef ZEND_ENGINE_2 +#include "zend_interfaces.h" +#include "ext/standard/url.h" + #include "php_http_api.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 "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" -# if defined(HAVE_SPL) +#if defined(HTTP_HAVE_SPL) && !defined(WONKY) /* 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) -#define HTTP_MESSAGE_ME(method, visibility) PHP_ME(HttpMessage, method, HTTP_ARGS(HttpMessage, method), visibility) +#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpMessage, method, 0, req_args) +#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpMessage, method, 0) +#define HTTP_MESSAGE_ME(method, visibility) PHP_ME(HttpMessage, method, HTTP_ARGS(HttpMessage, method), visibility) -HTTP_BEGIN_ARGS(__construct, 0, 0) +HTTP_BEGIN_ARGS(__construct, 0) HTTP_ARG_VAL(message, 0) HTTP_END_ARGS; -HTTP_BEGIN_ARGS(fromString, 1, 1) +HTTP_BEGIN_ARGS(fromString, 1) HTTP_ARG_VAL(message, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getBody, 0); -HTTP_BEGIN_ARGS(setBody, 0, 1) +HTTP_EMPTY_ARGS(getBody); +HTTP_BEGIN_ARGS(setBody, 1) HTTP_ARG_VAL(body, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getHeaders, 0); -HTTP_BEGIN_ARGS(setHeaders, 0, 1) +HTTP_BEGIN_ARGS(getHeader, 1) + HTTP_ARG_VAL(header, 0) +HTTP_END_ARGS; + +HTTP_EMPTY_ARGS(getHeaders); +HTTP_BEGIN_ARGS(setHeaders, 1) HTTP_ARG_VAL(headers, 0) HTTP_END_ARGS; -HTTP_BEGIN_ARGS(addHeaders, 0, 1) +HTTP_BEGIN_ARGS(addHeaders, 1) HTTP_ARG_VAL(headers, 0) HTTP_ARG_VAL(append, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getType, 0); -HTTP_BEGIN_ARGS(setType, 0, 1) +HTTP_EMPTY_ARGS(getType); +HTTP_BEGIN_ARGS(setType, 1) HTTP_ARG_VAL(type, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getResponseCode, 0); -HTTP_BEGIN_ARGS(setResponseCode, 0, 1) +HTTP_EMPTY_ARGS(getResponseCode); +HTTP_BEGIN_ARGS(setResponseCode, 1) HTTP_ARG_VAL(response_code, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getRequestMethod, 0); -HTTP_BEGIN_ARGS(setRequestMethod, 0, 1) +HTTP_EMPTY_ARGS(getResponseStatus); +HTTP_BEGIN_ARGS(setResponseStatus, 1) + HTTP_ARG_VAL(response_status, 0) +HTTP_END_ARGS; + +HTTP_EMPTY_ARGS(getRequestMethod); +HTTP_BEGIN_ARGS(setRequestMethod, 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); +HTTP_BEGIN_ARGS(setRequestUrl, 1) + HTTP_ARG_VAL(url, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getHttpVersion, 0); -HTTP_BEGIN_ARGS(setHttpVersion, 0, 1) +HTTP_EMPTY_ARGS(getHttpVersion); +HTTP_BEGIN_ARGS(setHttpVersion, 1) HTTP_ARG_VAL(http_version, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getParentMessage, 1); -HTTP_EMPTY_ARGS(send, 0); -HTTP_BEGIN_ARGS(toString, 0, 0) +HTTP_BEGIN_ARGS(guessContentType, 1) + HTTP_ARG_VAL(magic_file, 0) + HTTP_ARG_VAL(magic_mode, 0) +HTTP_END_ARGS; + +HTTP_EMPTY_ARGS(getParentMessage); +HTTP_EMPTY_ARGS(send); +HTTP_BEGIN_ARGS(toString, 0) HTTP_ARG_VAL(include_parent, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(count, 0); +HTTP_EMPTY_ARGS(toMessageTypeObject); + +HTTP_EMPTY_ARGS(count); -HTTP_EMPTY_ARGS(serialize, 0); -HTTP_BEGIN_ARGS(unserialize, 0, 1) +HTTP_EMPTY_ARGS(serialize); +HTTP_BEGIN_ARGS(unserialize, 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); +HTTP_EMPTY_ARGS(rewind); +HTTP_EMPTY_ARGS(valid); +HTTP_EMPTY_ARGS(key); +HTTP_EMPTY_ARGS(current); +HTTP_EMPTY_ARGS(next); + +HTTP_EMPTY_ARGS(detach); +HTTP_BEGIN_ARGS(prepend, 1) + HTTP_ARG_OBJ(HttpMessage, message, 0) +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); #define http_message_object_write_prop _http_message_object_write_prop @@ -108,11 +138,13 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va #define http_message_object_get_props _http_message_object_get_props static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC); +#define OBJ_PROP_CE http_message_object_ce 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(getHeader, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(getHeaders, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(setHeaders, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(addHeaders, ZEND_ACC_PUBLIC) @@ -120,15 +152,19 @@ zend_function_entry http_message_object_fe[] = { HTTP_MESSAGE_ME(setType, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(getResponseCode, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(setResponseCode, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(getResponseStatus, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(setResponseStatus, 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(guessContentType, 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) @@ -137,10 +173,21 @@ zend_function_entry http_message_object_fe[] = { 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) + HTTP_MESSAGE_ME(detach, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(prepend, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(reverse, ZEND_ACC_PUBLIC) + EMPTY_FUNCTION_ENTRY }; static zend_object_handlers http_message_object_handlers; @@ -148,27 +195,136 @@ 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); +# ifdef HTTP_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, 1, zend_ce_serializable); + 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.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; + DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE); + DCL_PROP(PROTECTED, string, body, ""); + DCL_PROP(PROTECTED, string, requestMethod, ""); + DCL_PROP(PROTECTED, string, requestUrl, ""); + DCL_PROP(PROTECTED, string, responseStatus, ""); + DCL_PROP(PROTECTED, long, responseCode, 0); + DCL_PROP_N(PROTECTED, httpVersion); + DCL_PROP_N(PROTECTED, headers); + DCL_PROP_N(PROTECTED, parentMessage); + +#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 + + 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); + return SUCCESS; } +void _http_message_object_reverse(zval *this_ptr, zval *return_value TSRMLS_DC) +{ + int i; + getObject(http_message_object, obj); + + /* count */ + http_message_count(i, obj->message); + + if (i > 1) { + zval o; + zend_object_value *ovalues = NULL; + http_message_object **objects = NULL; + int last = i - 1; + + objects = ecalloc(i, sizeof(http_message_object *)); + ovalues = ecalloc(i, sizeof(zend_object_value)); + + /* we are the first message */ + objects[0] = obj; + ovalues[0] = getThis()->value.obj; + + /* fetch parents */ + INIT_PZVAL(&o); + o.type = IS_OBJECT; + for (i = 1; obj->parent.handle; ++i) { + o.value.obj = obj->parent; + ovalues[i] = o.value.obj; + objects[i] = obj = zend_object_store_get_object(&o TSRMLS_CC); + } + + /* reorder parents */ + for (last = --i; i; --i) { + objects[i]->message->parent = objects[i-1]->message; + objects[i]->parent = ovalues[i-1]; + } + objects[0]->message->parent = NULL; + objects[0]->parent.handle = 0; + objects[0]->parent.handlers = NULL; + + /* add ref (why?) */ + Z_OBJ_ADDREF_P(getThis()); + RETVAL_OBJVAL(ovalues[last], 1); + + efree(objects); + efree(ovalues); + } else { + RETURN_ZVAL(getThis(), 1, 0); + } +} + +void _http_message_object_prepend_ex(zval *this_ptr, zval *prepend, zend_bool top TSRMLS_DC) +{ + zval m; + http_message *save_parent_msg = NULL; + zend_object_value save_parent_obj = {0, NULL}; + 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; + } +} + zend_object_value _http_message_object_new(zend_class_entry *ce TSRMLS_DC) { return http_message_object_new_ex(ce, NULL, NULL); @@ -194,7 +350,8 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message } ALLOC_HASHTABLE(OBJ_PROP(o)); - zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0); + zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); + zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); ov.handle = putObject(http_message_object, o); ov.handlers = &http_message_object_handlers; @@ -204,43 +361,33 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message zend_object_value _http_message_object_clone_obj(zval *this_ptr TSRMLS_DC) { - 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, long, responseCode, 0); - DCL_PROP_N(PROTECTED, httpVersion); - DCL_PROP_N(PROTECTED, headers); - DCL_PROP_N(PROTECTED, parentMessage); + zend_object_value new_ov; + http_message_object *new_obj = NULL; + getObject(http_message_object, old_obj); + + new_ov = http_message_object_new_ex(old_obj->zo.ce, http_message_dup(old_obj->message), &new_obj); + zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + + return new_ov; } void _http_message_object_free(zend_object *object TSRMLS_DC) { http_message_object *o = (http_message_object *) object; - if (OBJ_PROP(o)) { - zend_hash_destroy(OBJ_PROP(o)); - FREE_HASHTABLE(OBJ_PROP(o)); - } if (o->message) { http_message_dtor(o->message); efree(o->message); } - efree(o); + 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); + } + freeObject(o); } static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC) @@ -276,33 +423,33 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type case HTTP_MSG_PROPHASH_TYPE: case HTTP_MSG_CHILD_PROPHASH_TYPE: RETVAL_LONG(msg->type); - break; + break; case HTTP_MSG_PROPHASH_HTTP_VERSION: case HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION: RETVAL_DOUBLE(msg->http.version); - break; + break; case HTTP_MSG_PROPHASH_BODY: case HTTP_MSG_CHILD_PROPHASH_BODY: phpstr_fix(PHPSTR(msg)); RETVAL_PHPSTR(PHPSTR(msg), 0, 1); - break; + break; case HTTP_MSG_PROPHASH_HEADERS: 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; + break; case HTTP_MSG_PROPHASH_PARENT_MESSAGE: case HTTP_MSG_CHILD_PROPHASH_PARENT_MESSAGE: if (msg->parent) { - RETVAL_OBJVAL(obj->parent); + RETVAL_OBJVAL(obj->parent, 1); } else { RETVAL_NULL(); } - break; + break; case HTTP_MSG_PROPHASH_REQUEST_METHOD: case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD: @@ -311,16 +458,16 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type } else { RETVAL_NULL(); } - break; + 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); + 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; + break; case HTTP_MSG_PROPHASH_RESPONSE_CODE: case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE: @@ -329,7 +476,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type } else { RETVAL_NULL(); } - break; + break; case HTTP_MSG_PROPHASH_RESPONSE_STATUS: case HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS: @@ -338,7 +485,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type } else { RETVAL_NULL(); } - break; + break; default: #ifdef WONKY @@ -346,7 +493,6 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type #else RETVAL_NULL(); #endif - break; } return return_value; @@ -380,27 +526,27 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va case HTTP_MSG_CHILD_PROPHASH_TYPE: convert_to_long(cpy); http_message_set_type(msg, Z_LVAL_P(cpy)); - break; + break; case HTTP_MSG_PROPHASH_HTTP_VERSION: case HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION: convert_to_double(cpy); msg->http.version = Z_DVAL_P(cpy); - break; + break; case HTTP_MSG_PROPHASH_BODY: case HTTP_MSG_CHILD_PROPHASH_BODY: convert_to_string(cpy); phpstr_dtor(PHPSTR(msg)); phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)); - break; + break; case HTTP_MSG_PROPHASH_HEADERS: case HTTP_MSG_CHILD_PROPHASH_HEADERS: convert_to_array(cpy); zend_hash_clean(&msg->hdrs); zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(cpy), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - break; + break; case HTTP_MSG_PROPHASH_PARENT_MESSAGE: case HTTP_MSG_CHILD_PROPHASH_PARENT_MESSAGE: @@ -413,7 +559,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va Z_OBJ_ADDREF_P(value); obj->parent = value->value.obj; } - break; + break; case HTTP_MSG_PROPHASH_REQUEST_METHOD: case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD: @@ -421,15 +567,15 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va convert_to_string(cpy); STR_SET(msg->http.info.request.method, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); } - break; + break; - case HTTP_MSG_PROPHASH_REQUEST_URI: - case HTTP_MSG_CHILD_PROPHASH_REQUEST_URI: + case HTTP_MSG_PROPHASH_REQUEST_URL: + case HTTP_MSG_CHILD_PROPHASH_REQUEST_URL: if (HTTP_MSG_TYPE(REQUEST, msg)) { convert_to_string(cpy); - STR_SET(msg->http.info.request.URI, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); + STR_SET(msg->http.info.request.url, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); } - break; + break; case HTTP_MSG_PROPHASH_RESPONSE_CODE: case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE: @@ -437,7 +583,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va convert_to_long(cpy); msg->http.info.response.code = Z_LVAL_P(cpy); } - break; + break; case HTTP_MSG_PROPHASH_RESPONSE_STATUS: case HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS: @@ -445,13 +591,13 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va convert_to_string(cpy); STR_SET(msg->http.info.response.status, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); } - break; + break; default: #ifdef WONKY zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC); #endif - break; + break; } zval_free(&cpy); } @@ -462,7 +608,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) getObjectEx(http_message_object, obj, object); http_message *msg = obj->message; HashTable *props = OBJ_PROP(obj); - zval array; + zval array, *parent; INIT_ZARR(array, props); @@ -487,29 +633,28 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) ASSOC_PROP(array, long, "type", msg->type); ASSOC_PROP(array, double, "httpVersion", msg->http.version); - switch (msg->type) - { + switch (msg->type) { case HTTP_MSG_REQUEST: ASSOC_PROP(array, long, "responseCode", 0); ASSOC_STRINGL(array, "responseStatus", "", 0); - ASSOC_STRING(array, "requestMethod", msg->http.info.request.method); - ASSOC_STRING(array, "requestUri", msg->http.info.request.URI); - break; + ASSOC_STRING(array, "requestMethod", STR_PTR(msg->http.info.request.method)); + ASSOC_STRING(array, "requestUrl", STR_PTR(msg->http.info.request.url)); + break; case HTTP_MSG_RESPONSE: ASSOC_PROP(array, long, "responseCode", msg->http.info.response.code); - ASSOC_STRING(array, "responseStatus", msg->http.info.response.status); + ASSOC_STRING(array, "responseStatus", STR_PTR(msg->http.info.response.status)); ASSOC_STRINGL(array, "requestMethod", "", 0); - ASSOC_STRINGL(array, "requestUri", "", 0); - break; + ASSOC_STRINGL(array, "requestUrl", "", 0); + break; case HTTP_MSG_NONE: default: ASSOC_PROP(array, long, "responseCode", 0); ASSOC_STRINGL(array, "responseStatus", "", 0); ASSOC_STRINGL(array, "requestMethod", "", 0); - ASSOC_STRINGL(array, "requestUri", "", 0); - break; + ASSOC_STRINGL(array, "requestUrl", "", 0); + break; } MAKE_STD_ZVAL(headers); @@ -517,6 +662,14 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) 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)); + + MAKE_STD_ZVAL(parent); + if (msg->parent) { + ZVAL_OBJVAL(parent, obj->parent, 1); + } else { + ZVAL_NULL(parent); + } + ASSOC_PROP(array, zval, "parentMessage", parent); return OBJ_PROP(obj); } @@ -561,12 +714,12 @@ PHP_METHOD(HttpMessage, __construct) } /* }}} */ -/* {{{ 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. Kind of a static constructor. * - * Expects a string parameter containing a sinlge or several consecutive - * HTTP messages. + * Expects a string parameter containing a single or several consecutive + * HTTP messages. Accepts an optional string parameter specifying the class to use. * * Returns an HttpMessage object on success or NULL on failure. * @@ -574,16 +727,27 @@ PHP_METHOD(HttpMessage, __construct) */ 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; RETVAL_NULL(); SET_EH_THROW_HTTP(); - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &length)) { + 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))) { - ZVAL_OBJVAL(return_value, http_message_object_new_ex(http_message_object_ce, msg, NULL)); + 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); + } } } SET_EH_NORMAL(); @@ -600,7 +764,7 @@ PHP_METHOD(HttpMessage, getBody) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { getObject(http_message_object, obj); RETURN_PHPSTR(&obj->message->body, PHPSTR_FREE_NOT, 1); } @@ -627,6 +791,31 @@ PHP_METHOD(HttpMessage, setBody) } /* }}} */ +/* {{{ proto string HttpMessage::getHeader(string header) + * + * Get message header. + * + * Returns the header value on success or NULL if the header does not exist. + */ +PHP_METHOD(HttpMessage, getHeader) +{ + zval *header; + char *orig_header, *nice_header; + int header_len; + getObject(http_message_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &orig_header, &header_len)) { + RETURN_FALSE; + } + + nice_header = pretty_key(estrndup(orig_header, header_len), header_len, 1, 1); + if ((header = http_message_header_ex(obj->message, nice_header, header_len + 1, 0))) { + RETVAL_ZVAL(header, 1, 1); + } + efree(nice_header); +} +/* }}} */ + /* {{{ proto array HttpMessage::getHeaders() * * Get Message Headers. @@ -637,13 +826,11 @@ PHP_METHOD(HttpMessage, getHeaders) { NO_ARGS; - IF_RETVAL_USED { - zval headers; + if (return_value_used) { getObject(http_message_object, obj); - INIT_ZARR(headers, &obj->message->hdrs); array_init(return_value); - array_copy(&headers, return_value); + array_copy(&obj->message->hdrs, Z_ARRVAL_P(return_value)); } } /* }}} */ @@ -657,16 +844,17 @@ PHP_METHOD(HttpMessage, getHeaders) */ PHP_METHOD(HttpMessage, setHeaders) { - zval *new_headers, old_headers; + zval *new_headers = NULL; getObject(http_message_object, obj); - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &new_headers)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!", &new_headers)) { return; } zend_hash_clean(&obj->message->hdrs); - INIT_ZARR(old_headers, &obj->message->hdrs); - array_copy(new_headers, &old_headers); + if (new_headers) { + array_copy(Z_ARRVAL_P(new_headers), &obj->message->hdrs); + } } /* }}} */ @@ -682,7 +870,7 @@ PHP_METHOD(HttpMessage, setHeaders) */ PHP_METHOD(HttpMessage, addHeaders) { - zval old_headers, *new_headers; + zval *new_headers; zend_bool append = 0; getObject(http_message_object, obj); @@ -690,12 +878,7 @@ PHP_METHOD(HttpMessage, addHeaders) return; } - INIT_ZARR(old_headers, &obj->message->hdrs); - if (append) { - array_append(new_headers, &old_headers); - } else { - array_merge(new_headers, &old_headers); - } + array_join(Z_ARRVAL_P(new_headers), &obj->message->hdrs, append, ARRAY_JOIN_STRONLY|ARRAY_JOIN_PRETTIFY); } /* }}} */ @@ -709,7 +892,7 @@ PHP_METHOD(HttpMessage, getType) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { getObject(http_message_object, obj); RETURN_LONG(obj->message->type); } @@ -720,7 +903,7 @@ PHP_METHOD(HttpMessage, getType) * * Set Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE) * - * Exptects an int parameter, the HttpMessage::TYPE. + * Expects an int parameter, the HttpMessage::TYPE. */ PHP_METHOD(HttpMessage, setType) { @@ -745,7 +928,7 @@ PHP_METHOD(HttpMessage, getResponseCode) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { getObject(http_message_object, obj); HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE); RETURN_LONG(obj->message->http.info.response.code); @@ -782,6 +965,50 @@ PHP_METHOD(HttpMessage, setResponseCode) } /* }}} */ +/* {{{ proto string HttpMessage::getResponseStatus() + * + * Get the Response Status of the message (i.e. the string following the response code). + * + * Returns the HTTP response status string if the message is of type + * HttpMessage::TYPE_RESPONSE, else FALSE. + */ +PHP_METHOD(HttpMessage, getResponseStatus) +{ + NO_ARGS; + + if (return_value_used) { + getObject(http_message_object, obj); + HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE); + RETURN_STRING(obj->message->http.info.response.status, 1); + } +} +/* }}} */ + +/* {{{ proto bool HttpMessage::setResponseStatus(string status) + * + * Set the Response Status of the HTTP message (i.e. the string following the response code). + * + * Expects a string parameter containing the response status text. + * + * Returns TRUE on success or FALSE if the message is not of type + * HttpMessage::TYPE_RESPONSE. + */ +PHP_METHOD(HttpMessage, setResponseStatus) +{ + char *status; + int status_len; + getObject(http_message_object, obj); + + HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE); + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len)) { + RETURN_FALSE; + } + STR_SET(obj->message->http.info.response.status, estrdup(status)); + RETURN_TRUE; +} +/* }}} */ + /* {{{ proto string HttpMessage::getRequestMethod() * * Get the Request Method of the Message. @@ -793,7 +1020,7 @@ PHP_METHOD(HttpMessage, getRequestMethod) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { getObject(http_message_object, obj); HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE); RETURN_STRING(obj->message->http.info.request.method, 1); @@ -825,8 +1052,8 @@ PHP_METHOD(HttpMessage, setRequestMethod) 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(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unkown request method: %s", method); + if (!http_request_method_exists(1, 0, method)) { + http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unknown request method: %s", method); RETURN_FALSE; } @@ -835,35 +1062,35 @@ PHP_METHOD(HttpMessage, setRequestMethod) } /* }}} */ -/* {{{ 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 uri as string on success, or FALSE if 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 { + if (return_value_used) { getObject(http_message_object, obj); HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE); - RETURN_STRING(obj->message->http.info.request.URI, 1); + 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. + * Set the Request URL of the HTTP Message. * - * Expects a string parameters containing the request uri. + * 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 URI was empty. + * HttpMessage::TYPE_REQUEST or supplied URL was empty. */ -PHP_METHOD(HttpMessage, setRequestUri) +PHP_METHOD(HttpMessage, setRequestUrl) { char *URI; int URIlen; @@ -874,11 +1101,11 @@ PHP_METHOD(HttpMessage, setRequestUri) } HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE); if (URIlen < 1) { - http_error(HE_WARNING, HTTP_E_INVALID_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->http.info.request.URI, estrndup(URI, URIlen)); + STR_SET(obj->message->http.info.request.url, estrndup(URI, URIlen)); RETURN_TRUE; } /* }}} */ @@ -893,7 +1120,7 @@ PHP_METHOD(HttpMessage, getHttpVersion) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { char ver[4] = {0}; getObject(http_message_object, obj); @@ -933,25 +1160,62 @@ PHP_METHOD(HttpMessage, setHttpVersion) } /* }}} */ +/* {{{ proto string HttpMessage::guessContentType(string magic_file[, int magic_mode = MAGIC_MIME]) + * + * Attempts to guess the content type of supplied payload through libmagic. + * + * Expects a string parameter specifying the magic.mime database to use. + * Additionally accepts an optional int parameter, being flags for libmagic. + * + * Returns the guessed content type on success, or FALSE on failure. + * + * Throws HttpRuntimeException, HttpInvalidParamException + * if http.only_exceptions is TRUE. + */ +PHP_METHOD(HttpMessage, guessContentType) +{ +#ifdef HTTP_HAVE_MAGIC + char *magic_file, *ct = NULL; + int magic_file_len; + long magic_mode = MAGIC_MIME; + + RETVAL_FALSE; + SET_EH_THROW_HTTP(); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &magic_file, &magic_file_len, &magic_mode)) { + getObject(http_message_object, obj); + if ((ct = http_guess_content_type(magic_file, magic_mode, PHPSTR_VAL(&obj->message->body), PHPSTR_LEN(&obj->message->body), SEND_DATA))) { + RETVAL_STRING(ct, 0); + } + } + SET_EH_NORMAL(); +#else + http_error(HE_THROW, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available"); + RETURN_FALSE; +#endif +} +/* }}} */ + /* {{{ proto HttpMessage HttpMessage::getParentMessage() * * Get parent Message. - * + * * Returns the parent HttpMessage on success, or NULL if there's none. + * + * Throws HttpRuntimeException. */ PHP_METHOD(HttpMessage, getParentMessage) { - NO_ARGS; - - IF_RETVAL_USED { + SET_EH_THROW_HTTP(); + NO_ARGS { getObject(http_message_object, obj); if (obj->message->parent) { - RETVAL_OBJVAL(obj->parent); + RETVAL_OBJVAL(obj->parent, 1); } else { - RETVAL_NULL(); + http_error(HE_WARNING, HTTP_E_RUNTIME, "HttpMessage does not have a parent message"); } } + SET_EH_NORMAL(); } /* }}} */ @@ -983,7 +1247,7 @@ PHP_METHOD(HttpMessage, send) */ PHP_METHOD(HttpMessage, toString) { - IF_RETVAL_USED { + if (return_value_used) { char *string; size_t length; zend_bool include_parent = 0; @@ -1003,6 +1267,128 @@ 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 (return_value_used) { + getObject(http_message_object, obj); + + switch (obj->message->type) { + case HTTP_MSG_REQUEST: + { +#ifdef HTTP_HAVE_CURL + int method; + char *url; + zval 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; + zval_ptr_dtor(&host); + 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); + array_copy(&obj->message->hdrs, Z_ARRVAL_P(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; + HashKey key = initHashKey(0); + 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_KEYVAL(pos1, &obj->message->hdrs, key, header) { + if (key.type == HASH_KEY_IS_STRING) { + zval *zkey; + + MAKE_STD_ZVAL(zkey); + ZVAL_STRINGL(zkey, key.str, key.len - 1, 1); + + 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; + } + zval_ptr_dtor(&zkey); + } + } + + 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. @@ -1013,10 +1399,9 @@ 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); + http_message_count(i, obj->message); RETURN_LONG(i); } } @@ -1063,6 +1448,163 @@ PHP_METHOD(HttpMessage, unserialize) } /* }}} */ +/* {{{ 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[, bool top = true]) + * + * Prepends message(s) to the HTTP message. + * + * Expects an HttpMessage object as parameter. + * + * Throws HttpInvalidParamException if the message is located within the same message chain. + */ +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)) { + http_message *msg[2]; + getObject(http_message_object, obj); + getObjectEx(http_message_object, prepend_obj, prepend); + + /* safety check */ + 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]) { + http_error(HE_THROW, HTTP_E_INVALID_PARAM, "Cannot prepend a message located within the same message chain"); + return; + } + } + } + + http_message_object_prepend_ex(getThis(), prepend, top); + } +} +/* }}} */ + +/* {{{ proto HttpMessage HttpMessage::reverse() + * + * Reorders the message chain in reverse order. + * + * Returns the most parent HttpMessage object. + */ +PHP_METHOD(HttpMessage, reverse) +{ + NO_ARGS { + http_message_object_reverse(getThis(), return_value); + } +} +/* }}} */ + +/* {{{ 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 */ /*