projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge branch 'v2.6.x'
[m6w6/ext-http]
/
src
/
php_http_client_curl_user.c
diff --git
a/src/php_http_client_curl_user.c
b/src/php_http_client_curl_user.c
index 225ce1cda8aa8828856880b7d5d23b1e0b6e3227..d345e27e96bc30b2d7c985038073a011b885b9e5 100644
(file)
--- a/
src/php_http_client_curl_user.c
+++ b/
src/php_http_client_curl_user.c
@@
-106,7
+106,7
@@
static int php_http_client_curl_user_socket(CURL *easy, curl_socket_t sock, int
return -1;
}
return -1;
}
- if (action == CURL_POLL_REMOVE
&& ev
) {
+ if (action == CURL_POLL_REMOVE) {
php_stream_close(ev->socket);
efree(ev);
curl_multi_assign(curl->handle->multi, sock, NULL);
php_stream_close(ev->socket);
efree(ev);
curl_multi_assign(curl->handle->multi, sock, NULL);
@@
-260,7
+260,8
@@
zend_class_entry *php_http_client_curl_user_get_class_entry()
}
ZEND_BEGIN_ARG_INFO_EX(ai_init, 0, 0, 1)
}
ZEND_BEGIN_ARG_INFO_EX(ai_init, 0, 0, 1)
- ZEND_ARG_TYPE_INFO(0, run, IS_CALLABLE, 0)
+ /* using IS_CALLABLE type hint would create a forwards compatibility break */
+ ZEND_ARG_INFO(0, run)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_timer, 0, 0, 1)
#if PHP_VERSION_ID >= 70000
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_timer, 0, 0, 1)
#if PHP_VERSION_ID >= 70000