projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- independency from ext/zlib
[m6w6/ext-http]
/
http_request_api.c
diff --git
a/http_request_api.c
b/http_request_api.c
index 56373d7d68e3d2d67637e8fc247e32824597d53f..615958c01f88d327e73e72a9e98e536c5eb3d65b 100644
(file)
--- a/
http_request_api.c
+++ b/
http_request_api.c
@@
-56,7
+56,7
@@
static inline zend_bool http_ssl_init(void);
static inline void http_ssl_cleanup(void);
#endif
static inline void http_ssl_cleanup(void);
#endif
-
STATUS _http_request_global_init(INIT_FUNC_ARGS
)
+
PHP_MINIT_FUNCTION(http_request
)
{
if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
return FAILURE;
{
if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
return FAILURE;
@@
-76,12
+76,13
@@
STATUS _http_request_global_init(INIT_FUNC_ARGS)
return SUCCESS;
}
return SUCCESS;
}
-
void _http_request_global_cleanup(TSRMLS_D
)
+
PHP_MSHUTDOWN_FUNCTION(http_request
)
{
curl_global_cleanup();
#ifdef HTTP_NEED_SSL
http_ssl_cleanup();
#endif
{
curl_global_cleanup();
#ifdef HTTP_NEED_SSL
http_ssl_cleanup();
#endif
+ return SUCCESS;
}
#ifndef HAVE_CURL_EASY_STRERROR
}
#ifndef HAVE_CURL_EASY_STRERROR
@@
-433,9
+434,13
@@
PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
}
#endif
}
#endif
- /* compress, empty string enables
deflate and gzip
*/
+ /* 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 ((zoption = http_curl_getopt(options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
+#ifdef HTTP_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, "");
+#endif
}
/* redirects, defaults to 0 */
}
/* redirects, defaults to 0 */