- add ob_(deflate|inflate)handler

[m6w6/ext-http] / http_message_api.c

diff --git a/http_message_api.c b/http_message_api.c
index dd38e7c8a72517fe465b0d2c0648e2c7cc28df1d..5f517010adbd1201b45120d4746a21abe2326f4a 100644 (file)
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -30,8 +30,6 @@
 #include "php_http_send_api.h"
 #include "php_http_url_api.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 #define http_message_info_callback _http_message_info_callback
 static void _http_message_info_callback(http_message **message, HashTable **headers, http_info *info TSRMLS_DC)
 {
@@ -227,37 +225,18 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                        continue_at = body;
                }
                
-#if defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB)
+#ifdef HTTP_HAVE_ZLIB
                /* check for compressed data */
                if (http_message_header(msg, "Vary") && (c = http_message_header(msg, "Content-Encoding"))) {
                        char *decoded = NULL;
                        size_t decoded_len = 0;
-#      if !defined(HTTP_HAVE_ZLIB)
-                       zval func, retval, arg, *args[1];
-                       INIT_PZVAL(&func);
-                       INIT_PZVAL(&retval);
-                       INIT_PZVAL(&arg);
-                       args[0] = &arg;
-#      endif /* !HTTP_HAVE_ZLIB */
-
-#      define DECODE_WITH_EXT_ZLIB(function, S, L) \
-                               ZVAL_STRINGL(&func, function, lenof(function), 0); \
-                               ZVAL_STRINGL(&arg, (S), (L), 0); \
-                               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")) {
-#      ifndef HTTP_HAVE_ZLIB
-                               DECODE_WITH_EXT_ZLIB("gzinflate", PHPSTR_VAL(msg) + 10, PHPSTR_LEN(msg) - 18);
-#      else
-                               http_encoding_gzdecode(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
-                       } else if (!strcasecmp(Z_STRVAL_P(c), "deflate") || !strcasecmp(Z_STRVAL_P(c), "compress") || !strcasecmp(Z_STRVAL_P(c), "x-compress")) {
+                       if (    !strcasecmp(Z_STRVAL_P(c), "gzip") || 
+                                       !strcasecmp(Z_STRVAL_P(c), "x-gzip") ||
+                                       !strcasecmp(Z_STRVAL_P(c), "deflate") ||
+                                       !strcasecmp(Z_STRVAL_P(c), "compress") ||
+                                       !strcasecmp(Z_STRVAL_P(c), "x-compress")) {
                                http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
-#      endif /* HTTP_HAVE_ZLIB */
                        }
                        
                        if (decoded) {
@@ -286,7 +265,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                                PHPSTR(msg)->free = 1;
                        }
                }
-#endif /* HTTP_HAVE_ZLIB || HAVE_ZLIB */
+#endif /* HTTP_HAVE_ZLIB */
 
                /* check for following messages */
                if (continue_at && (continue_at < (message + message_length))) {
@@ -500,23 +479,24 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 
                        /* check host header */
                        if (SUCCESS == zend_hash_find(&message->hdrs, "Host", sizeof("Host"), (void **) &zhost)) {
-                               char *colon = NULL, *host = NULL;
-                               size_t host_len = 0;
-                               int port = 0;
+                               char *colon = NULL;
+                               php_url parts, *url = php_url_parse(message->http.info.request.URI);
+                               
+                               memset(&parts, 0, sizeof(php_url));
 
                                /* check for port */
                                if ((colon = strchr(Z_STRVAL_PP(zhost), ':'))) {
-                                       port = atoi(colon + 1);
-                                       host = estrndup(Z_STRVAL_PP(zhost), host_len = (Z_STRVAL_PP(zhost) - colon - 1));
+                                       parts.port = atoi(colon + 1);
+                                       parts.host = estrndup(Z_STRVAL_PP(zhost), (Z_STRVAL_PP(zhost) - colon - 1));
                                } else {
-                                       host = estrndup(Z_STRVAL_PP(zhost), host_len = Z_STRLEN_PP(zhost));
+                                       parts.host = estrndup(Z_STRVAL_PP(zhost), Z_STRLEN_PP(zhost));
                                }
-                               uri = http_absolute_uri_ex(
-                                       message->http.info.request.URI, strlen(message->http.info.request.URI),
-                                       NULL, 0, host, host_len, port);
-                               efree(host);
+                               
+                               http_build_url(url, &parts, NULL, &uri, NULL);
+                               php_url_free(url);
+                               efree(parts.host);
                        } else {
-                               uri = http_absolute_uri(message->http.info.request.URI);
+                               uri = http_absolute_url(message->http.info.request.URI);
                        }
 
                        if ((request.meth = http_request_method_exists(1, 0, message->http.info.request.method))) {