From: Michael Wallner <mike@php.net>
Date: Sat, 10 Dec 2005 17:02:51 +0000 (+0000)
Subject: - allow requests for compressed content even if neither curl nor ext/http
X-Git-Tag: RELEASE_0_20_0~33
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=6fc78f4b8ea8a34a40f06985648822fbaa7ffb30;p=m6w6%2Fext-http

- allow requests for compressed content even if neither curl nor ext/http
  were built with zlib support
- let curl compose the accpt-encoding header if it was built with zlib support,
  because it will bail out if it receives anything else it doesn't support

# if an<one knows a site that uses something else than gzip encoding, let me know! ;)
---

diff --git a/config.m4 b/config.m4
index 2ff41aa..26832b9 100644
--- a/config.m4
+++ b/config.m4
@@ -79,6 +79,11 @@ dnl ----
 		
 		CURL_LIBS=`$CURL_CONFIG --libs`
 		
+		CURL_ZLIB= `$CURL_CONFIG --features | $EGREP libz`
+		if test "$CURL_ZLIB" = "libz"; then
+			AC_DEFINE([HTTP_HAVE_CURL_ZLIB], [1], [ ])
+		fi
+		
 		AC_MSG_CHECKING([for SSL support in libcurl])
 		CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
 		if test "$CURL_SSL" = "SSL"; then
diff --git a/config.w32 b/config.w32
index 503e7ae..9012de6 100644
--- a/config.w32
+++ b/config.w32
@@ -90,6 +90,7 @@ if (PHP_HTTP != "no") {
 			CHECK_LIB("zlib.lib", "http", PHP_HTTP) &&
 			CHECK_LIB("winmm.lib", "http", PHP_HTTP)) {
 		AC_DEFINE("HTTP_HAVE_CURL", 1, "Have CURL library");
+		AC_DEFINE("HTTP_HAVE_CURL_ZLIB", 1, "");
 		AC_DEFINE("HTTP_HAVE_SSL", 1, "Have SSL");
 		AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, "");
 		AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "");
diff --git a/http_request_api.c b/http_request_api.c
index c43aa1a..38eadf4 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -467,10 +467,10 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 
 	/* compress, empty string enables all supported if libcurl was build with zlib support */
 	if ((zoption = http_curl_getopt(options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
-#if defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB)
-		HTTP_CURL_OPT(ENCODING, "gzip;q=1.0, deflate;q=0.5, *;q=0.1");
-#else
+#ifdef HTTP_HAVE_CURL_ZLIB
 		HTTP_CURL_OPT(ENCODING, "");
+#else
+		HTTP_CURL_OPT(ENCODING, "gzip;q=1.0, deflate;q=0.5, *;q=0.1");
 #endif
 	}