X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_api.c;h=15fa449eb21eef2e2453152da7cacf163d58c68b;hp=76a557bb7e38ab22fa8076c6f61cc57933a57c1b;hb=6c4e793316be7f98f5400e24f498336db0d07af4;hpb=a4b593d03ef14d9bc422cbe6ce471a7b5b8abe5d diff --git a/http_message_api.c b/http_message_api.c index 76a557b..15fa449 100644 --- a/http_message_api.c +++ b/http_message_api.c @@ -138,7 +138,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char msg = http_message_init(msg); - if (SUCCESS != http_parse_headers_cb(message, &msg->hdrs, 1, (http_info_callback) http_message_info_callback, &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); } @@ -150,13 +150,6 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char zval *c; const char *continue_at = NULL; - /* message has content-length header */ - if (c = http_message_header(msg, "Content-Length")) { - long len = atol(Z_STRVAL_P(c)); - phpstr_from_string_ex(PHPSTR(msg), body, len); - continue_at = body + len; - } else - /* message has chunked transfer encoding */ if (c = http_message_header(msg, "Transfer-Encoding")) { if (!strcasecmp("chunked", Z_STRVAL_P(c))) { @@ -182,6 +175,13 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char } } else + /* message has content-length header */ + if (c = http_message_header(msg, "Content-Length")) { + long len = atol(Z_STRVAL_P(c)); + phpstr_from_string_ex(PHPSTR(msg), body, len); + continue_at = body + len; + } else + /* message has content-range header */ if (c = http_message_header(msg, "Content-Range")) { ulong start = 0, end = 0; @@ -334,7 +334,6 @@ PHP_HTTP_API void _http_message_tostruct_recursive(http_message *msg, zval *obj array_init(headers); zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); add_assoc_zval(&strct, "headers", headers); - zval_ptr_dtor(&headers); add_assoc_stringl(&strct, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg), 1);