archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

remove the thread ctx from curl

Browse source
This commit is contained in:
Anatol Belski 2014-12-17 11:38:46 +01:00
parent 386cb177bd
commit 3b6a8b1163
2 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/curl/interface.c
View file

@ -1290,7 +1290,6 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
php_curl *ch = (php_curl *) ctx; php_curl *ch = (php_curl *) ctx;
php_curl_write *t = ch->handlers->write; php_curl_write *t = ch->handlers->write;
size_t length = size * nmemb; size_t length = size * nmemb;
TSRMLS_FETCH_FROM_CTX(ch->thread_ctx);
#if PHP_CURL_DEBUG #if PHP_CURL_DEBUG
fprintf(stderr, "curl_write() called\n"); fprintf(stderr, "curl_write() called\n");
@ -1365,7 +1364,6 @@ static int curl_fnmatch(void *ctx, const char *pattern, const char *string)
zval retval; zval retval;
int error; int error;
zend_fcall_info fci; zend_fcall_info fci;
TSRMLS_FETCH_FROM_CTX(ch->thread_ctx);
ZVAL_RES(&argv[0], ch->res); ZVAL_RES(&argv[0], ch->res);
Z_ADDREF(argv[0]); Z_ADDREF(argv[0]);
@ -1423,7 +1421,6 @@ static size_t curl_progress(void *clientp, double dltotal, double dlnow, double
zval retval; zval retval;
int error; int error;
zend_fcall_info fci; zend_fcall_info fci;
TSRMLS_FETCH_FROM_CTX(ch->thread_ctx);
ZVAL_RES(&argv[0], ch->res); ZVAL_RES(&argv[0], ch->res);
Z_ADDREF(argv[0]); Z_ADDREF(argv[0]);
@ -1486,7 +1483,6 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
zval retval; zval retval;
int error; int error;
zend_fcall_info fci; zend_fcall_info fci;
TSRMLS_FETCH_FROM_CTX(ch->thread_ctx);
ZVAL_RES(&argv[0], ch->res); ZVAL_RES(&argv[0], ch->res);
Z_ADDREF(argv[0]); Z_ADDREF(argv[0]);
@ -1538,7 +1534,6 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx
php_curl *ch = (php_curl *) ctx; php_curl *ch = (php_curl *) ctx;
php_curl_write *t = ch->handlers->write_header; php_curl_write *t = ch->handlers->write_header;
size_t length = size * nmemb; size_t length = size * nmemb;
TSRMLS_FETCH_FROM_CTX(ch->thread_ctx);
switch (t->method) { switch (t->method) {
case PHP_CURL_STDOUT: case PHP_CURL_STDOUT:
@ -1628,7 +1623,6 @@ static size_t curl_passwd(void *ctx, char *prompt, char *buf, int buflen)
zval retval; zval retval;
int error; int error;
int ret = -1; int ret = -1;
TSRMLS_FETCH_FROM_CTX(ch->thread_ctx);
ZVAL_RES(&argv[0], ch->res); ZVAL_RES(&argv[0], ch->res);
Z_ADDREF(argv[0]); Z_ADDREF(argv[0]);
@ -1882,7 +1876,6 @@ PHP_FUNCTION(curl_init)
} }
ch = alloc_curl_handle(); ch = alloc_curl_handle();
TSRMLS_SET_CTX(ch->thread_ctx);
ch->cp = cp; ch->cp = cp;
@ -1925,7 +1918,6 @@ PHP_FUNCTION(curl_copy_handle)
} }
dupch = alloc_curl_handle(); dupch = alloc_curl_handle();
TSRMLS_SET_CTX(dupch->thread_ctx);
dupch->cp = cp; dupch->cp = cp;
Z_ADDREF_P(zid); Z_ADDREF_P(zid);

1
ext/curl/php_curl.h
View file

@ -174,7 +174,6 @@ typedef struct {
struct _php_curl_error err; struct _php_curl_error err;
struct _php_curl_free *to_free; struct _php_curl_free *to_free;
struct _php_curl_send_headers header; struct _php_curl_send_headers header;
void ***thread_ctx;
CURL *cp; CURL *cp;
php_curl_handlers *handlers; php_curl_handlers *handlers;
zend_resource *res; zend_resource *res;