sebastian Fri Aug 12 10:08:31 2005 EDT
Modified files:
/ZendEngine2 zend_exceptions.c zend_exceptions.h
zend_reflection_api.c
/php-src/ext/com_dotnet com_extension.c
/php-src/ext/dom php_dom.c
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli.c mysqli_driver.c
/php-src/ext/pgsql pgsql.c
/php-src/ext/simplexml php_simplexml.h simplexml.c
/php-src/ext/soap soap.c
/php-src/ext/spl spl_exceptions.c spl_iterators.c spl_sxe.c
/php-src/ext/sqlite pdo_sqlite2.c sqlite.c
/php-src/ext/tidy tidy.c
Log:
ZTS fixes.
http://cvs.php.net/diff.php/ZendEngine2/zend_exceptions.c?r1=1.81&r2=1.82&ty=u
Index: ZendEngine2/zend_exceptions.c
diff -u ZendEngine2/zend_exceptions.c:1.81 ZendEngine2/zend_exceptions.c:1.82
--- ZendEngine2/zend_exceptions.c:1.81 Fri Aug 12 07:29:26 2005
+++ ZendEngine2/zend_exceptions.c Fri Aug 12 10:08:19 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_exceptions.c,v 1.81 2005/08/12 11:29:26 dmitry Exp $ */
+/* $Id: zend_exceptions.c,v 1.82 2005/08/12 14:08:19 sebastian Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -588,12 +588,12 @@
zend_declare_property_long(error_exception_ce, "severity",
sizeof("severity")-1, E_ERROR, ZEND_ACC_PROTECTED TSRMLS_CC);
}
-ZEND_API zend_class_entry *zend_exception_get_default(void)
+ZEND_API zend_class_entry *zend_exception_get_default(TSRMLS_D)
{
return U_CLASS_ENTRY(default_exception_ce);
}
-ZEND_API zend_class_entry *zend_get_error_exception(void)
+ZEND_API zend_class_entry *zend_get_error_exception(TSRMLS_D)
{
return U_CLASS_ENTRY(error_exception_ce);
}
http://cvs.php.net/diff.php/ZendEngine2/zend_exceptions.h?r1=1.23&r2=1.24&ty=u
Index: ZendEngine2/zend_exceptions.h
diff -u ZendEngine2/zend_exceptions.h:1.23 ZendEngine2/zend_exceptions.h:1.24
--- ZendEngine2/zend_exceptions.h:1.23 Fri Aug 12 07:29:26 2005
+++ ZendEngine2/zend_exceptions.h Fri Aug 12 10:08:19 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_exceptions.h,v 1.23 2005/08/12 11:29:26 dmitry Exp $ */
+/* $Id: zend_exceptions.h,v 1.24 2005/08/12 14:08:19 sebastian Exp $ */
#ifndef ZEND_EXCEPTIONS_H
#define ZEND_EXCEPTIONS_H
@@ -30,8 +30,8 @@
void zend_register_default_exception(TSRMLS_D);
-ZEND_API zend_class_entry *zend_exception_get_default(void);
-ZEND_API zend_class_entry *zend_get_error_exception(void);
+ZEND_API zend_class_entry *zend_exception_get_default(TSRMLS_D);
+ZEND_API zend_class_entry *zend_get_error_exception(TSRMLS_D);
ZEND_API void zend_register_default_classes(TSRMLS_D);
/* exception_ce NULL or zend_exception_get_default() or a derived class
http://cvs.php.net/diff.php/ZendEngine2/zend_reflection_api.c?r1=1.167&r2=1.168&ty=u
Index: ZendEngine2/zend_reflection_api.c
diff -u ZendEngine2/zend_reflection_api.c:1.167
ZendEngine2/zend_reflection_api.c:1.168
--- ZendEngine2/zend_reflection_api.c:1.167 Fri Aug 12 07:29:27 2005
+++ ZendEngine2/zend_reflection_api.c Fri Aug 12 10:08:19 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_reflection_api.c,v 1.167 2005/08/12 11:29:27 dmitry Exp $ */
+/* $Id: zend_reflection_api.c,v 1.168 2005/08/12 14:08:19 sebastian Exp $ */
#include "zend.h"
#include "zend_API.h"
#include "zend_exceptions.h"
@@ -4035,7 +4035,7 @@
reflection_object_handlers.write_property = _reflection_write_property;
INIT_CLASS_ENTRY(_reflection_entry, "ReflectionException",
reflection_exception_functions);
- reflection_exception_ptr =
zend_register_internal_class_ex(&_reflection_entry,
zend_exception_get_default(), NULL TSRMLS_CC);
+ reflection_exception_ptr =
zend_register_internal_class_ex(&_reflection_entry,
zend_exception_get_default(TSRMLS_C), NULL TSRMLS_CC);
INIT_CLASS_ENTRY(_reflection_entry, "Reflection", reflection_functions);
reflection_ptr = zend_register_internal_class(&_reflection_entry
TSRMLS_CC);
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_extension.c?r1=1.17&r2=1.18&ty=u
Index: php-src/ext/com_dotnet/com_extension.c
diff -u php-src/ext/com_dotnet/com_extension.c:1.17
php-src/ext/com_dotnet/com_extension.c:1.18
--- php-src/ext/com_dotnet/com_extension.c:1.17 Wed Aug 3 10:06:41 2005
+++ php-src/ext/com_dotnet/com_extension.c Fri Aug 12 10:08:22 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_extension.c,v 1.17 2005/08/03 14:06:41 sniper Exp $ */
+/* $Id: com_extension.c,v 1.18 2005/08/12 14:08:22 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -192,7 +192,7 @@
php_com_persist_minit(INIT_FUNC_ARGS_PASSTHRU);
INIT_CLASS_ENTRY(ce, "com_exception", NULL);
- php_com_exception_class_entry = zend_register_internal_class_ex(&ce,
zend_exception_get_default(), NULL TSRMLS_CC);
+ php_com_exception_class_entry = zend_register_internal_class_ex(&ce,
zend_exception_get_default(TSRMLS_C), NULL TSRMLS_CC);
php_com_exception_class_entry->ce_flags |= ZEND_ACC_FINAL;
/* php_com_exception_class_entry->constructor->common.fn_flags |=
ZEND_ACC_PROTECTED; */
http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.75&r2=1.76&ty=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.75 php-src/ext/dom/php_dom.c:1.76
--- php-src/ext/dom/php_dom.c:1.75 Fri Aug 12 07:29:30 2005
+++ php-src/ext/dom/php_dom.c Fri Aug 12 10:08:22 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.75 2005/08/12 11:29:30 dmitry Exp $ */
+/* $Id: php_dom.c,v 1.76 2005/08/12 14:08:22 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -485,7 +485,7 @@
zend_hash_init(&classes, 0, NULL, NULL, 1);
INIT_CLASS_ENTRY(ce, "DOMException",
php_dom_domexception_class_functions);
- dom_domexception_class_entry = zend_register_internal_class_ex(&ce,
zend_exception_get_default(), NULL TSRMLS_CC);
+ dom_domexception_class_entry = zend_register_internal_class_ex(&ce,
zend_exception_get_default(TSRMLS_C), NULL TSRMLS_CC);
dom_domexception_class_entry->ce_flags |= ZEND_ACC_FINAL;
zend_declare_property_long(dom_domexception_class_entry, "code",
sizeof("code")-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC);
http://cvs.php.net/diff.php/php-src/ext/mysql/php_mysql.c?r1=1.214&r2=1.215&ty=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.214 php-src/ext/mysql/php_mysql.c:1.215
--- php-src/ext/mysql/php_mysql.c:1.214 Thu Aug 11 19:35:54 2005
+++ php-src/ext/mysql/php_mysql.c Fri Aug 12 10:08:22 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.214 2005/08/11 23:35:54 andrei Exp $ */
+/* $Id: php_mysql.c,v 1.215 2005/08/12 14:08:22 sebastian Exp $ */
/* TODO:
*
@@ -2032,7 +2032,7 @@
* single value is an array. Also we'd
have to make that one
* argument passed by reference.
*/
-
zend_throw_exception(zend_exception_get_default(), "Parameter ctor_params must
be an array", 0 TSRMLS_CC);
+
zend_throw_exception(zend_exception_get_default(TSRMLS_C), "Parameter
ctor_params must be an array", 0 TSRMLS_CC);
return;
}
} else {
@@ -2047,7 +2047,7 @@
fcc.object_pp = &return_value;
if (zend_call_function(&fci, &fcc TSRMLS_CC) ==
FAILURE) {
-
zend_throw_exception_ex(zend_exception_get_default(), 0 TSRMLS_CC, "Could not
execute %v::%v()", ce->name, ce->constructor->common.function_name);
+
zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC,
"Could not execute %v::%v()", ce->name, ce->constructor->common.function_name);
} else {
if (retval_ptr) {
zval_ptr_dtor(&retval_ptr);
@@ -2057,7 +2057,7 @@
efree(fci.params);
}
} else if (ctor_params) {
- zend_throw_exception_ex(zend_exception_get_default(), 0
TSRMLS_CC, "Class %v does not have a constructor hence you cannot use
ctor_params", ce->name);
+
zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC,
"Class %v does not have a constructor hence you cannot use ctor_params",
ce->name);
}
}
}
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.72&r2=1.73&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72 php-src/ext/mysqli/mysqli.c:1.73
--- php-src/ext/mysqli/mysqli.c:1.72 Wed Aug 3 10:07:30 2005
+++ php-src/ext/mysqli/mysqli.c Fri Aug 12 10:08:23 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.72 2005/08/03 14:07:30 sniper Exp $
+ $Id: mysqli.c,v 1.73 2005/08/12 14:08:23 sebastian Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -449,7 +449,7 @@
#ifdef HAVE_SPL
mysqli_exception_class_entry = zend_register_internal_class_ex(&cex,
spl_ce_RuntimeException, NULL TSRMLS_CC);
#else
- mysqli_exception_class_entry = zend_register_internal_class_ex(&cex,
zend_exception_get_default(), NULL TSRMLS_CC);
+ mysqli_exception_class_entry = zend_register_internal_class_ex(&cex,
zend_exception_get_default(TSRMLS_C), NULL TSRMLS_CC);
#endif
mysqli_exception_class_entry->ce_flags |= ZEND_ACC_FINAL;
zend_declare_property_long(mysqli_exception_class_entry, "code",
sizeof("code")-1, 0, ZEND_ACC_PROTECTED TSRMLS_CC);
@@ -876,7 +876,7 @@
* single value is an array. Also we'd
have to make that one
* argument passed by reference.
*/
-
zend_throw_exception(zend_exception_get_default(), "Parameter ctor_params must
be an array", 0 TSRMLS_CC);
+
zend_throw_exception(zend_exception_get_default(TSRMLS_C), "Parameter
ctor_params must be an array", 0 TSRMLS_CC);
return;
}
} else {
@@ -891,7 +891,7 @@
fcc.object_pp = &return_value;
if (zend_call_function(&fci, &fcc TSRMLS_CC) ==
FAILURE) {
-
zend_throw_exception_ex(zend_exception_get_default(), 0 TSRMLS_CC, "Could not
execute %s::%s()", ce->name, ce->constructor->common.function_name);
+
zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC,
"Could not execute %s::%s()", ce->name, ce->constructor->common.function_name);
} else {
if (retval_ptr) {
zval_ptr_dtor(&retval_ptr);
@@ -901,7 +901,7 @@
efree(fci.params);
}
} else if (ctor_params) {
- zend_throw_exception_ex(zend_exception_get_default(), 0
TSRMLS_CC, "Class %s does not have a constructor hence you cannot use
ctor_params", ce->name);
+
zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC,
"Class %s does not have a constructor hence you cannot use ctor_params",
ce->name);
}
}
}
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_driver.c?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/mysqli/mysqli_driver.c
diff -u php-src/ext/mysqli/mysqli_driver.c:1.4
php-src/ext/mysqli/mysqli_driver.c:1.5
--- php-src/ext/mysqli/mysqli_driver.c:1.4 Wed Aug 3 10:07:30 2005
+++ php-src/ext/mysqli/mysqli_driver.c Fri Aug 12 10:08:23 2005
@@ -79,7 +79,7 @@
{
MyG(report_mode) = Z_LVAL_P(value);
php_set_error_handling(MyG(report_mode) & MYSQLI_REPORT_STRICT ?
EH_THROW : EH_NORMAL,
-
zend_exception_get_default() TSRMLS_CC);
+
zend_exception_get_default(TSRMLS_C) TSRMLS_CC);
return SUCCESS;
}
/* }}} */
http://cvs.php.net/diff.php/php-src/ext/pgsql/pgsql.c?r1=1.331&r2=1.332&ty=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331 php-src/ext/pgsql/pgsql.c:1.332
--- php-src/ext/pgsql/pgsql.c:1.331 Wed Aug 3 10:07:40 2005
+++ php-src/ext/pgsql/pgsql.c Fri Aug 12 10:08:23 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.331 2005/08/03 14:07:40 sniper Exp $ */
+/* $Id: pgsql.c,v 1.332 2005/08/12 14:08:23 sebastian Exp $ */
#include <stdlib.h>
@@ -2009,7 +2009,7 @@
* single value is an array. Also we'd
have to make that one
* argument passed by reference.
*/
-
zend_throw_exception(zend_exception_get_default(), "Parameter ctor_params must
be an array", 0 TSRMLS_CC);
+
zend_throw_exception(zend_exception_get_default(TSRMLS_C), "Parameter
ctor_params must be an array", 0 TSRMLS_CC);
return;
}
} else {
@@ -2024,7 +2024,7 @@
fcc.object_pp = &return_value;
if (zend_call_function(&fci, &fcc TSRMLS_CC) ==
FAILURE) {
-
zend_throw_exception_ex(zend_exception_get_default(), 0 TSRMLS_CC, "Could not
execute %s::%s()", ce->name, ce->constructor->common.function_name);
+
zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC,
"Could not execute %s::%s()", ce->name, ce->constructor->common.function_name);
} else {
if (retval_ptr) {
zval_ptr_dtor(&retval_ptr);
@@ -2034,7 +2034,7 @@
efree(fci.params);
}
} else if (ctor_params) {
- zend_throw_exception_ex(zend_exception_get_default(), 0
TSRMLS_CC, "Class %s does not have a constructor hence you cannot use
ctor_params", ce->name);
+
zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC,
"Class %s does not have a constructor hence you cannot use ctor_params",
ce->name);
}
}
}
http://cvs.php.net/diff.php/php-src/ext/simplexml/php_simplexml.h?r1=1.20&r2=1.21&ty=u
Index: php-src/ext/simplexml/php_simplexml.h
diff -u php-src/ext/simplexml/php_simplexml.h:1.20
php-src/ext/simplexml/php_simplexml.h:1.21
--- php-src/ext/simplexml/php_simplexml.h:1.20 Wed Aug 3 10:07:45 2005
+++ php-src/ext/simplexml/php_simplexml.h Fri Aug 12 10:08:25 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_simplexml.h,v 1.20 2005/08/03 14:07:45 sniper Exp $ */
+/* $Id: php_simplexml.h,v 1.21 2005/08/12 14:08:25 sebastian Exp $ */
#ifndef PHP_SIMPLEXML_H
#define PHP_SIMPLEXML_H
@@ -79,7 +79,7 @@
#define SIMPLEXML_G(v) (simplexml_globals.v)
#endif
-ZEND_API zend_class_entry *sxe_get_element_class_entry();
+ZEND_API zend_class_entry *sxe_get_element_class_entry(TSRMLS_D);
#endif
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.153&r2=1.154&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.153
php-src/ext/simplexml/simplexml.c:1.154
--- php-src/ext/simplexml/simplexml.c:1.153 Fri Aug 12 07:29:31 2005
+++ php-src/ext/simplexml/simplexml.c Fri Aug 12 10:08:25 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.153 2005/08/12 11:29:31 dmitry Exp $ */
+/* $Id: simplexml.c,v 1.154 2005/08/12 14:08:25 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -40,7 +40,7 @@
zend_class_entry *sxe_class_entry = NULL;
-ZEND_API zend_class_entry *sxe_get_element_class_entry()
+ZEND_API zend_class_entry *sxe_get_element_class_entry(TSRMLS_D)
{
return U_CLASS_ENTRY(sxe_class_entry);
}
@@ -1357,7 +1357,7 @@
int data_len;
xmlDocPtr docp;
- php_set_error_handling(EH_THROW, zend_exception_get_default()
TSRMLS_CC);
+ php_set_error_handling(EH_THROW, zend_exception_get_default(TSRMLS_C)
TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data,
&data_len) == FAILURE) {
php_std_error_handling();
return;
@@ -1367,7 +1367,7 @@
docp = xmlParseMemory(data, data_len);
if (!docp) {
((php_libxml_node_object *)sxe)->document = NULL;
- zend_throw_exception(zend_exception_get_default(), "String
could not be parsed as XML", 0 TSRMLS_CC);
+ zend_throw_exception(zend_exception_get_default(TSRMLS_C),
"String could not be parsed as XML", 0 TSRMLS_CC);
return;
}
@@ -1736,7 +1736,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.153 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.154 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.156&r2=1.157&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156 php-src/ext/soap/soap.c:1.157
--- php-src/ext/soap/soap.c:1.156 Wed Aug 3 10:07:48 2005
+++ php-src/ext/soap/soap.c Fri Aug 12 10:08:26 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.156 2005/08/03 14:07:48 sniper Exp $ */
+/* $Id: soap.c,v 1.157 2005/08/12 14:08:26 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -525,7 +525,7 @@
/* Register SoapFault class */
INIT_CLASS_ENTRY(ce, PHP_SOAP_FAULT_CLASSNAME, soap_fault_functions);
#ifdef ZEND_ENGINE_2
- soap_fault_class_entry = zend_register_internal_class_ex(&ce,
zend_exception_get_default(), NULL TSRMLS_CC);
+ soap_fault_class_entry = zend_register_internal_class_ex(&ce,
zend_exception_get_default(TSRMLS_C), NULL TSRMLS_CC);
#else
soap_fault_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
#endif
http://cvs.php.net/diff.php/php-src/ext/spl/spl_exceptions.c?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/spl/spl_exceptions.c
diff -u php-src/ext/spl/spl_exceptions.c:1.6
php-src/ext/spl/spl_exceptions.c:1.7
--- php-src/ext/spl/spl_exceptions.c:1.6 Wed Aug 3 10:07:53 2005
+++ php-src/ext/spl/spl_exceptions.c Fri Aug 12 10:08:27 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_exceptions.c,v 1.6 2005/08/03 14:07:53 sniper Exp $ */
+/* $Id: spl_exceptions.c,v 1.7 2005/08/12 14:08:27 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -47,7 +47,7 @@
PHPAPI zend_class_entry *spl_ce_UnderflowException;
PHPAPI zend_class_entry *spl_ce_UnexpectedValueException;
-#define spl_ce_Exception zend_exception_get_default()
+#define spl_ce_Exception zend_exception_get_default(TSRMLS_C)
/* {{{ PHP_MINIT_FUNCTION(spl_exceptions) */
PHP_MINIT_FUNCTION(spl_exceptions)
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.77&r2=1.78&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.77
php-src/ext/spl/spl_iterators.c:1.78
--- php-src/ext/spl/spl_iterators.c:1.77 Fri Aug 12 09:09:58 2005
+++ php-src/ext/spl/spl_iterators.c Fri Aug 12 10:08:27 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.77 2005/08/12 13:09:58 dmitry Exp $ */
+/* $Id: spl_iterators.c,v 1.78 2005/08/12 14:08:27 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -790,7 +790,7 @@
break;
}
- php_set_error_handling(EH_THROW, zend_exception_get_default()
TSRMLS_CC);
+ php_set_error_handling(EH_THROW, zend_exception_get_default(TSRMLS_C)
TSRMLS_CC);
zobject->refcount++;
intern->inner.zobject = zobject;
http://cvs.php.net/diff.php/php-src/ext/spl/spl_sxe.c?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/spl/spl_sxe.c
diff -u php-src/ext/spl/spl_sxe.c:1.8 php-src/ext/spl/spl_sxe.c:1.9
--- php-src/ext/spl/spl_sxe.c:1.8 Wed Aug 3 10:07:53 2005
+++ php-src/ext/spl/spl_sxe.c Fri Aug 12 10:08:27 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_sxe.c,v 1.8 2005/08/03 14:07:53 sniper Exp $ */
+/* $Id: spl_sxe.c,v 1.9 2005/08/12 14:08:27 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -146,7 +146,7 @@
SPL_API PHP_MINIT_FUNCTION(spl_sxe) /* {{{ */
{
- zend_class_entry *spl_ce_SimpleXML_Element =
sxe_get_element_class_entry();
+ zend_class_entry *spl_ce_SimpleXML_Element =
sxe_get_element_class_entry(TSRMLS_C);
if (!spl_ce_SimpleXML_Element) {
return SUCCESS; /* SimpleXML must be initialized before */
http://cvs.php.net/diff.php/php-src/ext/sqlite/pdo_sqlite2.c?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/sqlite/pdo_sqlite2.c
diff -u php-src/ext/sqlite/pdo_sqlite2.c:1.6
php-src/ext/sqlite/pdo_sqlite2.c:1.7
--- php-src/ext/sqlite/pdo_sqlite2.c:1.6 Fri Jun 17 09:12:31 2005
+++ php-src/ext/sqlite/pdo_sqlite2.c Fri Aug 12 10:08:27 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sqlite2.c,v 1.6 2005/06/17 13:12:31 sniper Exp $ */
+/* $Id: pdo_sqlite2.c,v 1.7 2005/08/12 14:08:27 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -288,7 +288,7 @@
}
if (!dbh->methods) {
- zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC,
"SQLSTATE[%s] [%d] %s",
+ zend_throw_exception_ex(php_pdo_get_exception(TSRMLS_C), 0
TSRMLS_CC, "SQLSTATE[%s] [%d] %s",
*pdo_err, einfo->errcode, einfo->errmsg);
}
@@ -576,7 +576,7 @@
filename = make_filename_safe(dbh->data_source TSRMLS_CC);
if (!filename) {
- zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC,
+ zend_throw_exception_ex(php_pdo_get_exception(TSRMLS_C), 0
TSRMLS_CC,
"safe_mode/open_basedir prohibits opening %s",
dbh->data_source);
goto cleanup;
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.167&r2=1.168&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.167 php-src/ext/sqlite/sqlite.c:1.168
--- php-src/ext/sqlite/sqlite.c:1.167 Thu Aug 11 19:35:56 2005
+++ php-src/ext/sqlite/sqlite.c Fri Aug 12 10:08:27 2005
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.167 2005/08/11 23:35:56 andrei Exp $
+ $Id: sqlite.c,v 1.168 2005/08/12 14:08:27 sebastian Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1028,7 +1028,7 @@
#if defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5
&& PHP_MINOR_VERSION >= 1))
REGISTER_SQLITE_CLASS(Exception, exception, spl_ce_RuntimeException);
#else
- REGISTER_SQLITE_CLASS(Exception, exception,
zend_exception_get_default());
+ REGISTER_SQLITE_CLASS(Exception, exception,
zend_exception_get_default(TSRMLS_C));
#endif
sqlite_ce_db->ce_flags &= ~ZEND_ACC_FINAL_CLASS;
@@ -1125,7 +1125,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.167 2005/08/11 23:35:56 andrei
Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.168 2005/08/12 14:08:27 sebastian
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();
http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.66&r2=1.67&ty=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.66 php-src/ext/tidy/tidy.c:1.67
--- php-src/ext/tidy/tidy.c:1.66 Wed Aug 3 10:08:19 2005
+++ php-src/ext/tidy/tidy.c Fri Aug 12 10:08:28 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.66 2005/08/03 14:08:19 sniper Exp $ */
+/* $Id: tidy.c,v 1.67 2005/08/12 14:08:28 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -932,7 +932,7 @@
REGISTER_TIDY_CLASS(tidy, doc, NULL, 0);
REGISTER_TIDY_CLASS(tidyNode, node, NULL, ZEND_ACC_FINAL_CLASS);
/* no exceptions for now..
- REGISTER_TIDY_CLASS(tidyException, exception,
zend_exception_get_default());
+ REGISTER_TIDY_CLASS(tidyException, exception,
zend_exception_get_default(TSRMLS_C));
*/
tidy_object_handlers_doc.get_class_entry = tidy_get_ce_doc;
tidy_object_handlers_node.get_class_entry = tidy_get_ce_node;
@@ -962,7 +962,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Tidy support", "enabled");
php_info_print_table_row(2, "libTidy Release", (char
*)tidyReleaseDate());
- php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66 2005/08/03 14:08:19 sniper Exp
$)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.67 2005/08/12 14:08:28 sebastian Exp
$)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
