- add flag parameter to http_build_url(); slightly breaks parameter order
[m6w6/ext-http] / http_message_object.c
index a965a66f950a33aefeb987d176c191f6ad5335d9..ae4254a2621810a73074912f3c62d0abde9ff237 100644 (file)
@@ -6,39 +6,39 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 /* $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 "missing.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)
+#      ifdef HAVE_SPL
 /* SPL doesn't install its headers */
 extern PHPAPI zend_class_entry *spl_ce_Countable;
 #      endif
 #endif
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 #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)
@@ -81,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);
@@ -91,12 +91,14 @@ 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);
@@ -104,6 +106,17 @@ 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
@@ -127,13 +140,14 @@ 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)
@@ -142,10 +156,20 @@ 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)
+
        EMPTY_FUNCTION_ENTRY
 };
 static zend_object_handlers http_message_object_handlers;
@@ -155,10 +179,12 @@ 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);
+       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);
@@ -226,7 +252,7 @@ static inline void _http_message_object_declare_default_properties(TSRMLS_D)
        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);
@@ -245,6 +271,14 @@ 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);
 }
 
@@ -303,7 +337,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
                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();
                        }
@@ -318,10 +352,10 @@ 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);
+               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();
                        }
@@ -373,10 +407,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
        }
 #endif
        
-       ALLOC_ZVAL(cpy);
-       *cpy = *value;
-       zval_copy_ctor(cpy);
-       INIT_PZVAL(cpy);
+       cpy = zval_copy(Z_TYPE_P(value), value);
        
 #ifdef WONKY
        switch (h)
@@ -431,11 +462,11 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
                        }
                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;
 
@@ -457,13 +488,11 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
                
                default:
 #ifdef WONKY
-                       zval_ptr_dtor(&cpy);
                        zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
-                       return;
 #endif
                break;
        }
-       zval_ptr_dtor(&cpy);
+       zval_free(&cpy);
 }
 
 static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
@@ -481,7 +510,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
                char *m_prop_name; \
                int m_prop_len; \
                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)+4, val); \
+               add_assoc_ ##ptype## _ex(&array, m_prop_name, sizeof(name)+3, val); \
                efree(m_prop_name); \
        }
 #define ASSOC_STRING(array, name, val) ASSOC_STRINGL(array, name, val, strlen(val))
@@ -490,7 +519,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
                char *m_prop_name; \
                int m_prop_len; \
                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)+4, val, len, 1); \
+               add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+3, val, len, 1); \
                efree(m_prop_name); \
        }
 
@@ -503,14 +532,14 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
                        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);
+                       ASSOC_STRING(array, "requestUrl", 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_STRINGL(array, "requestMethod", "", 0);
-                       ASSOC_STRINGL(array, "requestUri", "", 0);
+                       ASSOC_STRINGL(array, "requestUrl", "", 0);
                break;
 
                case HTTP_MSG_NONE:
@@ -518,7 +547,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
                        ASSOC_PROP(array, long, "responseCode", 0);
                        ASSOC_STRINGL(array, "responseStatus", "", 0);
                        ASSOC_STRINGL(array, "requestMethod", "", 0);
-                       ASSOC_STRINGL(array, "requestUri", "", 0);
+                       ASSOC_STRINGL(array, "requestUrl", "", 0);
                break;
        }
 
@@ -556,7 +585,7 @@ PHP_METHOD(HttpMessage, __construct)
                http_message *msg = obj->message;
                
                http_message_dtor(msg);
-               if (obj->message = http_message_parse_ex(msg, message, length)) {
+               if ((obj->message = http_message_parse_ex(msg, message, length))) {
                        if (obj->message->parent) {
                                obj->parent = http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL);
                        }
@@ -571,12 +600,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.
+ * HTTP messages.  Accepts an optionsl string parameter specifying the class to use.
  * 
  * Returns an HttpMessage object on success or NULL on failure.
  * 
@@ -584,16 +613,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 (msg = http_message_parse(string, length)) {
-                       ZVAL_OBJVAL(return_value, http_message_object_new_ex(http_message_object_ce, msg, NULL));
+       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);
+                       }
                }
        }
        SET_EH_NORMAL();
@@ -845,35 +885,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 {
                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;
@@ -884,11 +924,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;
 }
 /* }}} */
@@ -957,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();
                }
@@ -1013,6 +1053,132 @@ 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.
@@ -1073,6 +1239,168 @@ 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)
+ *
+ * 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 */
 
 /*