projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
dfe2dbf
)
- encodings support exists with ext/zlib too
author
Michael Wallner
<mike@php.net>
Mon, 17 Oct 2005 16:28:35 +0000
(16:28 +0000)
committer
Michael Wallner
<mike@php.net>
Mon, 17 Oct 2005 16:28:35 +0000
(16:28 +0000)
http_api.c
patch
|
blob
|
history
http_request_api.c
patch
|
blob
|
history
diff --git
a/http_api.c
b/http_api.c
index d689c8622baa1818e4cee1cb1cc63d84dab359ed..3e8ec02b187f350506a8cda243009795922508c5 100644
(file)
--- a/
http_api.c
+++ b/
http_api.c
@@
-79,7
+79,7
@@
PHP_HTTP_API long _http_support(long feature)
#ifdef HTTP_HAVE_MAGIC
support |= HTTP_SUPPORT_MAGICMIME;
#endif
#ifdef HTTP_HAVE_MAGIC
support |= HTTP_SUPPORT_MAGICMIME;
#endif
-#if
def HTTP_HAVE_ZLIB
+#if
defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB)
support |= HTTP_SUPPORT_ENCODINGS;
#endif
support |= HTTP_SUPPORT_ENCODINGS;
#endif
diff --git
a/http_request_api.c
b/http_request_api.c
index b2da719eae325f4d87975739530a02a805b5b6ae..1acd53ad57044625eecd98d50c85a2ee73d1ff3f 100644
(file)
--- a/
http_request_api.c
+++ b/
http_request_api.c
@@
-436,7
+436,7
@@
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)) {
/* 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
def HTTP_HAVE_ZLIB
+#if
defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB)
HTTP_CURL_OPT(ENCODING, "gzip;q=1.0, deflate;q=0.5, *;q=0");
#else
HTTP_CURL_OPT(ENCODING, "");
HTTP_CURL_OPT(ENCODING, "gzip;q=1.0, deflate;q=0.5, *;q=0");
#else
HTTP_CURL_OPT(ENCODING, "");