cvs: php4 /ext/curl curl.c

fmk Thu Oct 18 15:24:56 2001 EDT Modified files: /php4/ext/curl curl.c Log: Reverting the last fix for ZTS and adding TSRMLS_FETCH() to make it work. Index: php4/ext/curl/curl.c diff -u php4/ext/curl/curl.c:1.93 php4/ext/curl/curl.c:1.94 --- php4/ext/curl/curl.c:1.93 Thu Oct 18 13:46:57 2001 +++ php4/ext/curl/curl.c Thu Oct 18 15:24:51 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curl.c,v 1.93 2001/10/18 17:46:57 fmk Exp $ */ +/* $Id: curl.c,v 1.94 2001/10/18 19:24:51 fmk Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -282,11 +282,12 @@ /* {{{ 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 @@ /* {{{ 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: