felipe          Sat Aug  2 04:46:08 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2        zend_API.c zend_API.h zend_builtin_functions.c 
    /php-src/ext/filter callback_filter.c 
    /php-src/ext/interbase      ibase_events.c php_ibase_udf.c 
    /php-src/ext/ldap   ldap.c 
    /php-src/ext/mysqli mysqli_api.c 
    /php-src/ext/pcntl  pcntl.c 
    /php-src/ext/pcre   php_pcre.c 
    /php-src/ext/pdo    pdo_stmt.c 
    /php-src/ext/pdo_sqlite     sqlite_driver.c 
    /php-src/ext/readline       readline.c 
    /php-src/ext/session        session.c 
    /php-src/ext/spl    spl_iterators.c 
    /php-src/ext/sqlite sqlite.c 
    /php-src/ext/sqlite3        sqlite3.c 
    /php-src/ext/standard       array.c basic_functions.c type.c 
    /php-src/ext/xmlrpc xmlrpc-epi-php.c 
    /php-src/main       output.c 
  Log:
  - MFH: Added parameter TSRMLS_DC in zend_is_callable()
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.296.2.27.2.34.2.45&r2=1.296.2.27.2.34.2.46&diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.296.2.27.2.34.2.45 
ZendEngine2/zend_API.c:1.296.2.27.2.34.2.46
--- ZendEngine2/zend_API.c:1.296.2.27.2.34.2.45 Sat Aug  2 02:50:18 2008
+++ ZendEngine2/zend_API.c      Sat Aug  2 04:46:05 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_API.c,v 1.296.2.27.2.34.2.45 2008/08/02 02:50:18 felipe Exp $ */
+/* $Id: zend_API.c,v 1.296.2.27.2.34.2.46 2008/08/02 04:46:05 felipe Exp $ */
 
 #include "zend.h"
 #include "zend_execute.h"
@@ -2746,10 +2746,8 @@
 }
 /* }}} */
 
-ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, char 
**callable_name) /* {{{ */
+ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, char 
**callable_name TSRMLS_DC) /* {{{ */
 {
-       TSRMLS_FETCH();
-
        return zend_is_callable_ex(callable, NULL, check_flags, callable_name, 
NULL, NULL, NULL TSRMLS_CC);
 }
 /* }}} */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.h?r1=1.207.2.8.2.8.2.15&r2=1.207.2.8.2.8.2.16&diff_format=u
Index: ZendEngine2/zend_API.h
diff -u ZendEngine2/zend_API.h:1.207.2.8.2.8.2.15 
ZendEngine2/zend_API.h:1.207.2.8.2.8.2.16
--- ZendEngine2/zend_API.h:1.207.2.8.2.8.2.15   Sat Jul 26 13:14:00 2008
+++ ZendEngine2/zend_API.h      Sat Aug  2 04:46:05 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_API.h,v 1.207.2.8.2.8.2.15 2008/07/26 13:14:00 dmitry Exp $ */
+/* $Id: zend_API.h,v 1.207.2.8.2.8.2.16 2008/08/02 04:46:05 felipe Exp $ */
 
 #ifndef ZEND_API_H
 #define ZEND_API_H
@@ -278,7 +278,7 @@
 #define IS_CALLABLE_STRICT  (IS_CALLABLE_CHECK_IS_STATIC)
 
 ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval **object_pp, uint 
check_flags, char **callable_name, int *callable_name_len, 
zend_fcall_info_cache *fcc, char **error TSRMLS_DC);
-ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, char 
**callable_name);
+ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, char 
**callable_name TSRMLS_DC);
 ZEND_API zend_bool zend_make_callable(zval *callable, char **callable_name 
TSRMLS_DC);
 ZEND_API const char *zend_get_module_version(const char *module_name);
 ZEND_API int zend_get_module_started(char *module_name);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.277.2.12.2.25.2.26&r2=1.277.2.12.2.25.2.27&diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.26 
ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.27
--- ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.26   Thu Jul 24 
20:44:15 2008
+++ ZendEngine2/zend_builtin_functions.c        Sat Aug  2 04:46:05 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.26 2008/07/24 20:44:15 
moriyoshi Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.27 2008/08/02 04:46:05 
felipe Exp $ */
 
 #include "zend.h"
 #include "zend_API.h"
@@ -1506,7 +1506,7 @@
                return;
        }
 
