- get rid of 1001 strict-aliasing warnings

[m6w6/ext-http] / http_message_api.c

diff --git a/http_message_api.c b/http_message_api.c
index 0b5908ecab8d5ea4598241fe440ad62929457af5..59fb327f25acc9276547b6270a7de834d5395b0d 100644 (file)
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -137,7 +137,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 
        msg = http_message_init_rel(msg, 0);
 
-       if (SUCCESS != http_parse_headers_cb(message, &msg->hdrs, 1, (http_info_callback) http_message_info_callback, (void **) &msg)) {
+       if (SUCCESS != http_parse_headers_cb(message, &msg->hdrs, 1, (http_info_callback) http_message_info_callback, (void *) &msg)) {
                if (free_msg) {
                        http_message_free(&msg);
                }
@@ -250,7 +250,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                                ZVAL_ADDREF(c);
                                zend_hash_add(&msg->hdrs, "X-Original-Content-Encoding", sizeof("X-Original-Content-Encoding"), (void *) &c, sizeof(zval *), NULL);
                                zend_hash_del(&msg->hdrs, "Content-Encoding", sizeof("Content-Encoding"));
-                               if (SUCCESS == zend_hash_find(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void **) &original_len)) {
+                               if (SUCCESS == zend_hash_find(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &original_len)) {
                                        ZVAL_ADDREF(*original_len);                                     
                                        zend_hash_add(&msg->hdrs, "X-Original-Content-Length", sizeof("X-Original-Content-Length"), (void *) original_len, sizeof(zval *), NULL);
                                        zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
@@ -377,6 +377,57 @@ PHP_HTTP_API void _http_message_serialize(http_message *message, char **string,
        phpstr_dtor(&str);
 }
 
+PHP_HTTP_API http_message *_http_message_reverse(http_message *msg)
+{
+       int i, c;
+       
+       http_message_count(c, msg);
+       
+       if (c > 1) {
+               http_message *tmp = msg, **arr = ecalloc(c, sizeof(http_message *));
+               
+               for (i = 0; i < c; ++i) {
+                       arr[i] = tmp;
+                       tmp = tmp->parent;
+               }
+               arr[0]->parent = NULL;
+               for (i = 0; i < c-1; ++i) {
+                       arr[i+1]->parent = arr[i];
+               }
+               
+               msg = arr[c-1];
+               efree(arr);
+       }
+       
+       return msg;
+}
+
+PHP_HTTP_API http_message *_http_message_interconnect(http_message *m1, http_message *m2)
+{
+       if (m1 && m2) {
+               int i = 0, c1, c2;
+               http_message *t1 = m1, *t2 = m2, *p1, *p2;
+               
+               http_message_count(c1, m1);
+               http_message_count(c2, m2);
+               
+               while (i++ < (c1 - c2)) {
+                       t1 = t1->parent;
+               }
+               while (i++ <= c1) {
+                       p1 = t1->parent;
+                       p2 = t2->parent;
+                       t1->parent = t2;
+                       t2->parent = p1;
+                       t1 = p1;
+                       t2 = p2;
+               }
+       } else if (!m1 && m2) {
+               m1 = m2;
+       }
+       return m1;
+}
+
 PHP_HTTP_API void _http_message_tostruct_recursive(http_message *msg, zval *obj TSRMLS_DC)
 {
        zval strct;
@@ -477,7 +528,7 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
                        add_assoc_zval(&options, "headers", &headers);
 
                        /* check host header */
-                       if (SUCCESS == zend_hash_find(&message->hdrs, "Host", sizeof("Host"), (void **) &zhost)) {
+                       if (SUCCESS == zend_hash_find(&message->hdrs, "Host", sizeof("Host"), (void *) &zhost)) {
                                char *colon = NULL;
                                php_url parts, *url = php_url_parse(message->http.info.request.url);
                                
@@ -528,19 +579,35 @@ 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)
+PHP_HTTP_API http_message *_http_message_dup(http_message *orig 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;
+       http_message *temp, *copy = NULL;
+       http_info info;
+       
+       if (orig) {
+               info.type = orig->type;
+               info.http = orig->http;
+               
+               copy = temp = http_message_new();
+               http_message_set_info(temp, &info);
+               zend_hash_copy(&temp->hdrs, &orig->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+               phpstr_append(&temp->body, orig->body.data, orig->body.used);
+       
+               while (orig->parent) {
+                       info.type = orig->parent->type;
+                       info.http = orig->parent->http;
+               
+                       temp->parent = http_message_new();
+                       http_message_set_info(temp->parent, &info);
+                       zend_hash_copy(&temp->parent->hdrs, &orig->parent->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+                       phpstr_append(&temp->parent->body, orig->parent->body.data, orig->parent->body.used);
+               
+                       temp = temp->parent;
+                       orig = orig->parent;
+               }
+       }
+       
+       return copy;
 }
 
 PHP_HTTP_API void _http_message_dtor(http_message *message)