- move the chunked decoder to the encoding_api

[m6w6/ext-http] / http_message_api.c

diff --git a/http_message_api.c b/http_message_api.c
index 36b3098737ce0e672137d881b8214bc74d1bd115..dd597fccf32dbc6a466d1c857f16611a0b34085d 100644 (file)
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -28,6 +28,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"
 
@@ -151,27 +152,26 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                const char *continue_at = NULL;
 
                /* 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);
-                                       }
-                               }
+               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
 
@@ -184,12 +184,28 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 
                /* message has content-range header */
                if (c = http_message_header(msg, "Content-Range")) {
-                       ulong start = 0, end = 0;
+                       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);
+                                       }
+                               }
+                       }
 
-                       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
 
@@ -199,6 +215,43 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                } 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) {