felipe Sat Aug 2 04:40:46 2008 UTC
Modified files:
/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/sybase_ct php_sybase_ct.c
/php-src/ext/unicode property.c unicode.c
/php-src/ext/xmlrpc xmlrpc-epi-php.c
Log:
- Added parameter TSRMLS_DC in zend_is_callable()
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.481&r2=1.482&diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.481 ZendEngine2/zend_API.c:1.482
--- ZendEngine2/zend_API.c:1.481 Sat Aug 2 02:49:46 2008
+++ ZendEngine2/zend_API.c Sat Aug 2 04:40:43 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.481 2008/08/02 02:49:46 felipe Exp $ */
+/* $Id: zend_API.c,v 1.482 2008/08/02 04:40:43 felipe Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -3272,10 +3272,8 @@
}
/* }}} */
-ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, zval
*callable_name) /* {{{ */
+ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, zval
*callable_name TSRMLS_DC) /* {{{ */
{
- TSRMLS_FETCH();
-
return zend_is_callable_ex(callable, NULL, check_flags, callable_name,
NULL, NULL TSRMLS_CC);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.h?r1=1.305&r2=1.306&diff_format=u
Index: ZendEngine2/zend_API.h
diff -u ZendEngine2/zend_API.h:1.305 ZendEngine2/zend_API.h:1.306
--- ZendEngine2/zend_API.h:1.305 Tue Jul 29 08:47:21 2008
+++ ZendEngine2/zend_API.h Sat Aug 2 04:40:43 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.h,v 1.305 2008/07/29 08:47:21 tony2001 Exp $ */
+/* $Id: zend_API.h,v 1.306 2008/08/02 04:40:43 felipe Exp $ */
#ifndef ZEND_API_H
#define ZEND_API_H
@@ -285,7 +285,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, zval *callable_name, zend_fcall_info_cache *fcc, char **error
TSRMLS_DC);
-ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, zval
*callable_name);
+ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, zval
*callable_name TSRMLS_DC);
ZEND_API zend_bool zend_make_callable(zval *callable, zval *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.380&r2=1.381&diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.380
ZendEngine2/zend_builtin_functions.c:1.381
--- ZendEngine2/zend_builtin_functions.c:1.380 Thu Jul 24 20:44:10 2008
+++ ZendEngine2/zend_builtin_functions.c Sat Aug 2 04:40:43 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_builtin_functions.c,v 1.380 2008/07/24 20:44:10 moriyoshi Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.381 2008/08/02 04:40:43 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, "%v() expects the argument (%R) to be a
valid callback",
get_active_function_name(TSRMLS_C),
Z_TYPE(error_handler_name), Z_UNIVAL(error_handler_name));
zval_dtor(&error_handler_name);
@@ -1576,7 +1576,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, "%v() expects the argument (%R)
to be a valid callback",
get_active_function_name(TSRMLS_C),
Z_TYPE(exception_handler_name), Z_UNIVAL(exception_handler_name));
zval_dtor(&exception_handler_name);
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/callback_filter.c?r1=1.14&r2=1.15&diff_format=u
Index: php-src/ext/filter/callback_filter.c
diff -u php-src/ext/filter/callback_filter.c:1.14
php-src/ext/filter/callback_filter.c:1.15
--- php-src/ext/filter/callback_filter.c:1.14 Mon Dec 31 07:12:09 2007
+++ php-src/ext/filter/callback_filter.c Sat Aug 2 04:40:44 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: callback_filter.c,v 1.14 2007/12/31 07:12:09 sebastian Exp $ */
+/* $Id: callback_filter.c,v 1.15 2008/08/02 04:40:44 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.11&r2=1.12&diff_format=u
Index: php-src/ext/interbase/ibase_events.c
diff -u php-src/ext/interbase/ibase_events.c:1.11
php-src/ext/interbase/ibase_events.c:1.12
--- php-src/ext/interbase/ibase_events.c:1.11 Mon Dec 31 07:12:10 2007
+++ php-src/ext/interbase/ibase_events.c Sat Aug 2 04:40:44 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ibase_events.c,v 1.11 2007/12/31 07:12:10 sebastian Exp $ */
+/* $Id: ibase_events.c,v 1.12 2008/08/02 04:40:44 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.13&r2=1.14&diff_format=u
Index: php-src/ext/interbase/php_ibase_udf.c
diff -u php-src/ext/interbase/php_ibase_udf.c:1.13
php-src/ext/interbase/php_ibase_udf.c:1.14
--- php-src/ext/interbase/php_ibase_udf.c:1.13 Mon Dec 31 07:12:10 2007
+++ php-src/ext/interbase/php_ibase_udf.c Sat Aug 2 04:40:44 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ibase_udf.c,v 1.13 2007/12/31 07:12:10 sebastian Exp $ */
+/* $Id: php_ibase_udf.c,v 1.14 2008/08/02 04:40:44 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.188&r2=1.189&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.188 php-src/ext/ldap/ldap.c:1.189
--- php-src/ext/ldap/ldap.c:1.188 Wed Jul 16 13:42:51 2008
+++ php-src/ext/ldap/ldap.c Sat Aug 2 04:40:44 2008
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.188 2008/07/16 13:42:51 felipe Exp $ */
+/* $Id: ldap.c,v 1.189 2008/08/02 04:40:44 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.188
2008/07/16 13:42:51 felipe Exp $");
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.189
2008/08/02 04:40:44 felipe Exp $");
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -2140,7 +2140,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 '%R' to be a valid callback", Z_TYPE(callback_name),
Z_UNIVAL(callback_name));
zval_dtor(&callback_name);
RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.167&r2=1.168&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.167
php-src/ext/mysqli/mysqli_api.c:1.168
--- php-src/ext/mysqli/mysqli_api.c:1.167 Fri Jul 25 12:45:27 2008
+++ php-src/ext/mysqli/mysqli_api.c Sat Aug 2 04:40:44 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.167 2008/07/25 12:45:27 andrey Exp $
+ $Id: mysqli_api.c,v 1.168 2008/08/02 04:40:44 felipe Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1477,7 +1477,7 @@
}
/* 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 %R", Z_TYPE(callback_name), Z_UNIVAL(callback_name));
zval_dtor(&callback_name);
RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.64&r2=1.65&diff_format=u
Index: php-src/ext/pcntl/pcntl.c
diff -u php-src/ext/pcntl/pcntl.c:1.64 php-src/ext/pcntl/pcntl.c:1.65
--- php-src/ext/pcntl/pcntl.c:1.64 Tue Jul 29 16:56:26 2008
+++ php-src/ext/pcntl/pcntl.c Sat Aug 2 04:40:44 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pcntl.c,v 1.64 2008/07/29 16:56:26 lbarnaud Exp $ */
+/* $Id: pcntl.c,v 1.65 2008/08/02 04:40:44 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, "%R is not a
callable function name error", Z_TYPE(func_name), Z_UNIVAL(func_name));
zval_dtor(&func_name);
RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.236&r2=1.237&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.236 php-src/ext/pcre/php_pcre.c:1.237
--- php-src/ext/pcre/php_pcre.c:1.236 Tue Jul 8 07:05:04 2008
+++ php-src/ext/pcre/php_pcre.c Sat Aug 2 04:40:44 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.236 2008/07/08 07:05:04 dmitry Exp $ */
+/* $Id: php_pcre.c,v 1.237 2008/08/02 04:40:44 felipe Exp $ */
/* TODO
* php_pcre_replace_impl():
@@ -1463,7 +1463,7 @@
if (Z_TYPE_P(replace) != IS_ARRAY && Z_TYPE_P(replace) !=
IS_OBJECT) {
convert_to_text(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, '%R', to be a valid callback", Z_TYPE(callback_name),
Z_UNIVAL(callback_name));
zval_dtor(&callback_name);
*return_value = *subject;
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.196&r2=1.197&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.196 php-src/ext/pdo/pdo_stmt.c:1.197
--- php-src/ext/pdo/pdo_stmt.c:1.196 Fri Jul 25 09:48:36 2008
+++ php-src/ext/pdo/pdo_stmt.c Sat Aug 2 04:40:44 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.196 2008/07/25 09:48:36 dmitry Exp $ */
+/* $Id: pdo_stmt.c,v 1.197 2008/08/02 04:40:44 felipe Exp $ */
/* The PDO Statement Handle Class */
@@ -802,7 +802,7 @@
method = &callable;
}
- if (!method || !zend_is_callable(callable, 0, NULL)) {
+ if (!method || !zend_is_callable(callable, 0, NULL TSRMLS_CC)) {
pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied
function must be a valid callback" TSRMLS_CC);
return 0;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_driver.c?r1=1.35&r2=1.36&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_driver.c
diff -u php-src/ext/pdo_sqlite/sqlite_driver.c:1.35
php-src/ext/pdo_sqlite/sqlite_driver.c:1.36
--- php-src/ext/pdo_sqlite/sqlite_driver.c:1.35 Mon Dec 31 07:12:13 2007
+++ php-src/ext/pdo_sqlite/sqlite_driver.c Sat Aug 2 04:40:44 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sqlite_driver.c,v 1.35 2007/12/31 07:12:13 sebastian Exp $ */
+/* $Id: sqlite_driver.c,v 1.36 2008/08/02 04:40:44 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -502,7 +502,7 @@
dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
PDO_CONSTRUCT_CHECK;
- if (!zend_is_callable(callback, 0, NULL)) {
+ if (!zend_is_callable(callback, 0, NULL TSRMLS_CC)) {
pdo_sqlite_errmsg(dbh, NULL, "callback is not callable");
RETURN_FALSE;
}
@@ -571,11 +571,11 @@
dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
PDO_CONSTRUCT_CHECK;
- if (!zend_is_callable(step_callback, 0, NULL)) {
+ if (!zend_is_callable(step_callback, 0, NULL TSRMLS_CC)) {
pdo_sqlite_errmsg(dbh, NULL, "step callback is not callable");
RETURN_FALSE;
}
- if (!zend_is_callable(fini_callback, 0, NULL)) {
+ if (!zend_is_callable(fini_callback, 0, NULL TSRMLS_CC)) {
pdo_sqlite_errmsg(dbh, NULL, "fini callback is not callable");
RETURN_FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/readline/readline.c?r1=1.52&r2=1.53&diff_format=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.52
php-src/ext/readline/readline.c:1.53
--- php-src/ext/readline/readline.c:1.52 Mon Jul 14 18:06:19 2008
+++ php-src/ext/readline/readline.c Sat Aug 2 04:40:44 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: readline.c,v 1.52 2008/07/14 18:06:19 felipe Exp $ */
+/* $Id: readline.c,v 1.53 2008/08/02 04:40:44 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, "%R is not
callable", Z_TYPE(name), Z_UNIVAL(name));
zval_dtor(&name);
RETURN_FALSE;
@@ -552,7 +552,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, "%R is not
callable", Z_TYPE(name), Z_UNIVAL(name));
zval_dtor(&name);
RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.485&r2=1.486&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.485 php-src/ext/session/session.c:1.486
--- php-src/ext/session/session.c:1.485 Fri Jun 27 16:37:03 2008
+++ php-src/ext/session/session.c Sat Aug 2 04:40:44 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.485 2008/06/27 16:37:03 felipe Exp $ */
+/* $Id: session.c,v 1.486 2008/08/02 04:40:44 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1490,7 +1490,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)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument
%d is not a valid callback", i+1);
zval_dtor(&name);
RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.175&r2=1.176&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.175
php-src/ext/spl/spl_iterators.c:1.176
--- php-src/ext/spl/spl_iterators.c:1.175 Tue Jul 29 11:50:23 2008
+++ php-src/ext/spl/spl_iterators.c Sat Aug 2 04:40:45 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.175 2008/07/29 11:50:23 dmitry Exp $ */
+/* $Id: spl_iterators.c,v 1.176 2008/08/02 04:40:45 felipe Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1234,7 +1234,7 @@
intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
ZVAL_TEXT(&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 %v::%R() does
not exist", intern->inner.ce->name, Z_TYPE(method), Z_UNIVAL(method));
return FAILURE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.211&r2=1.212&diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.211 php-src/ext/sqlite/sqlite.c:1.212
--- php-src/ext/sqlite/sqlite.c:1.211 Fri Jul 25 08:53:11 2008
+++ php-src/ext/sqlite/sqlite.c Sat Aug 2 04:40:45 2008
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.211 2008/07/25 08:53:11 dmitry Exp $
+ $Id: sqlite.c,v 1.212 2008/08/02 04:40:45 felipe Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1612,7 +1612,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.211 2008/07/25 08:53:11 dmitry
Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.212 2008/08/02 04:40:45 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();
@@ -3556,14 +3556,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 `%R'
is not callable", Z_TYPE(callable), Z_UNIVAL(callable));
zval_dtor(&callable);
return;
}
zval_dtor(&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
`%R' is not callable", Z_TYPE(callable), Z_UNIVAL(callable));
zval_dtor(&callable);
return;
@@ -3607,7 +3607,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 `%R' is
not callable", Z_TYPE(callable), Z_UNIVAL(callable));
zval_dtor(&callable);
return;
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.9 php-src/ext/sqlite3/sqlite3.c:1.10
--- php-src/ext/sqlite3/sqlite3.c:1.9 Fri Aug 1 08:27:46 2008
+++ php-src/ext/sqlite3/sqlite3.c Sat Aug 2 04:40:45 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sqlite3.c,v 1.9 2008/08/01 08:27:46 tony2001 Exp $ */
+/* $Id: sqlite3.c,v 1.10 2008/08/02 04:40:45 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -801,7 +801,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 %R", Z_TYPE(callback_name), Z_UNIVAL(callback_name));
zval_dtor(&callback_name);
RETURN_FALSE;
@@ -853,14 +853,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 %R", Z_TYPE(callback_name), Z_UNIVAL(callback_name));
zval_dtor(&callback_name);
RETURN_FALSE;
}
zval_dtor(&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 %R", Z_TYPE(callback_name), Z_UNIVAL(callback_name));
zval_dtor(&callback_name);
RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.458&r2=1.459&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.458 php-src/ext/standard/array.c:1.459
--- php-src/ext/standard/array.c:1.458 Thu Jul 31 20:17:06 2008
+++ php-src/ext/standard/array.c Sat Aug 2 04:40:45 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.458 2008/07/31 20:17:06 johannes Exp $ */
+/* $Id: array.c,v 1.459 2008/08/02 04:40:45 felipe Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -628,7 +628,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.910&r2=1.911&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.910
php-src/ext/standard/basic_functions.c:1.911
--- php-src/ext/standard/basic_functions.c:1.910 Thu Jul 31 20:17:06 2008
+++ php-src/ext/standard/basic_functions.c Sat Aug 2 04:40:45 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.910 2008/07/31 20:17:06 johannes Exp $ */
+/* $Id: basic_functions.c,v 1.911 2008/08/02 04:40:45 felipe Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -5298,7 +5298,7 @@
zval retval;
zval 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 %R() - function does not exist", Z_TYPE(function_name),
Z_UNIVAL(function_name));
zval_dtor(&function_name);
return 0;
@@ -5441,7 +5441,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 '%R' passed", Z_TYPE(function_name), Z_UNIVAL(function_name));
efree(shutdown_function_entry.arguments);
RETVAL_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/type.c?r1=1.55&r2=1.56&diff_format=u
Index: php-src/ext/standard/type.c
diff -u php-src/ext/standard/type.c:1.55 php-src/ext/standard/type.c:1.56
--- php-src/ext/standard/type.c:1.55 Sat Mar 29 22:02:20 2008
+++ php-src/ext/standard/type.c Sat Aug 2 04:40:45 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: type.c,v 1.55 2008/03/29 22:02:20 felipe Exp $ */
+/* $Id: type.c,v 1.56 2008/08/02 04:40:45 felipe Exp $ */
#include "php.h"
#include "php_incomplete_class.h"
@@ -470,10 +470,10 @@
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);
REPLACE_ZVAL_VALUE(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/sybase_ct/php_sybase_ct.c?r1=1.122&r2=1.123&diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.122
php-src/ext/sybase_ct/php_sybase_ct.c:1.123
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.122 Tue Jul 1 17:29:48 2008
+++ php-src/ext/sybase_ct/php_sybase_ct.c Sat Aug 2 04:40:45 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_ct.c,v 1.122 2008/07/01 17:29:48 felipe Exp $ */
+/* $Id: php_sybase_ct.c,v 1.123 2008/08/02 04:40:45 felipe Exp $ */
#ifdef HAVE_CONFIG_H
@@ -2363,7 +2363,7 @@
case IS_ARRAY:
case IS_STRING:
/* Either "function", array("class", "function") or
array($object, "function") */
- if (!zend_is_callable(*param, 0, &name)) {
+ if (!zend_is_callable(*param, 0, &name TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"First argumented is expected to be a valid callback, '%R' was given",
Z_TYPE(name), Z_UNIVAL(name));
zval_dtor(&name);
RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/unicode/property.c?r1=1.19&r2=1.20&diff_format=u
Index: php-src/ext/unicode/property.c
diff -u php-src/ext/unicode/property.c:1.19 php-src/ext/unicode/property.c:1.20
--- php-src/ext/unicode/property.c:1.19 Tue Jul 1 08:19:53 2008
+++ php-src/ext/unicode/property.c Sat Aug 2 04:40:45 2008
@@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: property.c,v 1.19 2008/07/01 08:19:53 tony2001 Exp $ */
+/* $Id: property.c,v 1.20 2008/08/02 04:40:45 felipe Exp $ */
#include "php_unicode.h"
@@ -868,7 +868,7 @@
return;
}
- if (!zend_is_callable(callback, 0, NULL)) {
+ if (!zend_is_callable(callback, 0, NULL TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid
enumeration callback");
return;
}
@@ -927,7 +927,7 @@
return;
}
- if (!zend_is_callable(callback, 0, NULL)) {
+ if (!zend_is_callable(callback, 0, NULL TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid
enumeration callback");
return;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/unicode/unicode.c?r1=1.47&r2=1.48&diff_format=u
Index: php-src/ext/unicode/unicode.c
diff -u php-src/ext/unicode/unicode.c:1.47 php-src/ext/unicode/unicode.c:1.48
--- php-src/ext/unicode/unicode.c:1.47 Mon Jul 21 11:32:49 2008
+++ php-src/ext/unicode/unicode.c Sat Aug 2 04:40:45 2008
@@ -15,7 +15,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: unicode.c,v 1.47 2008/07/21 11:32:49 felipe Exp $ */
+/* $Id: unicode.c,v 1.48 2008/08/02 04:40:45 felipe Exp $ */
#include "php_unicode.h"
#include "zend_unicode.h"
@@ -237,7 +237,7 @@
}
if (Z_TYPE_P(error_handler) != IS_NULL) { /* NULL == unset */
- 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, "%v() expects the argument (%R)
to be a valid callback",
get_active_function_name(TSRMLS_C),
Z_TYPE(error_handler_name), Z_UNIVAL(error_handler_name));
zval_dtor(&error_handler_name);
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.58&r2=1.59&diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.58
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.59
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.58 Sun Jul 20 15:52:06 2008
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Sat Aug 2 04:40:45 2008
@@ -51,7 +51,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.58 2008/07/20 15:52:06 felipe Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.59 2008/08/02 04:40:45 felipe Exp $ */
/**********************************************************************
* BUGS: *
@@ -964,7 +964,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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
