projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
client_curl_user: fix arginfo
[m6w6/ext-http]
/
src
/
php_http_client_curl.c
diff --git
a/src/php_http_client_curl.c
b/src/php_http_client_curl.c
index b8ed3c54b6a5ce61c2bc95b57404cc8080438bfd..46502bad1eb9b532b67e9cd12400c5bfad7be412 100644
(file)
--- a/
src/php_http_client_curl.c
+++ b/
src/php_http_client_curl.c
@@
-313,14
+313,14
@@
static int php_http_curle_raw_callback(CURL *ch, curl_infotype type, char *data,
return 0;
}
return 0;
}
-static
in
t php_http_curle_header_callback(char *data, size_t n, size_t l, void *arg)
+static
size_
t php_http_curle_header_callback(char *data, size_t n, size_t l, void *arg)
{
php_http_client_curl_handler_t *h = arg;
return php_http_buffer_append(&h->response.headers, data, n * l);
}
{
php_http_client_curl_handler_t *h = arg;
return php_http_buffer_append(&h->response.headers, data, n * l);
}
-static
in
t php_http_curle_body_callback(char *data, size_t n, size_t l, void *arg)
+static
size_
t php_http_curle_body_callback(char *data, size_t n, size_t l, void *arg)
{
php_http_client_curl_handler_t *h = arg;
{
php_http_client_curl_handler_t *h = arg;
@@
-1486,9
+1486,8
@@
static void php_http_curle_options_init(php_http_options_t *registry)
}
#endif
#if PHP_HTTP_CURL_VERSION(7,49,0)
}
#endif
#if PHP_HTTP_CURL_VERSION(7,49,0)
-# if
PHP_WIN32
+# if
defined(linux) || defined(__APPLE__)
/* CURLOPT_TCP_FASTOPEN is not supported (yet) on Windows */
/* CURLOPT_TCP_FASTOPEN is not supported (yet) on Windows */
-# else
php_http_option_register(registry, ZEND_STRL("tcp_fastopen"), CURLOPT_TCP_FASTOPEN, _IS_BOOL);
# endif
#endif
php_http_option_register(registry, ZEND_STRL("tcp_fastopen"), CURLOPT_TCP_FASTOPEN, _IS_BOOL);
# endif
#endif
@@
-2207,7
+2206,9
@@
static ZEND_RESULT_CODE php_http_client_curl_handler_prepare(php_http_client_cur
curl_easy_setopt(curl->handle, CURLOPT_URL, storage->url);
/* apply options */
curl_easy_setopt(curl->handle, CURLOPT_URL, storage->url);
/* apply options */
- php_http_options_apply(&php_http_curle_options, enqueue->options, curl);
+ if (SUCCESS != php_http_options_apply(&php_http_curle_options, enqueue->options, curl)) {
+ return FAILURE;
+ }
/* request headers */
php_http_message_update_headers(msg);
/* request headers */
php_http_message_update_headers(msg);