diff options
| author | Frank M. Kromann <fmk@php.net> | 2001-10-18 19:24:51 +0000 |
|---|---|---|
| committer | Frank M. Kromann <fmk@php.net> | 2001-10-18 19:24:51 +0000 |
| commit | 583b24b682cecbe3d198dee84b144fe5c0006cb0 (patch) | |
| tree | 4eb8e12fb65ccfc369f246444018d79edfa1dfec /ext/curl/curl.c | |
| parent | d682cf90cfe2af24c124a59e43a7308634103cb2 (diff) | |
| download | php-git-583b24b682cecbe3d198dee84b144fe5c0006cb0.tar.gz | |
Reverting the last fix for ZTS and adding TSRMLS_FETCH() to make it work.
Diffstat (limited to 'ext/curl/curl.c')
| -rw-r--r-- | ext/curl/curl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/curl/curl.c b/ext/curl/curl.c index e8e3dc8c89..4fd47b3978 100644 --- a/ext/curl/curl.c +++ b/ext/curl/curl.c @@ -282,11 +282,12 @@ PHP_MSHUTDOWN_FUNCTION(curl) /* {{{ curl_write */ -static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx TSRMLS_DC) +static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx) { php_curl *ch = (php_curl *) ctx; php_curl_write *t = ch->handlers->write; size_t length = size * nmemb; + TSRMLS_FETCH(); switch (t->method) { case PHP_CURL_STDOUT: @@ -392,12 +393,13 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx) /* {{{ curl_write_header */ -static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx TSRMLS_DC) +static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx) { php_curl *ch = (php_curl *) ctx; php_curl_write *t = ch->handlers->write_header; int error; int length; + TSRMLS_FETCH(); switch (t->method) { case PHP_CURL_STDOUT: |