X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_api.c;h=59fb327f25acc9276547b6270a7de834d5395b0d;hp=4be4c1758e2f8c223952ef23f9961163c2a94dbe;hb=669d2e6a8bdc642b6b52693f4593f199ddd7e8d2;hpb=32e91737086db53bb1fd9ed9f79d693c43ec459f diff --git a/http_message_api.c b/http_message_api.c index 4be4c17..59fb327 100644 --- a/http_message_api.c +++ b/http_message_api.c @@ -12,16 +12,11 @@ /* $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - +#define HTTP_WANT_SAPI #define HTTP_WANT_CURL #define HTTP_WANT_ZLIB #include "php_http.h" -#include "SAPI.h" - #include "php_http_api.h" #include "php_http_encoding_api.h" #include "php_http_headers_api.h" @@ -42,22 +37,7 @@ static void _http_message_info_callback(http_message **message, HashTable **head (*headers) = &((*message)->hdrs); } - (*message)->http.version = info->http.version; - - switch (info->type) - { - case IS_HTTP_REQUEST: - (*message)->type = HTTP_MSG_REQUEST; - HTTP_INFO(*message).request.url = estrdup(HTTP_INFO(info).request.url); - HTTP_INFO(*message).request.method = estrdup(HTTP_INFO(info).request.method); - break; - - case IS_HTTP_RESPONSE: - (*message)->type = HTTP_MSG_RESPONSE; - HTTP_INFO(*message).response.code = HTTP_INFO(info).response.code; - HTTP_INFO(*message).response.status = estrdup(HTTP_INFO(info).response.status); - break; - } + http_message_set_info(*message, info); } #define http_message_init_type _http_message_init_type @@ -124,6 +104,27 @@ PHP_HTTP_API void _http_message_set_type(http_message *message, http_message_typ } } +PHP_HTTP_API void _http_message_set_info(http_message *message, http_info *info) +{ + message->http.version = info->http.version; + + switch (message->type = info->type) + { + case IS_HTTP_REQUEST: + HTTP_INFO(message).request.url = estrdup(HTTP_INFO(info).request.url); + STR_SET(HTTP_INFO(message).request.method, estrdup(HTTP_INFO(info).request.method)); + break; + + case IS_HTTP_RESPONSE: + HTTP_INFO(message).response.code = HTTP_INFO(info).response.code; + STR_SET(HTTP_INFO(message).response.status, estrdup(HTTP_INFO(info).response.status)); + break; + + default: + break; + } +} + PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t message_length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) { const char *body = NULL; @@ -136,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); } @@ -233,9 +234,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char if ( !strcasecmp(Z_STRVAL_P(c), "gzip") || !strcasecmp(Z_STRVAL_P(c), "x-gzip") || - !strcasecmp(Z_STRVAL_P(c), "deflate") || - !strcasecmp(Z_STRVAL_P(c), "compress") || - !strcasecmp(Z_STRVAL_P(c), "x-compress")) { + !strcasecmp(Z_STRVAL_P(c), "deflate")) { http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len); } @@ -251,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); @@ -378,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; @@ -478,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); @@ -492,7 +542,7 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC) parts.host = estrndup(Z_STRVAL_PP(zhost), Z_STRLEN_PP(zhost)); } - http_build_url(url, &parts, NULL, &uri, NULL); + http_build_url(HTTP_URL_REPLACE, url, &parts, NULL, &uri, NULL); php_url_free(url); efree(parts.host); } else { @@ -529,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)