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 travis/pecl
[m6w6/ext-http]
/
src
/
php_http_client_curl_event.c
diff --git
a/src/php_http_client_curl_event.c
b/src/php_http_client_curl_event.c
index 9b1808b92f43be348222de8fc481a770c4ae139f..e1ba505b783d828ec92ca25d576f2432e394afdd 100644
(file)
--- a/
src/php_http_client_curl_event.c
+++ b/
src/php_http_client_curl_event.c
@@
-11,8
+11,6
@@
*/
#include "php_http_api.h"
*/
#include "php_http_api.h"
-#include "php_http_client.h"
-#include "php_http_client_curl.h"
#if PHP_HTTP_HAVE_CURL
#if PHP_HTTP_HAVE_EVENT
#if PHP_HTTP_HAVE_CURL
#if PHP_HTTP_HAVE_EVENT
@@
-67,7
+65,6
@@
static void php_http_client_curl_event_handler(void *context, curl_socket_t s, i
CURLMcode rc;
php_http_client_curl_event_context_t *ctx = context;
php_http_client_curl_t *curl = ctx->client->ctx;
CURLMcode rc;
php_http_client_curl_event_context_t *ctx = context;
php_http_client_curl_t *curl = ctx->client->ctx;
- TSRMLS_FETCH_FROM_CTX(ctx->client->ts);
#if DBG_EVENTS
fprintf(stderr, "H");
#if DBG_EVENTS
fprintf(stderr, "H");
@@
-78,7
+75,7
@@
static void php_http_client_curl_event_handler(void *context, curl_socket_t s, i
} while (CURLM_CALL_MULTI_PERFORM == rc);
if (CURLM_OK != rc) {
} while (CURLM_CALL_MULTI_PERFORM == rc);
if (CURLM_OK != rc) {
- php_error_docref(NULL
TSRMLS_CC
, E_WARNING, "%s", curl_multi_strerror(rc));
+ php_error_docref(NULL, E_WARNING, "%s", curl_multi_strerror(rc));
}
php_http_client_curl_responsehandler(ctx->client);
}
php_http_client_curl_responsehandler(ctx->client);
@@
-144,7
+141,6
@@
static int php_http_client_curl_event_socket(CURL *easy, curl_socket_t sock, int
php_http_client_curl_t *curl = ctx->client->ctx;
int events = EV_PERSIST;
php_http_client_curl_event_ev_t *ev = assign_data;
php_http_client_curl_t *curl = ctx->client->ctx;
int events = EV_PERSIST;
php_http_client_curl_event_ev_t *ev = assign_data;
- TSRMLS_FETCH_FROM_CTX(ctx->client->ts);
#if DBG_EVENTS
fprintf(stderr, "S");
#if DBG_EVENTS
fprintf(stderr, "S");
@@
-176,7
+172,7
@@
static int php_http_client_curl_event_socket(CURL *easy, curl_socket_t sock, int
return 0;
default:
return 0;
default:
- php_error_docref(NULL
TSRMLS_CC
, E_WARNING, "Unknown socket action %d", action);
+ php_error_docref(NULL, E_WARNING, "Unknown socket action %d", action);
return -1;
}
return -1;
}
@@
-235,7
+231,6
@@
static ZEND_RESULT_CODE php_http_client_curl_event_exec(void *context)
{
php_http_client_curl_event_context_t *ctx = context;
php_http_client_curl_t *curl = ctx->client->ctx;
{
php_http_client_curl_event_context_t *ctx = context;
php_http_client_curl_t *curl = ctx->client->ctx;
- TSRMLS_FETCH_FROM_CTX(ctx->client->ts);
#if DBG_EVENTS
fprintf(stderr, "E");
#if DBG_EVENTS
fprintf(stderr, "E");
@@
-289,8
+284,6
@@
static void php_http_client_curl_event_dtor(void **context)
fprintf(stderr, "D");
#endif
fprintf(stderr, "D");
#endif
- ZEND_ASSERT(ctx);
-
curl = ctx->client->ctx;
curl_multi_setopt(curl->handle->multi, CURLMOPT_SOCKETDATA, NULL);
curl = ctx->client->ctx;
curl_multi_setopt(curl->handle->multi, CURLMOPT_SOCKETDATA, NULL);