X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_api.c;h=fdb0812bf480110edbe593dfdff6b3c102e579a5;hp=76a557bb7e38ab22fa8076c6f61cc57933a57c1b;hb=86508dbae5f9296485820e654f07af59be55003f;hpb=a4b593d03ef14d9bc422cbe6ce471a7b5b8abe5d diff --git a/http_message_api.c b/http_message_api.c index 76a557b..fdb0812 100644 --- a/http_message_api.c +++ b/http_message_api.c @@ -1,16 +1,13 @@ /* - +----------------------------------------------------------------------+ - | PECL :: http | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, that | - | is bundled with this package in the file LICENSE, and is available | - | through the world-wide-web at http://www.php.net/license/3_0.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Copyright (c) 2004-2005 Michael Wallner | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: http | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2004-2005, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ @@ -28,6 +25,7 @@ #include "php_http_send_api.h" #include "php_http_request_api.h" #include "php_http_url_api.h" +#include "php_http_encoding_api.h" #include "phpstr/phpstr.h" @@ -138,7 +136,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); } @@ -149,56 +147,138 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char if (body = http_locate_body(message)) { zval *c; const char *continue_at = NULL; + size_t remaining = message + message_length - body; + + /* message has chunked transfer encoding */ + if ((c = http_message_header(msg, "Transfer-Encoding")) && (!strcasecmp("chunked", Z_STRVAL_P(c)))) { + char *decoded; + size_t decoded_len; + + /* decode and replace Transfer-Encoding with Content-Length header */ + if (continue_at = http_encoding_dechunk(body, message + message_length - body, &decoded, &decoded_len)) { + zval *len; + char *tmp; + int tmp_len; + + tmp_len = (int) spprintf(&tmp, 0, "%lu", (ulong) decoded_len); + MAKE_STD_ZVAL(len); + ZVAL_STRINGL(len, tmp, tmp_len, 0); + + zend_hash_del(&msg->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding")); + zend_hash_del(&msg->hdrs, "Content-Length", sizeof("Content-Length")); + zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL); + + phpstr_from_string_ex(PHPSTR(msg), decoded, decoded_len); + efree(decoded); + } + } else /* message has content-length header */ if (c = http_message_header(msg, "Content-Length")) { - long len = atol(Z_STRVAL_P(c)); + ulong len = strtoul(Z_STRVAL_P(c), NULL, 10); + if (len > remaining) { + http_error_ex(HE_NOTICE, HTTP_E_MALFORMED_HEADERS, "The Content-Length header pretends a larger body than actually received (expected %lu bytes; got %lu bytes)", len, remaining); + len = remaining; + } 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))) { - char *decoded; - size_t decoded_len; - - /* decode and replace Transfer-Encoding with Content-Length header */ - if (continue_at = http_chunked_decode(body, message + message_length - body, &decoded, &decoded_len)) { - phpstr_from_string_ex(PHPSTR(msg), decoded, decoded_len); - efree(decoded); - { - zval *len; - char *tmp; - - spprintf(&tmp, 0, "%lu", (ulong) decoded_len); - MAKE_STD_ZVAL(len); - ZVAL_STRING(len, tmp, 0); - - zend_hash_del(&msg->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding")); - zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL); + /* message has content-range header */ + if (c = http_message_header(msg, "Content-Range")) { + ulong total = 0, start = 0, end = 0, len = 0; + + if (!strncasecmp(Z_STRVAL_P(c), "bytes=", lenof("bytes="))) { + char *total_at = NULL, *end_at = NULL; + char *start_at = Z_STRVAL_P(c) + lenof("bytes="); + + start = strtoul(start_at, &end_at, 10); + if (end_at) { + end = strtoul(end_at + 1, &total_at, 10); + if (total_at && strncmp(total_at + 1, "*", 1)) { + total = strtoul(total_at + 1, NULL, 10); + } + if ((len = (end + 1 - start)) > remaining) { + http_error_ex(HE_NOTICE, HTTP_E_MALFORMED_HEADERS, "The Content-Range header pretends a larger body than actually received (expected %lu bytes; got %lu bytes)", len, remaining); + len = remaining; + } + if (end >= start && (!total || end < total)) { + 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; - - sscanf(Z_STRVAL_P(c), "bytes=%lu-%lu", &start, &end); - if (end > start) { - phpstr_from_string_ex(PHPSTR(msg), body, (size_t) (end - start)); - continue_at = body + (end - start); + if (!continue_at) { + http_error_ex(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Invalid Content-Range header: %s", Z_STRVAL_P(c)); } } else /* no headers that indicate content length */ if (HTTP_MSG_TYPE(RESPONSE, msg)) { - phpstr_from_string_ex(PHPSTR(msg), body, message + message_length - body); + phpstr_from_string_ex(PHPSTR(msg), body, remaining); } else { continue_at = body; } + +#if defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB) + /* check for compressed data */ + if (c = http_message_header(msg, "Content-Encoding")) { + char *decoded = NULL; + size_t decoded_len = 0; +# if defined(HAVE_ZLIB) && !defined(HTTP_HAVE_ZLIB) + zval func, retval, arg, *args[1]; + INIT_PZVAL(&func); + INIT_PZVAL(&retval); + INIT_PZVAL(&arg); + ZVAL_STRINGL(&func, "gzinflate", lenof("gzinflate"), 0); + args[0] = &arg; +# endif /* HAVE_ZLIB && !HTTP_HAVE_ZLIB */ + +# define DECODE_WITH_EXT_ZLIB() \ + if (SUCCESS == call_user_function(EG(function_table), NULL, &func, &retval, 1, args TSRMLS_CC)) { \ + if (Z_TYPE(retval) == IS_STRING) { \ + decoded = Z_STRVAL(retval); \ + decoded_len = Z_STRLEN(retval); \ + } \ + } + + if (!strcasecmp(Z_STRVAL_P(c), "gzip") || !strcasecmp(Z_STRVAL_P(c), "x-gzip")) { +# ifdef HTTP_HAVE_ZLIB + http_encoding_gzdecode(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len); +# else + ZVAL_STRINGL(&arg, PHPSTR_VAL(msg) + 10, PHPSTR_LEN(msg) - 18, 0); + DECODE_WITH_EXT_ZLIB(); +# endif /* HTTP_HAVE_ZLIB */ + } else if (!strcasecmp(Z_STRVAL_P(c), "deflate")) { +# ifdef HTTP_HAVE_ZLIB + http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len); +# else + ZVAL_STRINGL(&arg, PHPSTR_VAL(msg), PHPSTR_LEN(msg), 0); + DECODE_WITH_EXT_ZLIB(); +# endif /* HTTP_HAVE_ZLIB */ + } + + if (decoded) { + zval *len; + char *tmp; + int tmp_len; + + tmp_len = (int) spprintf(&tmp, 0, "%lu", (ulong) decoded_len); + MAKE_STD_ZVAL(len); + ZVAL_STRINGL(len, tmp, tmp_len, 0); + + zend_hash_del(&msg->hdrs, "Content-Encoding", sizeof("Content-Encoding")); + zend_hash_del(&msg->hdrs, "Content-Length", sizeof("Content-Length")); + zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL); + + phpstr_dtor(PHPSTR(msg)); + PHPSTR(msg)->data = decoded; + PHPSTR(msg)->used = decoded_len; + PHPSTR(msg)->free = 1; + } + } +#endif /* HTTP_HAVE_ZLIB || HAVE_ZLIB */ /* check for following messages */ if (continue_at) { @@ -225,6 +305,7 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_ char *key, *data; ulong idx; zval **header; + HashPosition pos1; phpstr_init_ex(&str, 4096, 0); @@ -250,7 +331,7 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_ break; } - FOREACH_HASH_KEYVAL(&msg->hdrs, key, idx, header) { + FOREACH_HASH_KEYVAL(pos1, &msg->hdrs, key, idx, header) { if (key) { zval **single_header; @@ -261,9 +342,12 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_ break; case IS_ARRAY: - FOREACH_VAL(*header, single_header) { + { + HashPosition pos2; + FOREACH_VAL(pos2, *header, single_header) { phpstr_appendf(&str, "%s: %s" HTTP_CRLF, key, Z_STRVAL_PP(single_header)); } + } break; } @@ -312,8 +396,7 @@ PHP_HTTP_API void _http_message_tostruct_recursive(http_message *msg, zval *obj zval strct; zval *headers; - Z_TYPE(strct) = IS_ARRAY; - Z_ARRVAL(strct) = HASH_OF(obj); + INIT_ZARR(strct, HASH_OF(obj)); add_assoc_long(&strct, "type", msg->type); add_assoc_double(&strct, "httpVersion", msg->http.version); @@ -334,7 +417,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); @@ -349,7 +431,6 @@ PHP_HTTP_API void _http_message_tostruct_recursive(http_message *msg, zval *obj } add_assoc_zval(&strct, "parentMessage", parent); http_message_tostruct_recursive(msg->parent, parent); - zval_ptr_dtor(&parent); } else { add_assoc_null(&strct, "parentMessage"); } @@ -366,14 +447,16 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC) char *key; ulong idx; zval **val; + HashPosition pos1; - FOREACH_HASH_KEYVAL(&message->hdrs, key, idx, val) { + FOREACH_HASH_KEYVAL(pos1, &message->hdrs, key, idx, val) { if (key) { if (Z_TYPE_PP(val) == IS_ARRAY) { zend_bool first = 1; zval **data; + HashPosition pos2; - FOREACH_VAL(*val, data) { + FOREACH_VAL(pos2, *val, data) { http_send_header_ex(key, strlen(key), Z_STRVAL_PP(data), Z_STRLEN_PP(data), first, NULL); first = 0; } @@ -395,6 +478,8 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC) char *uri = NULL; zval **zhost, options, headers; + INIT_PZVAL(&options); + INIT_PZVAL(&headers); array_init(&options); array_init(&headers); zend_hash_copy(Z_ARRVAL(headers), &message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));