- no user debug callbacks any longer

[m6w6/ext-http] / http_message_api.c

diff --git a/http_message_api.c b/http_message_api.c
index a0f5e59ada74c8a79fa40d0ef693dd0b2eb7b117..e4ded1e799ca0204817826e47401436508d52e83 100644 (file)
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -18,8 +18,8 @@
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
-
 #include "php.h"
+
 #include "php_http.h"
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
@@ -94,17 +94,6 @@ static inline void _http_message_init_type(http_message *message, http_message_t
        }
 }
 
-#define http_message_header(m, h) _http_message_header_ex((m), (h), sizeof(h))
-#define http_message_header_ex _http_message_header_ex
-static inline zval *_http_message_header_ex(http_message *msg, char *key_str, size_t key_len)
-{
-       zval **header;
-       if (SUCCESS == zend_hash_find(&msg->hdrs, key_str, key_len, (void **) &header)) {
-               return *header;
-       }
-       return NULL;
-}
-
 PHP_HTTP_API http_message *_http_message_init_ex(http_message *message, http_message_type type)
 {
        if (!message) {
@@ -190,7 +179,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                                                zval *len;
                                                char *tmp;
 
-                                               spprintf(&tmp, 0, "%lu", decoded_len);
+                                               spprintf(&tmp, 0, "%lu", (ulong) decoded_len);
                                                MAKE_STD_ZVAL(len);
                                                ZVAL_STRING(len, tmp, 0);
 
@@ -213,8 +202,10 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                } else
 
                /* no headers that indicate content length */
-               if (1) {
+               if (HTTP_MSG_TYPE(RESPONSE, msg)) {
                        phpstr_from_string_ex(PHPSTR(msg), body, message + message_length - body);
+               } else {
+                       continue_at = body;
                }
 
                /* check for following messages */
@@ -412,6 +403,21 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
        return rs;
 }
 
+PHP_HTTP_API http_message *_http_message_dup(http_message *msg TSRMLS_DC)
+{
+       /*
+        * TODO: unroll
+        */
+       http_message *new;
+       char *serialized_data;
+       size_t serialized_length;
+
+       http_message_serialize(msg, &serialized_data, &serialized_length);
+       new = http_message_parse(serialized_data, serialized_length);
+       efree(serialized_data);
+       return new;
+}
+
 PHP_HTTP_API void _http_message_dtor(http_message *message)
 {
        if (message) {