-       if (!zend_is_callable(error_handler, 0, &error_handler_name)) {
+       if (!zend_is_callable(error_handler, 0, &error_handler_name TSRMLS_CC)) 
{
                zend_error(E_WARNING, "%s() expects the argument (%s) to be a 
valid callback",
                                   get_active_function_name(TSRMLS_C), 
error_handler_name?error_handler_name:"unknown");
                efree(error_handler_name);
@@ -1578,7 +1578,7 @@
        }
 
        if (Z_TYPE_P(exception_handler) != IS_NULL) { /* NULL == unset */
-               if (!zend_is_callable(exception_handler, 0, 
&exception_handler_name)) {
+               if (!zend_is_callable(exception_handler, 0, 
&exception_handler_name TSRMLS_CC)) {
                        zend_error(E_WARNING, "%s() expects the argument (%s) 
to be a valid callback",
                                           get_active_function_name(TSRMLS_C), 
exception_handler_name?exception_handler_name:"unknown");
                        efree(exception_handler_name);
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/callback_filter.c?r1=1.9.2.4.2.1&r2=1.9.2.4.2.2&diff_format=u
Index: php-src/ext/filter/callback_filter.c
diff -u php-src/ext/filter/callback_filter.c:1.9.2.4.2.1 
php-src/ext/filter/callback_filter.c:1.9.2.4.2.2
--- php-src/ext/filter/callback_filter.c:1.9.2.4.2.1    Mon Dec 31 07:17:08 2007
+++ php-src/ext/filter/callback_filter.c        Sat Aug  2 04:46:05 2008
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: callback_filter.c,v 1.9.2.4.2.1 2007/12/31 07:17:08 sebastian Exp $ */
+/* $Id: callback_filter.c,v 1.9.2.4.2.2 2008/08/02 04:46:05 felipe Exp $ */
 
 #include "php_filter.h"
 
@@ -26,7 +26,7 @@
        zval ***args;
        int status;
 
-       if (!option_array || !zend_is_callable(option_array, 
IS_CALLABLE_CHECK_NO_ACCESS, NULL)) {
+       if (!option_array || !zend_is_callable(option_array, 
IS_CALLABLE_CHECK_NO_ACCESS, NULL TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "First argument is 
expected to be a valid callback");
                zval_dtor(value);
                Z_TYPE_P(value) = IS_NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/ibase_events.c?r1=1.8.2.1.2.1.2.1&r2=1.8.2.1.2.1.2.2&diff_format=u
Index: php-src/ext/interbase/ibase_events.c
diff -u php-src/ext/interbase/ibase_events.c:1.8.2.1.2.1.2.1 
php-src/ext/interbase/ibase_events.c:1.8.2.1.2.1.2.2
--- php-src/ext/interbase/ibase_events.c:1.8.2.1.2.1.2.1        Mon Dec 31 
07:17:09 2007
+++ php-src/ext/interbase/ibase_events.c        Sat Aug  2 04:46:05 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ibase_events.c,v 1.8.2.1.2.1.2.1 2007/12/31 07:17:09 sebastian Exp $ */
+/* $Id: ibase_events.c,v 1.8.2.1.2.1.2.2 2008/08/02 04:46:05 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -304,7 +304,7 @@
        }
 
        /* get the callback */
-       if (!zend_is_callable(*cb_arg, 0, NULL)) {
+       if (!zend_is_callable(*cb_arg, 0, NULL TSRMLS_CC)) {
                _php_ibase_module_error("Callback argument %s is not a callable 
function"
                        TSRMLS_CC, Z_STRVAL_PP(cb_arg));
                RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/php_ibase_udf.c?r1=1.9.2.1.2.2.2.1&r2=1.9.2.1.2.2.2.2&diff_format=u
Index: php-src/ext/interbase/php_ibase_udf.c
diff -u php-src/ext/interbase/php_ibase_udf.c:1.9.2.1.2.2.2.1 
php-src/ext/interbase/php_ibase_udf.c:1.9.2.1.2.2.2.2
--- php-src/ext/interbase/php_ibase_udf.c:1.9.2.1.2.2.2.1       Mon Dec 31 
07:17:09 2007
+++ php-src/ext/interbase/php_ibase_udf.c       Sat Aug  2 04:46:05 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_ibase_udf.c,v 1.9.2.1.2.2.2.1 2007/12/31 07:17:09 sebastian Exp $ 
*/
+/* $Id: php_ibase_udf.c,v 1.9.2.1.2.2.2.2 2008/08/02 04:46:05 felipe Exp $ */
 
 /**
 * This UDF library adds the ability to call PHP functions from SQL
@@ -192,10 +192,14 @@
                INIT_ZVAL(callback);
                ZVAL_STRING(&callback,name,0);
 
+               LOCK();
+               
                /* check if the requested function exists */
-               if (!zend_is_callable(&callback, 0, NULL)) {
+               if (!zend_is_callable(&callback, 0, NULL TSRMLS_CC)) {
                        break;
                }
+               
+               UNLOCK();
        
                /* create the argument array */
                for (i = 0; i < argc; ++i) {
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.11.2.17&r2=1.161.2.3.2.11.2.18&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.17 
php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.18
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.17 Wed Jul 16 13:41:35 2008
+++ php-src/ext/ldap/ldap.c     Sat Aug  2 04:46:05 2008
@@ -23,7 +23,7 @@
    +----------------------------------------------------------------------+
  */
  
-/* $Id: ldap.c,v 1.161.2.3.2.11.2.17 2008/07/16 13:41:35 felipe Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.11.2.18 2008/08/02 04:46:05 felipe Exp $ */
 #define IS_EXT_MODULE
 
 #ifdef HAVE_CONFIG_H
@@ -224,7 +224,7 @@
 
        php_info_print_table_start();
        php_info_print_table_row(2, "LDAP Support", "enabled");
-       php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 
1.161.2.3.2.11.2.17 2008/07/16 13:41:35 felipe Exp $");
+       php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 
1.161.2.3.2.11.2.18 2008/08/02 04:46:05 felipe Exp $");
 
        if (LDAPG(max_links) == -1) {
                snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -2132,7 +2132,7 @@
        }
 
        /* callable? */
-       if (!zend_is_callable(callback, 0, &callback_name)) {
+       if (!zend_is_callable(callback, 0, &callback_name TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Two arguments 
expected for '%s' to be a valid callback", callback_name);
                efree(callback_name);
                RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.19&r2=1.118.2.22.2.16.2.20&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.19 
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.20
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.19        Fri Jul 25 
12:46:03 2008
+++ php-src/ext/mysqli/mysqli_api.c     Sat Aug  2 04:46:06 2008
@@ -17,7 +17,7 @@
   |          Ulf Wendel <[EMAIL PROTECTED]>                                    
 |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_api.c,v 1.118.2.22.2.16.2.19 2008/07/25 12:46:03 andrey Exp $ 
+  $Id: mysqli_api.c,v 1.118.2.22.2.16.2.20 2008/08/02 04:46:06 felipe Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1420,7 +1420,7 @@
        MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", 
MYSQLI_STATUS_VALID);
 
        /* check callback function */
-       if (!zend_is_callable(callback_func, 0, &callback_name)) {
+       if (!zend_is_callable(callback_func, 0, &callback_name TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not a valid 
callback function %s", callback_name);
                efree(callback_name);
                RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.48.2.2.2.4.2.7&r2=1.48.2.2.2.4.2.8&diff_format=u
Index: php-src/ext/pcntl/pcntl.c
diff -u php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.7 
php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.8
--- php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.7  Tue Jul 29 16:59:10 2008
+++ php-src/ext/pcntl/pcntl.c   Sat Aug  2 04:46:06 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: pcntl.c,v 1.48.2.2.2.4.2.7 2008/07/29 16:59:10 lbarnaud Exp $ */
+/* $Id: pcntl.c,v 1.48.2.2.2.4.2.8 2008/08/02 04:46:06 felipe Exp $ */
 
 #define PCNTL_DEBUG 0
 
@@ -728,7 +728,7 @@
                RETURN_TRUE;
        }
        
-       if (!zend_is_callable(handle, 0, &func_name)) {
+       if (!zend_is_callable(handle, 0, &func_name TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s is not a 
callable function name error", func_name);
                efree(func_name);
                RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.18&r2=1.168.2.9.2.21.2.19&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.18 
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.19
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.18     Mon Jul 14 09:49:02 2008
+++ php-src/ext/pcre/php_pcre.c Sat Aug  2 04:46:06 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.18 2008/07/14 09:49:02 dmitry Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.19 2008/08/02 04:46:06 felipe Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -1315,7 +1315,7 @@
        if (Z_TYPE_PP(replace) != IS_ARRAY && (Z_TYPE_PP(replace) != IS_OBJECT 
|| !is_callable_replace))
                convert_to_string_ex(replace);
        if (is_callable_replace) {
-               if (!zend_is_callable(*replace, 0, &callback_name)) {
+               if (!zend_is_callable(*replace, 0, &callback_name TSRMLS_CC)) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Requires 
argument 2, '%s', to be a valid callback", callback_name);
                        efree(callback_name);
                        *return_value = **subject;
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.20&r2=1.118.2.38.2.24.2.21&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.20 
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.21
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.20     Fri Jul 25 09:44:47 2008
+++ php-src/ext/pdo/pdo_stmt.c  Sat Aug  2 04:46:06 2008
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.20 2008/07/25 09:44:47 dmitry Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.21 2008/08/02 04:46:06 felipe Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -809,7 +809,7 @@
                method = &callable;
        }
        
-       if (!method || !zend_is_callable(callable, 0, &fname)) {
+       if (!method || !zend_is_callable(callable, 0, &fname TSRMLS_CC)) {
                pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied 
function must be a valid callback" TSRMLS_CC);
                if (fname) {
                        efree(fname);
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_driver.c?r1=1.20.2.5.2.2.2.2&r2=1.20.2.5.2.2.2.3&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_driver.c
diff -u php-src/ext/pdo_sqlite/sqlite_driver.c:1.20.2.5.2.2.2.2 
php-src/ext/pdo_sqlite/sqlite_driver.c:1.20.2.5.2.2.2.3
--- php-src/ext/pdo_sqlite/sqlite_driver.c:1.20.2.5.2.2.2.2     Mon Dec 31 
07:17:12 2007
+++ php-src/ext/pdo_sqlite/sqlite_driver.c      Sat Aug  2 04:46:06 2008
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: sqlite_driver.c,v 1.20.2.5.2.2.2.2 2007/12/31 07:17:12 sebastian Exp $ 
*/
+/* $Id: sqlite_driver.c,v 1.20.2.5.2.2.2.3 2008/08/02 04:46:06 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -479,7 +479,7 @@
        dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
        PDO_CONSTRUCT_CHECK;
 
-       if (!zend_is_callable(callback, 0, &cbname)) {
+       if (!zend_is_callable(callback, 0, &cbname TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "function '%s' is 
not callable", cbname);
                efree(cbname);
                RETURN_FALSE;
@@ -551,13 +551,13 @@
        dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
        PDO_CONSTRUCT_CHECK;
 
-       if (!zend_is_callable(step_callback, 0, &cbname)) {
+       if (!zend_is_callable(step_callback, 0, &cbname TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "function '%s' is 
not callable", cbname);
                efree(cbname);
                RETURN_FALSE;
        }
        efree(cbname);
-       if (!zend_is_callable(fini_callback, 0, &cbname)) {
+       if (!zend_is_callable(fini_callback, 0, &cbname TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "function '%s' is 
not callable", cbname);
                efree(cbname);
                RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/readline/readline.c?r1=1.42.2.3.2.3.2.4&r2=1.42.2.3.2.3.2.5&diff_format=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.42.2.3.2.3.2.4 
php-src/ext/readline/readline.c:1.42.2.3.2.3.2.5
--- php-src/ext/readline/readline.c:1.42.2.3.2.3.2.4    Mon Jul 14 17:50:47 2008
+++ php-src/ext/readline/readline.c     Sat Aug  2 04:46:06 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: readline.c,v 1.42.2.3.2.3.2.4 2008/07/14 17:50:47 felipe Exp $ */
+/* $Id: readline.c,v 1.42.2.3.2.3.2.5 2008/08/02 04:46:06 felipe Exp $ */
 
 /* {{{ includes & prototypes */
 
@@ -499,7 +499,7 @@
                RETURN_FALSE;
        }
 
-       if (!zend_is_callable(arg, 0, &name)) {
+       if (!zend_is_callable(arg, 0, &name TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s is not 
callable", name);
                efree(name);
                RETURN_FALSE;
@@ -551,7 +551,7 @@
                return;
        }
 
-       if (!zend_is_callable(callback, 0, &name)) {
+       if (!zend_is_callable(callback, 0, &name TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s is not 
callable", name);
                RETURN_FALSE;
        }
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.40.2.10&r2=1.417.2.8.2.40.2.11&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.8.2.40.2.10 
php-src/ext/session/session.c:1.417.2.8.2.40.2.11
--- php-src/ext/session/session.c:1.417.2.8.2.40.2.10   Fri Jun 27 16:16:23 2008
+++ php-src/ext/session/session.c       Sat Aug  2 04:46:06 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: session.c,v 1.417.2.8.2.40.2.10 2008/06/27 16:16:23 felipe Exp $ */
+/* $Id: session.c,v 1.417.2.8.2.40.2.11 2008/08/02 04:46:06 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1583,7 +1583,7 @@
        }
        
        for (i = 0; i < 6; i++) {
-               if (!zend_is_callable(*args[i], 0, &name)) {
+               if (!zend_is_callable(*args[i], 0, &name TSRMLS_CC)) {
                        efree(args);
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument 
%d is not a valid callback", i+1);
                        efree(name);
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.28.2.11&r2=1.73.2.30.2.28.2.12&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.11 
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.12
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.11 Tue Jul 29 11:50:05 2008
+++ php-src/ext/spl/spl_iterators.c     Sat Aug  2 04:46:06 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.11 2008/07/29 11:50:05 dmitry Exp $ 
*/
+/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.12 2008/08/02 04:46:06 felipe Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1183,7 +1183,7 @@
        intern = (spl_dual_it_object*)zend_object_store_get_object(getThis() 
TSRMLS_CC);
 
        ZVAL_STRING(&func, method, 0);
-       if (!zend_is_callable(&func, 0, &method)) {
+       if (!zend_is_callable(&func, 0, &method TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_ERROR, "Method %s::%s() does 
not exist", intern->inner.ce->name, method);
                return FAILURE;
        }
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.166.2.13.2.9.2.9&r2=1.166.2.13.2.9.2.10&diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.9 
php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.10
--- php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.9      Fri Jul 25 08:23:07 2008
+++ php-src/ext/sqlite/sqlite.c Sat Aug  2 04:46:06 2008
@@ -17,7 +17,7 @@
    |          Marcus Boerger <[EMAIL PROTECTED]>                              |
    +----------------------------------------------------------------------+
 
-   $Id: sqlite.c,v 1.166.2.13.2.9.2.9 2008/07/25 08:23:07 dmitry Exp $
+   $Id: sqlite.c,v 1.166.2.13.2.9.2.10 2008/08/02 04:46:06 felipe Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1520,7 +1520,7 @@
 {
        php_info_print_table_start();
        php_info_print_table_header(2, "SQLite support", "enabled");
-       php_info_print_table_row(2, "PECL Module version", 
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.9.2.9 2008/07/25 
08:23:07 dmitry Exp $");
+       php_info_print_table_row(2, "PECL Module version", 
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.9.2.10 2008/08/02 
04:46:06 felipe Exp $");
        php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
        php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
        php_info_print_table_end();
@@ -3354,14 +3354,14 @@
                DB_FROM_ZVAL(db, &zdb);
        }
 
-       if (!zend_is_callable(zstep, 0, &callable)) {
+       if (!zend_is_callable(zstep, 0, &callable TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "step function `%s' 
is not callable", callable);
                efree(callable);
                return;
        }
        efree(callable);
 
-       if (!zend_is_callable(zfinal, 0, &callable)) {
+       if (!zend_is_callable(zfinal, 0, &callable TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "finalize function 
`%s' is not callable", callable);
                efree(callable);
                return;
@@ -3405,7 +3405,7 @@
                DB_FROM_ZVAL(db, &zdb);
        }
 
-       if (!zend_is_callable(zcall, 0, &callable)) {
+       if (!zend_is_callable(zcall, 0, &callable TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "function `%s' is 
not callable", callable);
                efree(callable);
                return;
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.1.2.8&r2=1.1.2.9&diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.1.2.8 
php-src/ext/sqlite3/sqlite3.c:1.1.2.9
--- php-src/ext/sqlite3/sqlite3.c:1.1.2.8       Fri Aug  1 08:27:56 2008
+++ php-src/ext/sqlite3/sqlite3.c       Sat Aug  2 04:46:06 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: sqlite3.c,v 1.1.2.8 2008/08/01 08:27:56 tony2001 Exp $ */
+/* $Id: sqlite3.c,v 1.1.2.9 2008/08/02 04:46:06 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -776,7 +776,7 @@
                RETURN_FALSE;
        }
 
-       if (!zend_is_callable(callback_func, 0, &callback_name)) {
+       if (!zend_is_callable(callback_func, 0, &callback_name TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not a valid 
callback function %s", callback_name);
                efree(callback_name);
                RETURN_FALSE;
@@ -827,14 +827,14 @@
                RETURN_FALSE;
        }
 
-       if (!zend_is_callable(step_callback, 0, &callback_name)) {
+       if (!zend_is_callable(step_callback, 0, &callback_name TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not a valid 
callback function %s", callback_name);
                efree(callback_name);
                RETURN_FALSE;
        }
        efree(callback_name);
 
-       if (!zend_is_callable(fini_callback, 0, &callback_name)) {
+       if (!zend_is_callable(fini_callback, 0, &callback_name TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not a valid 
callback function %s", callback_name);
                efree(callback_name);
                RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.38&r2=1.308.2.21.2.37.2.39&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.38 
php-src/ext/standard/array.c:1.308.2.21.2.37.2.39
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.38   Thu Jul 31 20:18:17 2008
+++ php-src/ext/standard/array.c        Sat Aug  2 04:46:06 2008
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: array.c,v 1.308.2.21.2.37.2.38 2008/07/31 20:18:17 johannes Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.39 2008/08/02 04:46:06 felipe Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -616,7 +616,7 @@
 
 /* check if comparison function is valid */
 #define PHP_ARRAY_CMP_FUNC_CHECK(func_name)    \
-       if (!zend_is_callable(*func_name, 0, NULL)) {   \
+       if (!zend_is_callable(*func_name, 0, NULL TSRMLS_CC)) { \
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid comparison 
function");     \
                BG(user_compare_fci) = old_user_compare_fci; \
                BG(user_compare_fci_cache) = old_user_compare_fci_cache; \
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.43&r2=1.725.2.31.2.64.2.44&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.43 
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.44
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.43 Thu Jul 31 
20:18:17 2008
+++ php-src/ext/standard/basic_functions.c      Sat Aug  2 04:46:07 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.43 2008/07/31 20:18:17 johannes 
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.44 2008/08/02 04:46:07 felipe 
Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -5289,7 +5289,7 @@
        zval retval;
        char *function_name;
 
-       if (!zend_is_callable(shutdown_function_entry->arguments[0], 0, 
&function_name)) {
+       if (!zend_is_callable(shutdown_function_entry->arguments[0], 0, 
&function_name TSRMLS_CC)) {
                php_error(E_WARNING, "(Registered shutdown functions) Unable to 
call %s() - function does not exist", function_name);
                if (function_name) {
                        efree(function_name);
@@ -5434,7 +5434,7 @@
        }
 
        /* Prevent entering of anything but valid callback (syntax check only!) 
*/
-       if (!zend_is_callable(shutdown_function_entry.arguments[0], 0, 
&function_name)) {
+       if (!zend_is_callable(shutdown_function_entry.arguments[0], 0, 
&function_name TSRMLS_CC)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid shutdown 
callback '%s' passed", function_name);
                efree(shutdown_function_entry.arguments);
                RETVAL_FALSE;
@@ -6021,7 +6021,7 @@
                RETURN_FALSE;
        }
 
-       if (!zend_is_callable(tick_fe.arguments[0], 0, &function_name)) {
+       if (!zend_is_callable(tick_fe.arguments[0], 0, &function_name 
TSRMLS_CC)) {
                efree(tick_fe.arguments);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid tick 
callback '%s' passed", function_name);
                efree(function_name);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/type.c?r1=1.30.2.2.2.3.2.7&r2=1.30.2.2.2.3.2.8&diff_format=u
Index: php-src/ext/standard/type.c
diff -u php-src/ext/standard/type.c:1.30.2.2.2.3.2.7 
php-src/ext/standard/type.c:1.30.2.2.2.3.2.8
--- php-src/ext/standard/type.c:1.30.2.2.2.3.2.7        Sun Jun 22 11:36:46 2008
+++ php-src/ext/standard/type.c Sat Aug  2 04:46:07 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: type.c,v 1.30.2.2.2.3.2.7 2008/06/22 11:36:46 felipe Exp $ */
+/* $Id: type.c,v 1.30.2.2.2.3.2.8 2008/08/02 04:46:07 felipe Exp $ */
 
 #include "php.h"
 #include "php_incomplete_class.h"
@@ -368,11 +368,11 @@
 
        syntax_only = syntax_only ? IS_CALLABLE_CHECK_SYNTAX_ONLY : 0;
        if (ZEND_NUM_ARGS() > 2) {
-               retval = zend_is_callable(var, syntax_only, &name);
+               retval = zend_is_callable(var, syntax_only, &name TSRMLS_CC);
                zval_dtor(*callable_name);
                ZVAL_STRING(*callable_name, name, 0);
        } else {
-               retval = zend_is_callable(var, syntax_only, NULL);
+               retval = zend_is_callable(var, syntax_only, NULL TSRMLS_CC);
        }
 
        RETURN_BOOL(retval);
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.6.2.10&r2=1.39.2.5.2.6.2.11&diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.10 
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.11
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.10       Fri Jul 18 
19:24:03 2008
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Sat Aug  2 04:46:07 2008
@@ -51,7 +51,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6.2.10 2008/07/18 19:24:03 felipe Exp $ 
*/
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6.2.11 2008/08/02 04:46:07 felipe Exp $ 
*/
 
 /**********************************************************************
 * BUGS:                                                               *
@@ -949,7 +949,7 @@
        
zend_hash_internal_pointer_reset(Z_ARRVAL_P(pData->server->introspection_map));
        while(1) {
                
if(zend_hash_get_current_data(Z_ARRVAL_P(pData->server->introspection_map), 
(void**)&php_function) == SUCCESS) {
-                       if (zend_is_callable(*php_function, 0, 
&php_function_name)) {
+                       if (zend_is_callable(*php_function, 0, 
&php_function_name TSRMLS_CC)) {
                                /* php func prototype: function string 
user_func($user_params) */
                                if (call_user_function(CG(function_table), 
NULL, *php_function, &retval, 1, callback_params TSRMLS_CC) == SUCCESS) {
                                        XMLRPC_VALUE xData;
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.167.2.3.2.4.2.6&r2=1.167.2.3.2.4.2.7&diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.167.2.3.2.4.2.6 
php-src/main/output.c:1.167.2.3.2.4.2.7
--- php-src/main/output.c:1.167.2.3.2.4.2.6     Thu Jul 17 09:53:42 2008
+++ php-src/main/output.c       Sat Aug  2 04:46:07 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: output.c,v 1.167.2.3.2.4.2.6 2008/07/17 09:53:42 dmitry Exp $ */
+/* $Id: output.c,v 1.167.2.3.2.4.2.7 2008/08/02 04:46:07 felipe Exp $ */
 
 #include "php.h"
 #include "ext/standard/head.h"
@@ -418,7 +418,7 @@
 {
        php_ob_buffer tmp_buf;
 
-       if (output_handler && !zend_is_callable(output_handler, 0, NULL)) {
+       if (output_handler && !zend_is_callable(output_handler, 0, NULL 
TSRMLS_CC)) {
                return FAILURE;
        }
        
@@ -508,7 +508,7 @@
                }
        } else if (output_handler && output_handler->type == IS_ARRAY) {
                /* do we have array(object,method) */
-               if (zend_is_callable(output_handler, 0, &handler_name)) {
+               if (zend_is_callable(output_handler, 0, &handler_name 
TSRMLS_CC)) {
                        SEPARATE_ZVAL(&output_handler);
                        Z_ADDREF_P(output_handler);
                        result = php_ob_init_named(initial_size, block_size, 
handler_name, output_handler, chunk_size, erase TSRMLS_CC);
@@ -527,7 +527,7 @@
                }
        } else if (output_handler && output_handler->type == IS_OBJECT) {
                /* do we have callable object */
-               if (zend_is_callable(output_handler, 0, &handler_name)) {
+               if (zend_is_callable(output_handler, 0, &handler_name 
TSRMLS_CC)) {
                        SEPARATE_ZVAL(&output_handler);
                        Z_ADDREF_P(output_handler);
                        result = php_ob_init_named(initial_size, block_size, 
handler_name, output_handler, chunk_size, erase TSRMLS_CC);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to