#endif
#define HTTP_WANT_CURL
+#define HTTP_WANT_ZLIB
#include "php_http.h"
#include "SAPI.h"
}
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
+# ifndef HTTP_HAVE_ZLIB
DECODE_WITH_EXT_ZLIB("gzinflate", PHPSTR_VAL(msg) + 10, PHPSTR_LEN(msg) - 18);
-# 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
- DECODE_WITH_EXT_ZLIB("gzinflate", PHPSTR_VAL(msg), PHPSTR_LEN(msg));
-# endif /* HTTP_HAVE_ZLIB */
- } else if (!strcasecmp(Z_STRVAL_P(c), "compress") || !strcasecmp(Z_STRVAL_P(c), "x-compress")) {
-# ifdef HTTP_HAVE_ZLIB
- http_encoding_uncompress(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
# else
- DECODE_WITH_EXT_ZLIB("gzuncompress", PHPSTR_VAL(msg), PHPSTR_LEN(msg));
+ 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")) {
+ http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
# endif /* HTTP_HAVE_ZLIB */
}
#endif /* HTTP_HAVE_ZLIB || HAVE_ZLIB */
/* check for following messages */
- if (continue_at) {
+ if (continue_at && (continue_at < (message + message_length))) {
while (isspace(*continue_at)) ++continue_at;
if (continue_at < (message + message_length)) {
http_message *next = NULL, *most = NULL;
/* 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))) {