- fixed issues ifndef HTTP_HAVE_ZLIB and enable gzipped response decoding ifdef HAVE_ZLIB

[m6w6/ext-http] / http_message_api.c

diff --git a/http_message_api.c b/http_message_api.c
index 20fc791b0c7a77020d8ce927c2c04ad0e2bf65ba..74c000e58f0a11fbc131aa8c3756c33d7cd4978f 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"
 
@@ -156,7 +157,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                        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)) {
+                       if (continue_at = http_encoding_dechunk(body, message + message_length - body, &decoded, &decoded_len)) {
                                zval *len;
                                char *tmp;
                                int tmp_len;
@@ -166,6 +167,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                                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);
@@ -213,6 +215,65 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                } 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;
+#      ifdef 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 */
+
+#      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 && 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 /* HTTP_HAVE_ZLIB || HAVE_ZLIB */
 
                /* check for following messages */
                if (continue_at) {
@@ -361,7 +422,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");
        }