Reverting the last fix for ZTS and adding TSRMLS_FETCH() to make it work.

diff --git a/ext/curl/curl.c b/ext/curl/curl.c
index e8e3dc8c8955356dbe1f76fbff35a90b52b94aa1..4fd47b3978b6be9c98f193006641c2744131ca86 100644 (file)
--- 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: