#include "php_http_requestpool_object.h"
#include "php_http_url_api.h"
+#ifndef HTTP_CURL_USE_ZEND_MM
+# define HTTP_CURL_USE_ZEND_MM 0
+#endif
+
+#ifndef HTTP_DEBUG_REQPOOLS
+# define HTTP_DEBUG_REQPOOLS 0
+#endif
+
ZEND_EXTERN_MODULE_GLOBALS(http)
#if LIBCURL_VERSION_NUM < 0x070c00
-# define curl_easy_strerror(code) HTTP_G(request).curl.error
+# define curl_easy_strerror(code) HTTP_G(request).error
#endif
#define HTTP_CURL_INFO(I) HTTP_CURL_INFO_EX(I, I)
{ \
char *c; \
if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &c)) { \
- add_assoc_string(&array, pretty_key(http_request_copystr(#X), sizeof(#X)-1, 0, 0), c ? c : "", 1); \
+ add_assoc_string(&array, pretty_key(http_request_data_copy(COPY_STRING, #X), sizeof(#X)-1, 0, 0), c ? c : "", 1); \
} \
} \
break; \
{ \
double d; \
if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &d)) { \
- add_assoc_double(&array, pretty_key(http_request_copystr(#X), sizeof(#X)-1, 0, 0), d); \
+ add_assoc_double(&array, pretty_key(http_request_data_copy(COPY_STRING, #X), sizeof(#X)-1, 0, 0), d); \
} \
} \
break; \
{ \
long l; \
if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &l)) { \
- add_assoc_long(&array, pretty_key(http_request_copystr(#X), sizeof(#X)-1, 0, 0), l); \
+ add_assoc_long(&array, pretty_key(http_request_data_copy(COPY_STRING, #X), sizeof(#X)-1, 0, 0), l); \
} \
} \
break; \
#define HTTP_CURL_OPT_STRING_EX(keyname, optname) \
if (!strcasecmp(key, #keyname)) { \
convert_to_string_ex(param); \
- HTTP_CURL_OPT(optname, http_request_copystr(Z_STRVAL_PP(param))); \
+ HTTP_CURL_OPT(optname, http_request_data_copy(COPY_STRING, Z_STRVAL_PP(param))); \
key = NULL; \
continue; \
}
static int http_curl_progress_callback(void *, double, double, double, double);
static int http_curl_debug_callback(CURL *, curl_infotype, char *, size_t, void *);
+typedef struct {
+ void ***tsrm_ctx;
+ void *data;
+} http_curl_callback_ctx;
+
+#define HTTP_CURL_CALLBACK_DATA(from, type, var) \
+ http_curl_callback_ctx *__CTX = (http_curl_callback_ctx *) (from); \
+ TSRMLS_FETCH_FROM_CTX(__CTX->tsrm_ctx); \
+ type (var) = (type) (__CTX->data)
+
+#define http_curl_callback_data(data) _http_curl_callback_data((data) TSRMLS_CC)
+static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC);
+
static void http_request_pool_freebody(http_request_body **body);
-static void http_request_pool_responsehandler(zval **req TSRMLS_DC);
-static inline STATUS http_request_pool_select(http_request_pool *pool);
-static inline void http_request_pool_perform(http_request_pool *pool);
+static void http_request_pool_freehandle(zval **request, http_request_pool *pool TSRMLS_DC);
+
+#if HTTP_CURL_USE_ZEND_MM
+static void http_curl_free(void *p) { efree(p); }
+static char *http_curl_strdup(const char *p) { return estrdup(p); }
+static void *http_curl_malloc(size_t s) { return emalloc(s); }
+static void *http_curl_realloc(void *p, size_t s) { return erealloc(p, s); }
+static void *http_curl_calloc(size_t n, size_t s) { return ecalloc(n, s); }
+#endif
+
+/* {{{ STATUS http_request_global_init() */
+STATUS _http_request_global_init(void)
+{
+#if HTTP_CURL_USE_ZEND_MM
+ if (CURLE_OK != curl_global_init_mem(CURL_GLOBAL_ALL,
+ http_curl_malloc,
+ http_curl_free,
+ http_curl_realloc,
+ http_curl_strdup,
+ http_curl_calloc)) {
+ return FAILURE;
+ }
+#else
+ if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
+ return FAILURE;
+ }
+#endif
+ return SUCCESS;
+}
+/* }}} */
+
+/* {{{ void *http_request_data_copy(int, void *) */
+void *_http_request_data_copy(int type, void *data TSRMLS_DC)
+{
+ switch (type)
+ {
+ case COPY_STRING:
+ {
+ char *new_str = estrdup((const char*) data);
+ zend_llist_add_element(&HTTP_G(request).copies.strings, &new_str);
+ return new_str;
+ }
+
+ case COPY_SLIST:
+ {
+ zend_llist_add_element(&HTTP_G(request).copies.slists, &data);
+ return data;
+ }
+
+ default:
+ {
+ return data;
+ }
+ }
+}
+/* }}} */
+
+/* {{{ void http_request_data_free_string(char **) */
+void _http_request_data_free_string(void *string)
+{
+ efree(*((char **)string));
+}
+/* }}} */
-/* {{{ char *http_request_copystr(char *) */
-PHP_HTTP_API char *_http_request_copystr(const char *str TSRMLS_DC)
+/* {{{ void http_request_data_free_slist(struct curl_slist **) */
+void _http_request_data_free_slist(void *list)
{
- char *new_str = estrdup(str);
- zend_llist_add_element(&HTTP_G(request).curl.copies, &new_str);
- return new_str;
+ curl_slist_free_all(*((struct curl_slist **) list));
}
/* }}} */
/* set options */
if (url) {
- HTTP_CURL_OPT(URL, url);
+ HTTP_CURL_OPT(URL, http_request_data_copy(COPY_STRING, (void *) url));
}
if (response) {
- HTTP_CURL_OPT(WRITEDATA, response);
- HTTP_CURL_OPT(WRITEHEADER, response);
+ HTTP_CURL_OPT(WRITEDATA, http_curl_callback_data(response));
+ HTTP_CURL_OPT(WRITEHEADER, http_curl_callback_data(response));
}
HTTP_CURL_OPT(HEADER, 0);
HTTP_CURL_OPT(NOSIGNAL, 1);
#endif
#if LIBCURL_VERSION_NUM < 0x070c00
- HTTP_CURL_OPT(ERRORBUFFER, HTTP_G(request).curl.error);
+ HTTP_CURL_OPT(ERRORBUFFER, HTTP_G(request).error);
#endif
/* progress callback */
if (zoption = http_curl_getopt(options, "onprogress", 0)) {
- HTTP_CURL_OPT(NOPROGRESS, 0);
HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback);
- HTTP_CURL_OPT(PROGRESSDATA, zoption);
+ HTTP_CURL_OPT(PROGRESSDATA, http_curl_callback_data(zoption));
} else {
HTTP_CURL_OPT(NOPROGRESS, 1);
}
if (zoption = http_curl_getopt(options, "ondebug", 0)) {
HTTP_CURL_OPT(VERBOSE, 1);
HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_debug_callback);
- HTTP_CURL_OPT(DEBUGDATA, zoption);
+ HTTP_CURL_OPT(DEBUGDATA, http_curl_callback_data(zoption));
} else {
HTTP_CURL_OPT(VERBOSE, 0);
}
/* proxy */
if (zoption = http_curl_getopt(options, "proxyhost", IS_STRING)) {
- HTTP_CURL_OPT(PROXY, http_request_copystr(Z_STRVAL_P(zoption)));
+ HTTP_CURL_OPT(PROXY, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
/* port */
if (zoption = http_curl_getopt(options, "proxyport", IS_LONG)) {
HTTP_CURL_OPT(PROXYPORT, Z_LVAL_P(zoption));
}
/* user:pass */
if (zoption = http_curl_getopt(options, "proxyauth", IS_STRING)) {
- HTTP_CURL_OPT(PROXYUSERPWD, http_request_copystr(Z_STRVAL_P(zoption)));
+ HTTP_CURL_OPT(PROXYUSERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
}
#if LIBCURL_VERSION_NUM >= 0x070a07
/* auth method */
/* outgoing interface */
if (zoption = http_curl_getopt(options, "interface", IS_STRING)) {
- HTTP_CURL_OPT(INTERFACE, http_request_copystr(Z_STRVAL_P(zoption)));
+ HTTP_CURL_OPT(INTERFACE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
}
/* another port */
/* auth */
if (zoption = http_curl_getopt(options, "httpauth", IS_STRING)) {
- HTTP_CURL_OPT(USERPWD, http_request_copystr(Z_STRVAL_P(zoption)));
+ HTTP_CURL_OPT(USERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
}
#if LIBCURL_VERSION_NUM >= 0x070a06
if (zoption = http_curl_getopt(options, "httpauthtype", IS_LONG)) {
/* compress, empty string enables deflate and gzip */
if (zoption = http_curl_getopt(options, "compress", IS_BOOL)) {
if (Z_LVAL_P(zoption)) {
- HTTP_CURL_OPT(ENCODING, http_request_copystr(""));
+ HTTP_CURL_OPT(ENCODING, http_request_data_copy(COPY_STRING, ""));
}
}
/* referer */
if (zoption = http_curl_getopt(options, "referer", IS_STRING)) {
- HTTP_CURL_OPT(REFERER, http_request_copystr(Z_STRVAL_P(zoption)));
+ HTTP_CURL_OPT(REFERER, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
}
/* useragent, default "PECL::HTTP/version (PHP/version)" */
if (zoption = http_curl_getopt(options, "useragent", IS_STRING)) {
- HTTP_CURL_OPT(USERAGENT, http_request_copystr(Z_STRVAL_P(zoption)));
+ HTTP_CURL_OPT(USERAGENT, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
} else {
- HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")");
+ HTTP_CURL_OPT(USERAGENT, http_request_data_copy(COPY_STRING, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")"));
}
/* additional headers, array('name' => 'value') */
if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val)) {
char header[1024] = {0};
snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val));
- headers = curl_slist_append(headers, http_request_copystr(header));
+ headers = curl_slist_append(headers, http_request_data_copy(COPY_STRING, header));
}
/* reset */
}
if (headers) {
- HTTP_CURL_OPT(HTTPHEADER, headers);
+ HTTP_CURL_OPT(HTTPHEADER, http_request_data_copy(COPY_SLIST, headers));
}
+ } else {
+ HTTP_CURL_OPT(HTTPHEADER, NULL);
}
/* cookies, array('name' => 'value') */
if (qstr->used) {
phpstr_fix(qstr);
- HTTP_CURL_OPT(COOKIE, http_request_copystr(qstr->data));
+ HTTP_CURL_OPT(COOKIE, http_request_data_copy(COPY_STRING, qstr->data));
}
phpstr_free(qstr);
}
/* cookiestore */
if (zoption = http_curl_getopt(options, "cookiestore", IS_STRING)) {
- HTTP_CURL_OPT(COOKIEFILE, http_request_copystr(Z_STRVAL_P(zoption)));
- HTTP_CURL_OPT(COOKIEJAR, http_request_copystr(Z_STRVAL_P(zoption)));
+ HTTP_CURL_OPT(COOKIEFILE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
+ HTTP_CURL_OPT(COOKIEJAR, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
}
/* resume */
switch (body->type)
{
case HTTP_REQUEST_BODY_CSTRING:
- curl_easy_setopt(ch, CURLOPT_POSTFIELDS, (char *) body->data);
+ curl_easy_setopt(ch, CURLOPT_POSTFIELDS, body->data);
curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, body->size);
break;
break;
case HTTP_REQUEST_BODY_UPLOADFILE:
- case HTTP_REQUEST_BODY_UPLOADDATA:
- curl_easy_setopt(ch, CURLOPT_READDATA, body);
+ curl_easy_setopt(ch, CURLOPT_READDATA, http_curl_callback_data(body));
curl_easy_setopt(ch, CURLOPT_INFILESIZE, body->size);
break;
PHP_HTTP_API STATUS _http_request_exec(CURL *ch, HashTable *info TSRMLS_DC)
{
CURLcode result;
-
+
/* perform request */
if (CURLE_OK != (result = curl_easy_perform(ch))) {
http_error_ex(E_WARNING, HTTP_E_CURL, "Could not perform request: %s", curl_easy_strerror(result));
/* {{{ STATUS http_request_ex(CURL *, http_request_method, char *, http_request_body, HashTable, HashTable, phpstr *) */
PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, const char *url, http_request_body *body, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC)
{
- if (SUCCESS != http_request_init(ch, meth, url, body, options, response)) {
- return FAILURE;
+ STATUS status;
+ zend_bool clean_curl;
+
+ if ((clean_curl = (!ch))) {
+ if (!(ch = curl_easy_init())) {
+ http_error(E_WARNING, HTTP_E_CURL, "Could not initialize curl.");
+ return FAILURE;
+ }
+ }
+
+ status = ((SUCCESS == http_request_init(ch, meth, url, body, options, response)) &&
+ (SUCCESS == http_request_exec(ch, info))) ? SUCCESS : FAILURE;
+
+ if (clean_curl) {
+ curl_easy_cleanup(ch);
}
- return http_request_exec(ch, info);
+ return status;
}
/* }}} */
PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool TSRMLS_DC)
{
zend_bool free_pool;
-
+#if HTTP_DEBUG_REQPOOLS
+ fprintf(stderr, "Initializing request pool\n");
+#endif
if ((free_pool = (!pool))) {
pool = emalloc(sizeof(http_request_pool));
pool->ch = NULL;
pool->unfinished = 0;
zend_llist_init(&pool->handles, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0);
zend_llist_init(&pool->bodies, sizeof(http_request_body *), (llist_dtor_func_t) http_request_pool_freebody, 0);
-
+#if HTTP_DEBUG_REQPOOLS
+ fprintf(stderr, "Initialized request pool %p\n", pool);
+#endif
return pool;
}
/* }}} */
PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *request TSRMLS_DC)
{
getObjectEx(http_request_object, req, request);
-
- if (req->attached) {
+#if HTTP_DEBUG_REQPOOLS
+ fprintf(stderr, "Attaching request %p to pool %p\n", req, pool);
+#endif
+ if (req->pool) {
http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is already member of an HttpRequestPool");
} else {
CURLMcode code;
zval *info = GET_PROP_EX(req, request, responseInfo);
if (SUCCESS != http_request_object_requesthandler(req, request, body)) {
- efree(body);
http_error_ex(E_WARNING, HTTP_E_CURL, "Could not initialize HttpRequest object for attaching to the HttpRequestPool");
} else if (CURLM_OK != (code = curl_multi_add_handle(pool->ch, req->ch))) {
http_error_ex(E_WARNING, HTTP_E_CURL, "Could not attach HttpRequest object to the HttpRequestPool: %s", curl_multi_strerror(code));
} else {
- req->attached = 1;
+ req->pool = pool;
zval_add_ref(&request);
zend_llist_add_element(&pool->handles, &request);
zend_llist_add_element(&pool->bodies, &body);
return SUCCESS;
}
+ efree(body);
}
return FAILURE;
}
PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request TSRMLS_DC)
{
getObjectEx(http_request_object, req, request);
-
- if (!req->attached) {
- http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is not attached to an HttpRequestPool");
+#if HTTP_DEBUG_REQPOOLS
+ fprintf(stderr, "Detaching request %p (pool: %p) from pool %p\n", req, req->pool, pool);
+#endif
+ if (req->pool != pool) {
+ http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is not attached to this HttpRequestPool");
} else {
CURLMcode code;
if (CURLM_OK != (code = curl_multi_remove_handle(pool->ch, req->ch))) {
http_error_ex(E_WARNING, HTTP_E_CURL, "Could not detach HttpRequest object from the HttpRequestPool: %s", curl_multi_strerror(code));
} else {
- req->attached = 0;
+ req->pool = NULL;
zval_ptr_dtor(&request);
return SUCCESS;
}
}
/* }}} */
+/* {{{ void http_request_pool_detach_all(http_request_pool *) */
+PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_DC)
+{
+#if HTTP_DEBUG_REQPOOLS
+ fprintf(stderr, "Detaching all requests from pool %p\n", pool);
+#endif
+ zend_llist_apply_with_argument(&pool->handles, (llist_apply_with_arg_func_t) http_request_pool_freehandle, pool TSRMLS_CC);
+}
+
+
/* {{{ STATUS http_request_pool_send(http_request_pool *) */
PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC)
{
- http_request_pool_perform(pool);
- while (pool->unfinished) {
+#if HTTP_DEBUG_REQPOOLS
+ fprintf(stderr, "Attempt to send requests of pool %p\n", pool);
+#endif
+ while (http_request_pool_perform(pool)) {
+#if HTTP_DEBUG_REQPOOLS
+ fprintf(stderr, "%d unfinished requests of pool %p remaining\n", pool->unfinished, pool);
+#endif
if (SUCCESS != http_request_pool_select(pool)) {
http_error(E_WARNING, HTTP_E_CURL, "Socket error");
return FAILURE;
}
- http_request_pool_perform(pool);
}
zend_llist_apply(&pool->handles, (llist_apply_func_t) http_request_pool_responsehandler TSRMLS_CC);
return SUCCESS;
}
/* }}} */
-/*#*/
-
-/* {{{ static void http_request_pool_free_body(http_request_body *) */
-static void http_request_pool_freebody(http_request_body **body)
+/* {{{ void http_request_pool_dtor(http_request_pool *) */
+PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC)
{
- TSRMLS_FETCH();
- http_request_body_free(*body);
-}
-/* }}} */
-
-/* {{{ static void http_request_pool_responsehandler(zval **) */
-static void http_request_pool_responsehandler(zval **req TSRMLS_DC)
-{
- getObjectEx(http_request_object, obj, *req);
- http_request_object_responsehandler(obj, *req, NULL);
+#if HTTP_DEBUG_REQPOOLS
+ fprintf(stderr, "Destructing request pool %p\n", pool);
+#endif
+ pool->unfinished = 0;
+ zend_llist_clean(&pool->handles);
+ zend_llist_clean(&pool->bodies);
+ curl_multi_cleanup(pool->ch);
}
/* }}} */
-/* {{{ static inline STATUS http_request_pool_select(http_request_pool *) */
-static inline STATUS http_request_pool_select(http_request_pool *pool)
+/* {{{ STATUS http_request_pool_select(http_request_pool *) */
+PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool)
{
int MAX;
fd_set R, W, E;
}
/* }}} */
-/* {{{ static inline void http_request_pool_perform(http_request_pool *) */
-static inline void http_request_pool_perform(http_request_pool *pool)
+/* {{{ int http_request_pool_perform(http_request_pool *) */
+PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool)
{
while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished));
+ return pool->unfinished;
+}
+/* }}} */
+
+/* {{{ void http_request_pool_responsehandler(zval **) */
+void _http_request_pool_responsehandler(zval **req TSRMLS_DC)
+{
+ getObjectEx(http_request_object, obj, *req);
+#if HTTP_DEBUG_REQPOOLS
+ fprintf(stderr, "Fetching data from request %p of pool %p\n", obj, obj->pool);
+#endif
+ http_request_object_responsehandler(obj, *req, NULL);
+}
+/* }}} */
+
+/*#*/
+
+/* {{{ static void http_request_pool_freebody(http_request_body **) */
+static void http_request_pool_freebody(http_request_body **body)
+{
+ TSRMLS_FETCH();
+ http_request_body_free(*body);
+}
+/* }}} */
+
+/* {{{ static void http_request_pool_freehandle(zval **, http_request_pool *) */
+static void http_request_pool_freehandle(zval **request, http_request_pool *pool TSRMLS_DC)
+{
+ getObjectEx(http_request_object, req, *request);
+ if (req->pool) {
+ http_request_pool_detach(pool, *request);
+ }
+#if HTTP_DEBUG_REQPOOLS
+ else fprintf(stderr, "Request %p (pool: %p) is not (anymore) attached to pool %p\n", req, req->pool, pool);
+#endif
}
/* }}} */
/* {{{ static size_t http_curl_write_callback(char *, size_t, size_t, void *) */
static size_t http_curl_write_callback(char *buf, size_t len, size_t n, void *s)
{
- return s ? phpstr_append(PHPSTR(s), buf, len * n) : len * n;
+ HTTP_CURL_CALLBACK_DATA(s, phpstr *, str);
+ return str ? phpstr_append(PHPSTR(str), buf, len * n) : len * n;
}
/* }}} */
static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *s)
{
static char *offset = NULL, *original = NULL;
- http_request_body *body = (http_request_body *) s;
-
- switch (body->type)
- {
- case HTTP_REQUEST_BODY_UPLOADFILE:
- {
- TSRMLS_FETCH();
- return php_stream_read((php_stream *) body->data, data, len * n);
- }
- break;
-
- case HTTP_REQUEST_BODY_UPLOADDATA:
- {
- size_t avail;
- if (original != s) {
- original = offset = s;
- }
- if ((avail = body->size - (offset - original)) < 1) {
- return 0;
- }
- if (avail < (len * n)) {
- memcpy(data, offset, avail);
- offset += avail;
- return avail;
- } else {
- memcpy(data, offset, len * n);
- offset += len * n;
- return len * n;
- }
- }
- break;
+ HTTP_CURL_CALLBACK_DATA(s, http_request_body *, body);
- default:
- return 0;
- break;
+ if (body->type != HTTP_REQUEST_BODY_UPLOADFILE) {
+ return 0;
}
+ return php_stream_read((php_stream *) body->data, data, len * n);
+}
+/* }}} */
+
+/* {{{ http_curl_callback_ctx http_curl_callback_data(void *) */
+static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC)
+{
+ http_curl_callback_ctx *ctx = emalloc(sizeof(http_curl_callback_ctx));
+ TSRMLS_SET_CTX(ctx->tsrm_ctx);
+ ctx->data = data;
+ return ctx;
}
/* }}} */
/* {{{ static int http_curl_progress_callback(void *, double, double, double, double) */
static int http_curl_progress_callback(void *data, double dltotal, double dlnow, double ultotal, double ulnow)
{
- zval *params_pass[4], params_local[4], retval, *func = (zval *) data;
- TSRMLS_FETCH();
+ zval *params_pass[4], params_local[4], retval;
+ HTTP_CURL_CALLBACK_DATA(data, zval *, func);
params_pass[0] = ¶ms_local[0];
params_pass[1] = ¶ms_local[1];
static int http_curl_debug_callback(CURL *ch, curl_infotype type, char *string, size_t length, void *data)
{
- zval *params_pass[2], params_local[2], retval, *func = (zval *) data;
- TSRMLS_FETCH();
+ zval *params_pass[2], params_local[2], retval;
+ HTTP_CURL_CALLBACK_DATA(data, zval *, func);
params_pass[0] = ¶ms_local[0];
params_pass[1] = ¶ms_local[1];
projects / m6w6 / ext-http / blobdiff