projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
release v3.3.0
[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..95ea6f5388d6abbeea594bb9b939e4312dfe97c2 100644
(file)
--- a/
src/php_http_client_curl_user.c
+++ b/
src/php_http_client_curl_user.c
@@
-15,14
+15,14
@@
#include "php_network.h"
#include "zend_closures.h"
#include "php_network.h"
#include "zend_closures.h"
-#if PHP_HTTP_HAVE_CURL
+#if PHP_HTTP_HAVE_
LIB
CURL
typedef struct php_http_client_curl_user_ev {
php_stream *socket;
php_http_client_curl_user_context_t *context;
} php_http_client_curl_user_ev_t;
typedef struct php_http_client_curl_user_ev {
php_stream *socket;
php_http_client_curl_user_context_t *context;
} php_http_client_curl_user_ev_t;
-static
void php_http_client_curl_user_handler(INTERNAL_FUNCTION_PARAMETERS
)
+static
ZEND_NAMED_FUNCTION(php_http_client_curl_user_handler
)
{
zval *zstream = NULL, *zclient = NULL;
php_stream *stream = NULL;
{
zval *zstream = NULL, *zclient = NULL;
php_stream *stream = NULL;
@@
-57,9
+57,7
@@
static void php_http_client_curl_user_timer(CURLM *multi, long timeout_ms, void
fprintf(stderr, "\ntimer <- timeout_ms: %ld\n", timeout_ms);
#endif
fprintf(stderr, "\ntimer <- timeout_ms: %ld\n", timeout_ms);
#endif
- if (timeout_ms <= 0) {
- php_http_client_curl_loop(context->client, CURL_SOCKET_TIMEOUT, 0);
- } else if (timeout_ms > 0) {
+ if (timeout_ms >= 0) {
zval args[1], *ztimeout = &args[0];
ZVAL_LONG(ztimeout, timeout_ms);
zval args[1], *ztimeout = &args[0];
ZVAL_LONG(ztimeout, timeout_ms);
@@
-106,7
+104,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
+258,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
@@
-315,7
+314,7
@@
PHP_MINIT_FUNCTION(http_client_curl_user)
return SUCCESS;
}
return SUCCESS;
}
-#endif /* PHP_HTTP_HAVE_CURL */
+#endif /* PHP_HTTP_HAVE_
LIB
CURL */
/*
* Local variables:
/*
* Local variables: