cvs: php4 /ext/curl interface.c php_curl.h
| From: | Sterling Hughes | Date: | Sun, 27 Apr 2003 22:15:20 +0000 |
| Subject: | cvs: php4 /ext/curl interface.c php_curl.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20531@lists.php.net to get a copy of this message | ||
sterling Sun Apr 27 18:15:20 2003 EDT
Modified files:
/php4/ext/curl interface.c php_curl.h
Log:
use the new TSRMLS_FETCH_FROM_CTX() macro
Index: php4/ext/curl/interface.c
diff -u php4/ext/curl/interface.c:1.12 php4/ext/curl/interface.c:1.13
--- php4/ext/curl/interface.c:1.12 Mon Mar 17 10:06:11 2003
+++ php4/ext/curl/interface.c Sun Apr 27 18:15:19 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.12 2003/03/17 15:06:11 sniper Exp $ */
+/* $Id: interface.c,v 1.13 2003/04/27 22:15:19 sterling Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -365,7 +365,7 @@
php_curl *ch = (php_curl *) ctx;
php_curl_write *t = ch->handlers->write;
size_t length = size * nmemb;
- TSRMLS_FETCH();
+ TSRMLS_FETCH_FROM_CTX(ch->thread_ctx);
#if PHP_CURL_DEBUG
fprintf(stderr, "curl_write() called\n");
@@ -385,7 +385,6 @@
zval *argv[2];
zval *retval;
int error;
- TSRMLS_FETCH();
MAKE_STD_ZVAL(argv[0]);
MAKE_STD_ZVAL(argv[1]);
@@ -434,7 +433,7 @@
zval *retval;
int length;
int error;
- TSRMLS_FETCH();
+ TSRMLS_FETCH_FROM_CTX(ch->thread_ctx);
MAKE_STD_ZVAL(argv[0]);
MAKE_STD_ZVAL(argv[1]);
@@ -475,7 +474,7 @@
php_curl *ch = (php_curl *) ctx;
php_curl_write *t = ch->handlers->write_header;
size_t length = size * nmemb;
- TSRMLS_FETCH();
+ TSRMLS_FETCH_FROM_CTX(ch->thread_ctx);
switch (t->method) {
case PHP_CURL_STDOUT:
@@ -493,7 +492,6 @@
zval *argv[2];
zval *retval;
int error;
- TSRMLS_FETCH();
MAKE_STD_ZVAL(argv[0]);
MAKE_STD_ZVAL(argv[1]);
@@ -533,7 +531,7 @@
zval *retval = NULL;
int error;
int ret = 0;
- TSRMLS_FETCH();
+ TSRMLS_FETCH_FROM_CTX(ch->thread_ctx);
MAKE_STD_ZVAL(argv[0]);
MAKE_STD_ZVAL(argv[1]);
@@ -663,13 +661,14 @@
}
alloc_curl_handle(&ch);
-
+ ch->thread_ctx = TSRMLS_C;
+
ch->cp = curl_easy_init();
if (!ch->cp) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize a new cURL handle");
RETURN_FALSE;
}
-
+
ch->handlers->write->method = PHP_CURL_STDOUT;
ch->handlers->write->type = PHP_CURL_ASCII;
ch->handlers->read->method = PHP_CURL_DIRECT;
Index: php4/ext/curl/php_curl.h
diff -u php4/ext/curl/php_curl.h:1.31 php4/ext/curl/php_curl.h:1.32
--- php4/ext/curl/php_curl.h:1.31 Tue Dec 31 11:06:21 2002
+++ php4/ext/curl/php_curl.h Sun Apr 27 18:15:19 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_curl.h,v 1.31 2002/12/31 16:06:21 sebastian Exp $ */
+/* $Id: php_curl.h,v 1.32 2003/04/27 22:15:19 sterling Exp $ */
#ifndef _PHP_CURL_H
#define _PHP_CURL_H
@@ -113,6 +113,7 @@
typedef struct {
struct _php_curl_error err;
struct _php_curl_free to_free;
+ void ***thread_ctx;
CURL *cp;
php_curl_handlers *handlers;
long id;