projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
update config.m4; allow disabling idna; add idnkit
[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 66edae664db2677cf0ef1490df05740415988cd1..d44f3dac815f1512ee9f9c51d66719b0733ffa87 100644
(file)
--- a/
src/php_http_client_curl_user.c
+++ b/
src/php_http_client_curl_user.c
@@
-15,7
+15,7
@@
#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;
typedef struct php_http_client_curl_user_ev {
php_stream *socket;
@@
-59,7
+59,7
@@
static void php_http_client_curl_user_timer(CURLM *multi, long timeout_ms, void
if (timeout_ms <= 0) {
php_http_client_curl_loop(context->client, CURL_SOCKET_TIMEOUT, 0);
if (timeout_ms <= 0) {
php_http_client_curl_loop(context->client, CURL_SOCKET_TIMEOUT, 0);
- } else
if (timeout_ms > 0)
{
+ } else {
zval args[1], *ztimeout = &args[0];
ZVAL_LONG(ztimeout, timeout_ms);
zval args[1], *ztimeout = &args[0];
ZVAL_LONG(ztimeout, timeout_ms);
@@
-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);
@@
-316,7
+316,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: