helly Wed Dec 31 14:05:22 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend.c zend.h
/php-src/main main.c
Log:
- Sync with HEAD, no ability to not start builtin functions
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.35.2.26&r2=1.308.2.12.2.35.2.27&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.308.2.12.2.35.2.26
ZendEngine2/zend.c:1.308.2.12.2.35.2.27
--- ZendEngine2/zend.c:1.308.2.12.2.35.2.26 Wed Dec 31 12:26:33 2008
+++ ZendEngine2/zend.c Wed Dec 31 14:05:22 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.c,v 1.308.2.12.2.35.2.26 2008/12/31 12:26:33 helly Exp $ */
+/* $Id: zend.c,v 1.308.2.12.2.35.2.27 2008/12/31 14:05:22 helly Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -588,7 +588,7 @@
void zend_init_opcodes_handlers(void);
-int zend_startup(zend_utility_functions *utility_functions, char **extensions,
int start_builtin_functions TSRMLS_DC) /* {{{ */
+int zend_startup(zend_utility_functions *utility_functions, char **extensions
TSRMLS_DC) /* {{{ */
{
#ifdef ZTS
zend_compiler_globals *compiler_globals;
@@ -685,10 +685,8 @@
EG(user_error_handler) = NULL;
EG(user_exception_handler) = NULL;
#endif
- if (start_builtin_functions) {
- zend_startup_builtin_functions(TSRMLS_C);
- }
+ zend_startup_builtin_functions(TSRMLS_C);
zend_register_standard_constants(TSRMLS_C);
zend_register_auto_global("GLOBALS", sizeof("GLOBALS") - 1, NULL
TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.h?r1=1.293.2.11.2.9.2.30&r2=1.293.2.11.2.9.2.31&diff_format=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.293.2.11.2.9.2.30
ZendEngine2/zend.h:1.293.2.11.2.9.2.31
--- ZendEngine2/zend.h:1.293.2.11.2.9.2.30 Wed Dec 31 11:15:31 2008
+++ ZendEngine2/zend.h Wed Dec 31 14:05:22 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.h,v 1.293.2.11.2.9.2.30 2008/12/31 11:15:31 sebastian Exp $ */
+/* $Id: zend.h,v 1.293.2.11.2.9.2.31 2008/12/31 14:05:22 helly Exp $ */
#ifndef ZEND_H
#define ZEND_H
@@ -526,7 +526,7 @@
#define OE_IS_OBJECT (1<<1)
#define OE_IS_METHOD (1<<2)
-int zend_startup(zend_utility_functions *utility_functions, char **extensions,
int start_builtin_functions TSRMLS_DC);
+int zend_startup(zend_utility_functions *utility_functions, char **extensions
TSRMLS_DC);
void zend_shutdown(TSRMLS_D);
void zend_register_standard_ini_entries(TSRMLS_D);
void zend_post_startup(TSRMLS_D);
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.39&r2=1.640.2.23.2.57.2.40&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.39
php-src/main/main.c:1.640.2.23.2.57.2.40
--- php-src/main/main.c:1.640.2.23.2.57.2.39 Wed Dec 31 13:25:21 2008
+++ php-src/main/main.c Wed Dec 31 14:05:22 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23.2.57.2.39 2008/12/31 13:25:21 helly Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.40 2008/12/31 14:05:22 helly Exp $ */
/* {{{ includes
*/
@@ -1738,7 +1738,7 @@
zuf.vspprintf_function = vspprintf;
zuf.getenv_function = sapi_getenv;
zuf.resolve_path_function = php_resolve_path_for_zend;
- zend_startup(&zuf, NULL, 1 TSRMLS_CC);
+ zend_startup(&zuf, NULL TSRMLS_CC);
#ifdef ZTS
executor_globals = ts_resource(executor_globals_id);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
