#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"
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);
}
zval *c;
const char *continue_at = NULL;
+ /* 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));
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;
+
+ 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 (end >= start && (!total || end < total)) {
+ phpstr_from_string_ex(PHPSTR(msg), body, (size_t) (end + 1 - start));
+ continue_at = body + (end + 1 - start);
}
}
}
- } 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
} else {
continue_at = body;
}
+
+#ifdef HTTP_HAVE_ZLIB
+ /* check for compressed data */
+ if (c = http_message_header(msg, "Content-Encoding")) {
+ char *decoded = NULL;
+ size_t decoded_len = 0;
+
+ if (!strcasecmp(Z_STRVAL_P(c), "gzip")) {
+ http_encoding_gzdecode(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
+ } else
+ if (!strcasecmp(Z_STRVAL_P(c), "deflate")) {
+ http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
+ } else
+ if (!strcasecmp(Z_STRVAL_P(c), "compress")) {
+ http_encoding_uncompress(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
+ }
+
+ if (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, "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
/* check for following messages */
if (continue_at) {
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);
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);
} else {
add_assoc_null(&strct, "parentMessage");
}
- http_message_dtor(msg);
- efree(msg);
}
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 *));
projects / m6w6 / ext-http / blobdiff