[PHP-CVS] cvs: php4 /ext/curl curl.c php_curl.h

[Sterling Hughes]

sterling                Fri Jan 12 02:49:39 2001 EDT

  Modified files:              
    /php4/ext/curl      php_curl.h curl.c 
  Log:
  Make daniel's changes work in ZTS mode...
  
  
  
Index: php4/ext/curl/php_curl.h
diff -u php4/ext/curl/php_curl.h:1.15 php4/ext/curl/php_curl.h:1.16
--- php4/ext/curl/php_curl.h:1.15       Fri Jan 12 02:26:29 2001
+++ php4/ext/curl/php_curl.h    Fri Jan 12 02:49:38 2001
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_curl.h,v 1.15 2001/01/12 10:26:29 dbeu Exp $ */
+/* $Id: php_curl.h,v 1.16 2001/01/12 10:49:38 sterling Exp $ */
 
 #ifndef _PHP_CURL_H
 #define _PHP_CURL_H
@@ -58,16 +58,6 @@
        CURL *cp;
        zend_llist to_free;
 } php_curl;
-
-
-
-#ifdef ZTS
-#define CURLG(v) (curl_globals->v)
-#define CURLLS_FETCH() php_curl_globals *curl_globals = ts_resource(curl_globals_id)
-#else
-#define CURLG(v) (curl_globals.v)
-#define CURLLS_FETCH()
-#endif
 
 
 #else
Index: php4/ext/curl/curl.c
diff -u php4/ext/curl/curl.c:1.34 php4/ext/curl/curl.c:1.35
--- php4/ext/curl/curl.c:1.34   Wed Jan  3 08:07:55 2001
+++ php4/ext/curl/curl.c        Fri Jan 12 02:49:38 2001
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: curl.c,v 1.34 2001/01/03 16:07:55 sniper Exp $ */
+/* $Id: curl.c,v 1.35 2001/01/12 10:49:38 sterling Exp $ */
 
 
 #include "php.h"
@@ -48,12 +48,6 @@
 #include "ext/standard/file.h"
 #include "php_curl.h"
 
-#ifdef ZTS
-int curl_globals_id;
-#else
-php_curl_globals curl_globals;
-#endif
-
 static int le_curl;
 
 static void _php_curl_close(zend_rsrc_list_entry *rsrc);
@@ -315,7 +309,7 @@
 
                urlstr = estrndup(Z_STRVAL_PP(url), Z_STRLEN_PP(url));
                curl_easy_setopt(curl_handle->cp, CURLOPT_URL, urlstr);
-               zend_llist_add_element(&curl_handle->to_free,&urlstr);
+               zend_llist_add_element(&curl_handle->to_free, &urlstr);
        }
 
        curl_easy_setopt(curl_handle->cp, CURLOPT_NOPROGRESS, 1);
@@ -383,7 +377,7 @@
                                copystr = estrndup(Z_STRVAL_PP(curl_value), 
Z_STRLEN_PP(curl_value));
                                
                                ret = curl_easy_setopt(curl_handle->cp, option, 
copystr);
-                               zend_llist_add_element(&curl_handle->to_free,&copystr);
+                               zend_llist_add_element(&curl_handle->to_free, 
+&copystr);
                        }
                        break;
                        



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]