[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sat Aug 23 01:32:14 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3146r2=1.3147diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3146 php-src/ChangeLog:1.3147 --- php-src/ChangeLog:1.3146Fri Aug 22 01:32:28 2008 +++ php-src/ChangeLog Sat Aug 23 01:32:13 2008 @@ -1,3 +1,141 @@ +2008-08-22 Felipe Pena [EMAIL PROTECTED] + +* ZendEngine2/zend_compile.c + ext/reflection/php_reflection.c + ext/standard/basic_functions.c: + - Removed unused arguments + +2008-08-22 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_2) + ZendEngine2/zend_list.c: + Fixed destruction of dl() loaded extensions + +* ZendEngine2/zend_list.c + ZendEngine2/zend_list.c: + Removed redundant code + +2008-08-22 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + ZendEngine2/zend_API.c + ZendEngine2/zend_API.c: + MFH: fix zend_register_functions() not displaying duplicate functions + (reported by Gopal) + +* ZendEngine2/zend_API.c: + fix zend_register_functions() not displaying duplicate functions (reported + by Gopal) + +2008-08-22 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_2) + ZendEngine2/tests/get_class_methods_001.phpt + ZendEngine2/tests/get_class_methods_001.phpt + ZendEngine2/tests/get_class_methods_002.phpt + ZendEngine2/tests/get_class_methods_002.phpt + ZendEngine2/tests/get_class_methods_003.phpt + ZendEngine2/tests/get_class_methods_003.phpt: + - New tests + +* ZendEngine2/tests/get_class_methods_001.phpt + ZendEngine2/tests/get_class_methods_001.phpt + ZendEngine2/tests/get_class_methods_001.phpt + ZendEngine2/tests/get_class_methods_002.phpt + ZendEngine2/tests/get_class_methods_002.phpt + ZendEngine2/tests/get_class_methods_002.phpt + ZendEngine2/tests/get_class_methods_003.phpt + ZendEngine2/tests/get_class_methods_003.phpt + ZendEngine2/tests/get_class_methods_003.phpt: +1.1.4; + - New tests + +2008-08-22 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_3) + main/internal_functions.c.in + main/internal_functions_nw.c + main/internal_functions_win32.c + main/main.c + main/mergesort.c + main/php.h: + - MFH Cleanup exports and allow to overwrite ext registration + +* main/internal_functions.c.in + main/internal_functions_nw.c + main/internal_functions_win32.c + main/main.c + main/mergesort.c + main/php.h: + - Cleanup exports and allow to overwrite ext registration + +2008-08-22 Pierre-Alain Joye [EMAIL PROTECTED] + +* win32/glob.h: + - drop sys/ctype.h and use BEGIN/END_DECL_C instead + +2008-08-22 Sebastian Bergmann [EMAIL PROTECTED] + +* (PHP_5_2) + ext/json/json.c: + Fix ZTS build. + +2008-08-22 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ZendEngine2/zend_builtin_functions.c + ZendEngine2/zend_builtin_functions.c + ZendEngine2/tests/bug45862.phpt + ZendEngine2/tests/bug45862.phpt + ZendEngine2/tests/get_class_vars_001.phpt + ZendEngine2/tests/get_class_vars_001.phpt + ZendEngine2/tests/get_class_vars_002.phpt + ZendEngine2/tests/get_class_vars_002.phpt + ZendEngine2/tests/get_class_vars_003.phpt + ZendEngine2/tests/get_class_vars_003.phpt + ZendEngine2/tests/get_class_vars_004.phpt + ZendEngine2/tests/get_class_vars_004.phpt + ZendEngine2/tests/get_class_vars_005.phpt + ZendEngine2/tests/get_class_vars_005.phpt + ZendEngine2/tests/get_class_vars_006.phpt + ZendEngine2/tests/get_class_vars_006.phpt + ZendEngine2/tests/get_class_vars_007.phpt + ZendEngine2/tests/get_class_vars_007.phpt: + MFH: + - Fixed bug #45862 (get_class_vars is inconsistent with 'protected' and + 'private' variables) + - Added some tests + +* ZendEngine2/zend_builtin_functions.c + ZendEngine2/tests/bug45862.phpt + ZendEngine2/tests/bug45862.phpt + ZendEngine2/tests/bug45862.phpt + ZendEngine2/tests/get_class_vars_001.phpt + ZendEngine2/tests/get_class_vars_001.phpt + ZendEngine2/tests/get_class_vars_001.phpt + ZendEngine2/tests/get_class_vars_002.phpt + ZendEngine2/tests/get_class_vars_002.phpt + ZendEngine2/tests/get_class_vars_002.phpt + ZendEngine2/tests/get_class_vars_003.phpt + ZendEngine2/tests/get_class_vars_003.phpt + ZendEngine2/tests/get_class_vars_003.phpt + ZendEngine2/tests/get_class_vars_004.phpt + ZendEngine2/tests/get_class_vars_004.phpt + ZendEngine2/tests/get_class_vars_004.phpt + ZendEngine2/tests/get_class_vars_005.phpt + ZendEngine2/tests/get_class_vars_005.phpt + ZendEngine2/tests/get_class_vars_005.phpt + ZendEngine2/tests/get_class_vars_006.phpt +
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/json json.c
sebastian Fri Aug 22 08:17:02 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/json json.c Log: Fix ZTS build. http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.22r2=1.9.2.23diff_format=u Index: php-src/ext/json/json.c diff -u php-src/ext/json/json.c:1.9.2.22 php-src/ext/json/json.c:1.9.2.23 --- php-src/ext/json/json.c:1.9.2.22Thu Aug 21 18:10:48 2008 +++ php-src/ext/json/json.c Fri Aug 22 08:17:02 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: json.c,v 1.9.2.22 2008/08/21 18:10:48 stas Exp $ */ +/* $Id: json.c,v 1.9.2.23 2008/08/22 08:17:02 sebastian Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -84,7 +84,7 @@ /* }}} */ static void json_encode_r(smart_str *buf, zval *val TSRMLS_DC); -static void json_escape_string(smart_str *buf, char *s, int len); +static void json_escape_string(smart_str *buf, char *s, int len TSRMLS_DC); static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */ { @@ -190,7 +190,7 @@ need_comma = 1; } -json_escape_string(buf, key, key_len - 1); +json_escape_string(buf, key, key_len - 1 TSRMLS_CC); smart_str_appendc(buf, ':'); json_encode_r(buf, *data TSRMLS_CC); @@ -230,7 +230,7 @@ #define REVERSE16(us) (((us 0xf) 12) | (((us 4) 0xf) 8) | (((us 8) 0xf) 4) | ((us 12) 0xf)) -static void json_escape_string(smart_str *buf, char *s, int len) /* {{{ */ +static void json_escape_string(smart_str *buf, char *s, int len TSRMLS_DC) /* {{{ */ { int pos = 0; unsigned short us; @@ -375,7 +375,7 @@ } break; case IS_STRING: -json_escape_string(buf, Z_STRVAL_P(val), Z_STRLEN_P(val)); +json_escape_string(buf, Z_STRVAL_P(val), Z_STRLEN_P(val) TSRMLS_CC); break; case IS_ARRAY: case IS_OBJECT: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-internals-win /script conf_tools.bat snapshot.bat
pajoye Fri Aug 22 09:17:42 2008 UTC Modified files: /php-internals-win/script conf_tools.bat snapshot.bat Log: - add symlink for the -latest.zip http://cvs.php.net/viewvc.cgi/php-internals-win/script/conf_tools.bat?r1=1.1r2=1.2diff_format=u Index: php-internals-win/script/conf_tools.bat diff -u php-internals-win/script/conf_tools.bat:1.1 php-internals-win/script/conf_tools.bat:1.2 --- php-internals-win/script/conf_tools.bat:1.1 Thu Aug 7 17:04:33 2008 +++ php-internals-win/script/conf_tools.bat Fri Aug 22 09:17:42 2008 @@ -11,3 +11,5 @@ SET REMOTE_USER=edink SET [EMAIL PROTECTED] SET REMOTE_PATH=/local/sites/snaps.php.net/www/win32 +SET HOMEPATH=\Documents and Settings\pierre +SET HOMEDRIVE=C: http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.6r2=1.7diff_format=u Index: php-internals-win/script/snapshot.bat diff -u php-internals-win/script/snapshot.bat:1.6 php-internals-win/script/snapshot.bat:1.7 --- php-internals-win/script/snapshot.bat:1.6 Wed Aug 13 21:28:01 2008 +++ php-internals-win/script/snapshot.bat Fri Aug 22 09:17:42 2008 @@ -68,12 +68,22 @@ REM Using -i now REM %PUTTYBASE%pageant.exe %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -%PUTTYBASE%plink.exe -batch -l %REMOTE_USER% -m %PHP_SDK_PATH%script\snap_delete_old.sh snaps.php.net -%PUTTYBASE%pscp.exe -batch -q -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% %START%\php%_PHPVERSION_SHORT%-dbgpack-win32-%SNAPDATETIME%.zip %SSH_URL%:%REMOTE_PATH% %LOG_DIR%\scp_%SNAPDATETIME%.log 21 -%PUTTYBASE%pscp.exe -batch -q -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% %START%\php%_PHPVERSION_SHORT%-win32-%SNAPDATETIME%.zip %SSH_URL%:%REMOTE_PATH% %LOG_DIR%\scp_%SNAPDATETIME%.log 21 -%PUTTYBASE%pscp.exe -batch -q -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% %START%\compile.log %SSH_URL%:%REMOTE_PATH%/compile-%_PHPVERSION_SHORT%.log %LOG_DIR%\scp_%SNAPDATETIME%.log 21 -%PUTTYBASE%pscp.exe -batch -q -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% %START%\cvs.log %SSH_URL%:%REMOTE_PATH%/cvs-%_PHPVERSION_SHORT%.log %LOG_DIR%\scp_%SNAPDATETIME%.log 21 -%PUTTYBASE%pscp.exe -batch -q -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% %START%\buildconf.log %SSH_URL%:%REMOTE_PATH%/buildconf-%_PHPVERSION_SHORT%.log %LOG_DIR%\scp_%SNAPDATETIME%.log 21 +SET PHP_SDK_PPK=%PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk +%PUTTYBASE%plink.exe -batch -l %REMOTE_USER% -m %PHP_SDK_PATH%script\snap_delete_old.sh snaps.php.net %LOG_DIR%\scp_%SNAPDATETIME%.log 21 +%PUTTYBASE%pscp.exe -batch -q -i %PHP_SDK_PPK% -l %REMOTE_USER% %START%\php%_PHPVERSION_SHORT%-dbgpack-win32-%SNAPDATETIME%.zip %SSH_URL%:%REMOTE_PATH% %LOG_DIR%\scp_%SNAPDATETIME%.log 21 +%PUTTYBASE%pscp.exe -batch -q -i %PHP_SDK_PPK% -l %REMOTE_USER% %START%\php%_PHPVERSION_SHORT%-win32-%SNAPDATETIME%.zip %SSH_URL%:%REMOTE_PATH% %LOG_DIR%\scp_%SNAPDATETIME%.log 21 +%PUTTYBASE%pscp.exe -batch -q -i %PHP_SDK_PPK% -l %REMOTE_USER% %START%\compile.log %SSH_URL%:%REMOTE_PATH%/compile-%_PHPVERSION_SHORT%.log %LOG_DIR%\scp_%SNAPDATETIME%.log 21 +%PUTTYBASE%pscp.exe -batch -q -i %PHP_SDK_PPK% -l %REMOTE_USER% %START%\cvs.log %SSH_URL%:%REMOTE_PATH%/cvs-%_PHPVERSION_SHORT%.log %LOG_DIR%\scp_%SNAPDATETIME%.log 21 +%PUTTYBASE%pscp.exe -batch -q -i %PHP_SDK_PPK% -l %REMOTE_USER% %START%\buildconf.log %SSH_URL%:%REMOTE_PATH%/buildconf-%_PHPVERSION_SHORT%.log %LOG_DIR%\scp_%SNAPDATETIME%.log 21 + +REM Create the -latest links +%PUTTYBASE%plink.exe -i %PHP_SDK_PPK% -l %REMOTE_USER% snaps.php.net rm -f %REMOTE_PATH%/php%_PHPVERSION_SHORT%-win32-latest.zip %LOG_DIR%\scp_%SNAPDATETIME%.log 21 +%PUTTYBASE%plink.exe -i %PHP_SDK_PPK% -l %REMOTE_USER% snaps.php.net rm -f %REMOTE_PATH%/php%_PHPVERSION_SHORT%-dbgpack-win32-latest.zip %LOG_DIR%\scp_%SNAPDATETIME%.log 21 +%PUTTYBASE%plink.exe -i %PHP_SDK_PPK% -l %REMOTE_USER% snaps.php.net rm -f %REMOTE_PATH%/compile-%_PHPVERSION_SHORT%-latest.log %LOG_DIR%\scp_%SNAPDATETIME%.log 21 + +%PUTTYBASE%plink.exe -i %PHP_SDK_PPK% -l %REMOTE_USER% snaps.php.net ln -s %REMOTE_PATH%/php%_PHPVERSION_SHORT%-win32-%SNAPDATETIME%.zip %REMOTE_PATH%/php%_PHPVERSION_SHORT%-win32-latest.zip %LOG_DIR%\scp_%SNAPDATETIME%.log 21 +%PUTTYBASE%plink.exe -i %PHP_SDK_PPK% -l %REMOTE_USER% snaps.php.net ln -s %REMOTE_PATH%/php%_PHPVERSION_SHORT%-dbgpack-win32-%SNAPDATETIME%.zip %REMOTE_PATH%/php%_PHPVERSION_SHORT%-dbgpack-win32-latest.zip %LOG_DIR%\scp_%SNAPDATETIME%.log 21 +%PUTTYBASE%plink.exe -i %PHP_SDK_PPK% -l %REMOTE_USER% snaps.php.net ln -s %REMOTE_PATH%/compile-%_PHPVERSION_SHORT%.log %REMOTE_PATH%/compile-%_PHPVERSION_SHORT%-latest.log %LOG_DIR%\scp_%SNAPDATETIME%.log 21 del %START%\php%_PHPVERSION_SHORT%-dbgpack-win32-%SNAPDATETIME%.zip del %START%\php%_PHPVERSION_SHORT%-win32-%SNAPDATETIME%.zip -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit:
[PHP-CVS] cvs: php-src /win32 glob.h
pajoye Fri Aug 22 11:40:45 2008 UTC Modified files: /php-src/win32 glob.h Log: - drop sys/ctype.h and use BEGIN/END_DECL_C instead http://cvs.php.net/viewvc.cgi/php-src/win32/glob.h?r1=1.1r2=1.2diff_format=u Index: php-src/win32/glob.h diff -u php-src/win32/glob.h:1.1 php-src/win32/glob.h:1.2 --- php-src/win32/glob.h:1.1Sun May 19 14:32:24 2002 +++ php-src/win32/glob.hFri Aug 22 11:40:45 2008 @@ -1,4 +1,4 @@ -/* $Id: glob.h,v 1.1 2002/05/19 14:32:24 edink Exp $ */ +/* $Id: glob.h,v 1.2 2008/08/22 11:40:45 pajoye Exp $ */ /* OpenBSD: glob.h,v 1.7 2002/02/17 19:42:21 millert Exp */ /* NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp*/ @@ -43,7 +43,9 @@ #ifndef _GLOB_H_ #define_GLOB_H_ -#include sys/cdefs.h +#ifndef PHP_WIN32 +# include sys/cdefs.h +#endif struct stat; typedef struct { @@ -93,9 +95,8 @@ #defineGLOB_NOSYS (-4)/* Function not supported. */ #define GLOB_ABEND GLOB_ABORTED -__BEGIN_DECLS +BEGIN_EXTERN_C() intglob(const char *, int, int (*)(const char *, int), glob_t *); void globfree(glob_t *); -__END_DECLS - +END_EXTERN_C() #endif /* !_GLOB_H_ */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/json json.c utf8_to_utf16.c /ext/json/tests bug43941.phpt
Why do we need this check here, wouldn't it already be executed by the internal error handler? On 21-Aug-08, at 2:10 PM, Stanislav Malyshev wrote: if(!PG(display_errors)) { Ilia Alshanetsky -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main internal_functions.c.in internal_functions_nw.c internal_functions_win32.c main.c mergesort.c php.h
helly Fri Aug 22 12:59:39 2008 UTC Modified files: /php-src/main internal_functions.c.in internal_functions_nw.c internal_functions_win32.c main.c mergesort.c php.h Log: - Cleanup exports and allow to overwrite ext registration http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions.c.in?r1=1.32r2=1.33diff_format=u Index: php-src/main/internal_functions.c.in diff -u php-src/main/internal_functions.c.in:1.32 php-src/main/internal_functions.c.in:1.33 --- php-src/main/internal_functions.c.in:1.32 Sat Aug 12 19:41:28 2006 +++ php-src/main/internal_functions.c.inFri Aug 22 12:59:38 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: internal_functions.c.in,v 1.32 2006/08/12 19:41:28 nlopess Exp $ */ +/* $Id: internal_functions.c.in,v 1.33 2008/08/22 12:59:38 helly Exp $ */ #include php.h #include php_main.h @@ -34,9 +34,8 @@ }; #define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *)) - -int php_register_internal_extensions(TSRMLS_D) +PHPAPI int php_register_internal_extensions(TSRMLS_D) { return php_register_extensions(php_builtin_extensions, EXTCOUNT TSRMLS_CC); } http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions_nw.c?r1=1.14r2=1.15diff_format=u Index: php-src/main/internal_functions_nw.c diff -u php-src/main/internal_functions_nw.c:1.14 php-src/main/internal_functions_nw.c:1.15 --- php-src/main/internal_functions_nw.c:1.14 Mon Dec 31 07:12:18 2007 +++ php-src/main/internal_functions_nw.cFri Aug 22 12:59:38 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: internal_functions_nw.c,v 1.14 2007/12/31 07:12:18 sebastian Exp $ */ +/* $Id: internal_functions_nw.c,v 1.15 2008/08/22 12:59:38 helly Exp $ */ /* {{{ includes */ @@ -83,8 +83,7 @@ #define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *)) - -int php_register_internal_extensions(TSRMLS_D) +PHPAPI int php_register_internal_extensions(TSRMLS_D) { return php_register_extensions(php_builtin_extensions, EXTCOUNT TSRMLS_CC); } http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions_win32.c?r1=1.92r2=1.93diff_format=u Index: php-src/main/internal_functions_win32.c diff -u php-src/main/internal_functions_win32.c:1.92 php-src/main/internal_functions_win32.c:1.93 --- php-src/main/internal_functions_win32.c:1.92Mon Dec 31 07:12:18 2007 +++ php-src/main/internal_functions_win32.c Fri Aug 22 12:59:38 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: internal_functions_win32.c,v 1.92 2007/12/31 07:12:18 sebastian Exp $ */ +/* $Id: internal_functions_win32.c,v 1.93 2008/08/22 12:59:38 helly Exp $ */ /* {{{ includes */ @@ -157,7 +157,7 @@ #define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *)) -int php_register_internal_extensions(TSRMLS_D) +PHPAPI int php_register_internal_extensions(TSRMLS_D) { return php_register_extensions(php_builtin_extensions, EXTCOUNT TSRMLS_CC); } http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.779r2=1.780diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.779 php-src/main/main.c:1.780 --- php-src/main/main.c:1.779 Fri Aug 15 19:45:25 2008 +++ php-src/main/main.c Fri Aug 22 12:59:38 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: main.c,v 1.779 2008/08/15 19:45:25 felipe Exp $ */ +/* $Id: main.c,v 1.780 2008/08/22 12:59:38 helly Exp $ */ /* {{{ includes */ @@ -91,6 +91,8 @@ #include rfc1867.h /* }}} */ +PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) = php_register_internal_extensions; + #ifndef ZTS php_core_globals core_globals; #else @@ -1995,7 +1997,7 @@ zend_register_default_classes(TSRMLS_C); /* startup extensions staticly compiled in */ - if (php_register_internal_extensions(TSRMLS_C) == FAILURE) { + if (php_register_internal_extensions_func(TSRMLS_C) == FAILURE) { php_printf(Unable to start builtin modules\n); return FAILURE; } http://cvs.php.net/viewvc.cgi/php-src/main/mergesort.c?r1=1.15r2=1.16diff_format=u Index: php-src/main/mergesort.c diff -u php-src/main/mergesort.c:1.15 php-src/main/mergesort.c:1.16 --- php-src/main/mergesort.c:1.15 Thu Sep 23 15:57:30 2004 +++ php-src/main/mergesort.cFri Aug 22 12:59:38 2008 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -/* $Id: mergesort.c,v 1.15 2004/09/23 15:57:30 hyanantha Exp $ */ +/* $Id: mergesort.c,v 1.16 2008/08/22 12:59:38 helly Exp $ */ #if defined(LIBC_SCCS) !defined(lint) static char sccsid[] = @(#)merge.c8.2 (Berkeley) 2/14/94; @@ -102,7 +102,7 @@ /* {{{ php_mergesort * Arguments are as for qsort. */ -int
[PHP-CVS] cvs: php-src(PHP_5_3) /main internal_functions.c.in internal_functions_nw.c internal_functions_win32.c main.c mergesort.c php.h
helly Fri Aug 22 12:59:46 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/main internal_functions.c.in internal_functions_nw.c internal_functions_win32.c main.c mergesort.c php.h Log: - MFH Cleanup exports and allow to overwrite ext registration http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions.c.in?r1=1.30.2.1.2.2r2=1.30.2.1.2.2.2.1diff_format=u Index: php-src/main/internal_functions.c.in diff -u php-src/main/internal_functions.c.in:1.30.2.1.2.2 php-src/main/internal_functions.c.in:1.30.2.1.2.2.2.1 --- php-src/main/internal_functions.c.in:1.30.2.1.2.2 Mon Jan 1 19:32:09 2007 +++ php-src/main/internal_functions.c.inFri Aug 22 12:59:46 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: internal_functions.c.in,v 1.30.2.1.2.2 2007/01/01 19:32:09 iliaa Exp $ */ +/* $Id: internal_functions.c.in,v 1.30.2.1.2.2.2.1 2008/08/22 12:59:46 helly Exp $ */ #include php.h #include php_main.h @@ -34,9 +34,8 @@ }; #define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *)) - -int php_register_internal_extensions(TSRMLS_D) +PHPAPI int php_register_internal_extensions(TSRMLS_D) { return php_register_extensions(php_builtin_extensions, EXTCOUNT TSRMLS_CC); } http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions_nw.c?r1=1.9.2.1.2.2.2.1r2=1.9.2.1.2.2.2.2diff_format=u Index: php-src/main/internal_functions_nw.c diff -u php-src/main/internal_functions_nw.c:1.9.2.1.2.2.2.1 php-src/main/internal_functions_nw.c:1.9.2.1.2.2.2.2 --- php-src/main/internal_functions_nw.c:1.9.2.1.2.2.2.1Mon Dec 31 07:17:17 2007 +++ php-src/main/internal_functions_nw.cFri Aug 22 12:59:46 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: internal_functions_nw.c,v 1.9.2.1.2.2.2.1 2007/12/31 07:17:17 sebastian Exp $ */ +/* $Id: internal_functions_nw.c,v 1.9.2.1.2.2.2.2 2008/08/22 12:59:46 helly Exp $ */ /* {{{ includes */ @@ -84,8 +84,7 @@ #define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *)) - -int php_register_internal_extensions(TSRMLS_D) +PHPAPI int php_register_internal_extensions(TSRMLS_D) { return php_register_extensions(php_builtin_extensions, EXTCOUNT TSRMLS_CC); } http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions_win32.c?r1=1.87.2.1.2.3.2.1r2=1.87.2.1.2.3.2.2diff_format=u Index: php-src/main/internal_functions_win32.c diff -u php-src/main/internal_functions_win32.c:1.87.2.1.2.3.2.1 php-src/main/internal_functions_win32.c:1.87.2.1.2.3.2.2 --- php-src/main/internal_functions_win32.c:1.87.2.1.2.3.2.1Mon Dec 31 07:17:17 2007 +++ php-src/main/internal_functions_win32.c Fri Aug 22 12:59:46 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: internal_functions_win32.c,v 1.87.2.1.2.3.2.1 2007/12/31 07:17:17 sebastian Exp $ */ +/* $Id: internal_functions_win32.c,v 1.87.2.1.2.3.2.2 2008/08/22 12:59:46 helly Exp $ */ /* {{{ includes */ @@ -193,7 +193,7 @@ #define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *)) -int php_register_internal_extensions(TSRMLS_D) +PHPAPI int php_register_internal_extensions(TSRMLS_D) { return php_register_extensions(php_builtin_extensions, EXTCOUNT TSRMLS_CC); } http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.29r2=1.640.2.23.2.57.2.30diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.640.2.23.2.57.2.29 php-src/main/main.c:1.640.2.23.2.57.2.30 --- php-src/main/main.c:1.640.2.23.2.57.2.29Fri Aug 15 19:47:33 2008 +++ php-src/main/main.c Fri Aug 22 12:59:46 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: main.c,v 1.640.2.23.2.57.2.29 2008/08/15 19:47:33 felipe Exp $ */ +/* $Id: main.c,v 1.640.2.23.2.57.2.30 2008/08/22 12:59:46 helly Exp $ */ /* {{{ includes */ @@ -91,6 +91,8 @@ #include rfc1867.h /* }}} */ +PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) = php_register_internal_extensions; + #ifndef ZTS php_core_globals core_globals; #else @@ -1868,7 +1870,7 @@ zend_register_default_classes(TSRMLS_C); /* startup extensions staticly compiled in */ - if (php_register_internal_extensions(TSRMLS_C) == FAILURE) { + if (php_register_internal_extensions_func(TSRMLS_C) == FAILURE) { php_printf(Unable to start builtin modules\n); return FAILURE; } http://cvs.php.net/viewvc.cgi/php-src/main/mergesort.c?r1=1.15r2=1.15.6.1diff_format=u Index: php-src/main/mergesort.c diff -u php-src/main/mergesort.c:1.15 php-src/main/mergesort.c:1.15.6.1 --- php-src/main/mergesort.c:1.15 Thu Sep 23 15:57:30 2004 +++ php-src/main/mergesort.cFri Aug 22 12:59:46
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/standard basic_functions.c ZendEngine2 zend_compile.c
felipe Fri Aug 22 15:51:51 2008 UTC Modified files: /ZendEngine2zend_compile.c /php-src/ext/standard basic_functions.c /php-src/ext/reflection php_reflection.c Log: - Removed unused arguments http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.837r2=1.838diff_format=u Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.837 ZendEngine2/zend_compile.c:1.838 --- ZendEngine2/zend_compile.c:1.837Tue Aug 12 17:15:59 2008 +++ ZendEngine2/zend_compile.c Fri Aug 22 15:51:50 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: zend_compile.c,v 1.837 2008/08/12 17:15:59 felipe Exp $ */ +/* $Id: zend_compile.c,v 1.838 2008/08/22 15:51:50 felipe Exp $ */ #include zend_language_parser.h #include zend.h @@ -2898,7 +2898,7 @@ zend_update_class_constants(parent_ce TSRMLS_CC); zend_hash_apply_with_arguments(CE_STATIC_MEMBERS(parent_ce) TSRMLS_CC, (apply_func_args_t)inherit_static_prop, 1, ce-default_static_members); } else { - zend_hash_apply_with_arguments(parent_ce-default_static_members TSRMLS_CC, (apply_func_args_t)inherit_static_prop, 1, ce-default_static_members TSRMLS_CC); + zend_hash_apply_with_arguments(parent_ce-default_static_members TSRMLS_CC, (apply_func_args_t)inherit_static_prop, 1, ce-default_static_members); } zend_hash_merge_ex(ce-properties_info, parent_ce-properties_info, (copy_ctor_func_t) (ce-type ZEND_INTERNAL_CLASS ? zend_duplicate_property_info_internal : zend_duplicate_property_info), sizeof(zend_property_info), (merge_checker_func_t) do_inherit_property_access_check, ce); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.927r2=1.928diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.927 php-src/ext/standard/basic_functions.c:1.928 --- php-src/ext/standard/basic_functions.c:1.927Thu Aug 21 23:37:40 2008 +++ php-src/ext/standard/basic_functions.c Fri Aug 22 15:51:50 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.927 2008/08/21 23:37:40 pajoye Exp $ */ +/* $Id: basic_functions.c,v 1.928 2008/08/22 15:51:50 felipe Exp $ */ #include php.h #include php_streams.h @@ -4945,7 +4945,7 @@ } else if (Z_TYPE_P(entry) == IS_ARRAY) { MAKE_STD_ZVAL(tmp); array_init(tmp); - zend_hash_apply_with_arguments(Z_ARRVAL_P(entry) TSRMLS_CC, (apply_func_args_t) add_config_entry_cb, 1, tmp TSRMLS_CC); + zend_hash_apply_with_arguments(Z_ARRVAL_P(entry) TSRMLS_CC, (apply_func_args_t) add_config_entry_cb, 1, tmp); add_assoc_zval_ex(retval, hash_key-arKey.s, hash_key-nKeyLength, tmp); } return 0; http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.317r2=1.318diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.317 php-src/ext/reflection/php_reflection.c:1.318 --- php-src/ext/reflection/php_reflection.c:1.317 Mon Aug 18 19:42:38 2008 +++ php-src/ext/reflection/php_reflection.c Fri Aug 22 15:51:50 2008 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.317 2008/08/18 19:42:38 felipe Exp $ */ +/* $Id: php_reflection.c,v 1.318 2008/08/22 15:51:50 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -1035,7 +1035,7 @@ int num_constants = 0; string_init(str_constants); - zend_hash_apply_with_arguments(EG(zend_constants) TSRMLS_CC, (apply_func_args_t) _extension_const_string, 4, str_constants, indent, module, num_constants TSRMLS_CC); + zend_hash_apply_with_arguments(EG(zend_constants) TSRMLS_CC, (apply_func_args_t) _extension_const_string, 4, str_constants, indent, module, num_constants); if (num_constants) { string_printf(str, \n - Constants [%d] {\n, num_constants); string_append(str, str_constants); @@ -1072,7 +1072,7 @@ string_init(sub_indent); string_printf(sub_indent, %s, indent); string_init(str_classes); - zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) _extension_class_string, 4, str_classes, sub_indent.string, module, num_classes TSRMLS_CC); + zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) _extension_class_string, 4, str_classes, sub_indent.string, module, num_classes); if (num_classes) { string_printf(str, \n - Classes [%d] {, num_classes);
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection php_reflection.c ZendEngine2 zend_compile.c
felipe Fri Aug 22 15:54:22 2008 UTC Modified files: (Branch: PHP_5_3) /ZendEngine2zend_compile.c /php-src/ext/reflection php_reflection.c Log: - MFH: Removed unused arguments http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.41.2.82r2=1.647.2.27.2.41.2.83diff_format=u Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.82 ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.83 --- ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.82 Tue Aug 12 17:20:24 2008 +++ ZendEngine2/zend_compile.c Fri Aug 22 15:54:20 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.82 2008/08/12 17:20:24 felipe Exp $ */ +/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.83 2008/08/22 15:54:20 felipe Exp $ */ #include zend_language_parser.h #include zend.h @@ -2790,7 +2790,7 @@ zend_update_class_constants(parent_ce TSRMLS_CC); zend_hash_apply_with_arguments(CE_STATIC_MEMBERS(parent_ce) TSRMLS_CC, (apply_func_args_t)inherit_static_prop, 1, ce-default_static_members); } else { - zend_hash_apply_with_arguments(parent_ce-default_static_members TSRMLS_CC, (apply_func_args_t)inherit_static_prop, 1, ce-default_static_members TSRMLS_CC); + zend_hash_apply_with_arguments(parent_ce-default_static_members TSRMLS_CC, (apply_func_args_t)inherit_static_prop, 1, ce-default_static_members); } zend_hash_merge_ex(ce-properties_info, parent_ce-properties_info, (copy_ctor_func_t) (ce-type ZEND_INTERNAL_CLASS ? zend_duplicate_property_info_internal : zend_duplicate_property_info), sizeof(zend_property_info), (merge_checker_func_t) do_inherit_property_access_check, ce); http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.33r2=1.164.2.33.2.45.2.34diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.33 php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.34 --- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.33Mon Aug 11 22:31:21 2008 +++ php-src/ext/reflection/php_reflection.c Fri Aug 22 15:54:21 2008 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.33 2008/08/11 22:31:21 cseiler Exp $ */ +/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.34 2008/08/22 15:54:21 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -1010,7 +1010,7 @@ int num_constants = 0; string_init(str_constants); - zend_hash_apply_with_arguments(EG(zend_constants) TSRMLS_CC, (apply_func_args_t) _extension_const_string, 4, str_constants, indent, module, num_constants TSRMLS_CC); + zend_hash_apply_with_arguments(EG(zend_constants) TSRMLS_CC, (apply_func_args_t) _extension_const_string, 4, str_constants, indent, module, num_constants); if (num_constants) { string_printf(str, \n - Constants [%d] {\n, num_constants); string_append(str, str_constants); @@ -1047,7 +1047,7 @@ string_init(sub_indent); string_printf(sub_indent, %s, indent); string_init(str_classes); - zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) _extension_class_string, 4, str_classes, sub_indent.string, module, num_classes TSRMLS_CC); + zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) _extension_class_string, 4, str_classes, sub_indent.string, module, num_classes); if (num_classes) { string_printf(str, \n - Classes [%d] {, num_classes); string_append(str, str_classes); @@ -4648,7 +4648,7 @@ GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); - zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) add_extension_class, 3, return_value, module, 1 TSRMLS_CC); + zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) add_extension_class, 3, return_value, module, 1); } /* }}} */ @@ -4663,7 +4663,7 @@ GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); - zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) add_extension_class, 3, return_value, module, 0 TSRMLS_CC); + zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) add_extension_class, 3, return_value, module, 0); } /* }}} */ @@ -5242,7 +5242,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Reflection, enabled); - php_info_print_table_row(2, Version, $Id:
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/json json.c utf8_to_utf16.c /ext/json/tests bug43941.phpt
Hi! Why do we need this check here, wouldn't it already be executed by the internal error handler? IIRC, it plays kind of opposite to what happens to the error handler - if display_errors is on, nothing is printed, in order not to put that error message into wrong context. I'm not sure it's that useful, but I remember somebody asking for it. My personal opinion is that running production server with display_errors=on means one already have shot oneself in the foot, but you know. IIRC there are some other places which do the same. -- Stanislav Malyshev, Zend Software Architect [EMAIL PROTECTED] http://www.zend.com/ (408)253-8829 MSN: [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: win-installer / ExtensionsFeatures53.wxs WixUI_en-us.wxl
jmertic Fri Aug 22 18:50:02 2008 UTC Modified files: /win-installer ExtensionsFeatures53.wxs WixUI_en-us.wxl Log: Adding php_intl extension, and removed some file references that don't exist anymore. http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.6r2=1.7diff_format=u Index: win-installer/ExtensionsFeatures53.wxs diff -u win-installer/ExtensionsFeatures53.wxs:1.6 win-installer/ExtensionsFeatures53.wxs:1.7 --- win-installer/ExtensionsFeatures53.wxs:1.6 Mon Aug 11 19:58:24 2008 +++ win-installer/ExtensionsFeatures53.wxs Fri Aug 22 18:50:01 2008 @@ -157,6 +157,16 @@ ComponentRef Id=php_interbase/ ComponentRef Id=gds32DLL/ /Feature + Feature AllowAdvertise=no Id=ext_php_intl Title=$(loc.Featureext_php_intlTitle) Description=$(loc.Featureext_php_intlDescription) Level=10 + ComponentRef Id=php_intl/ + ComponentRef Id=icudt36DLL/ + ComponentRef Id=icuin36DLL/ + ComponentRef Id=icuio36DLL/ + ComponentRef Id=icule36DLL/ + ComponentRef Id=iculx36DLL/ + ComponentRef Id=icutu36DLL/ + ComponentRef Id=icuuc36DLL/ + /Feature Feature AllowAdvertise=no Id=ext_php_ixsfunc Title=$(loc.Featureext_php_ixsfuncTitle) Description=$(loc.Featureext_php_ixsfuncDescription) Level=10 ComponentRef Id=php_ixsfunc/ /Feature @@ -204,11 +214,9 @@ /Feature Feature AllowAdvertise=no Id=ext_php_mhash Title=$(loc.Featureext_php_mhashTitle) Description=$(loc.Featureext_php_mhashDescription) TypicalDefault=install Level=1 ComponentRef Id=php_mhash/ - ComponentRef Id=libmhashDLL/ /Feature Feature AllowAdvertise=no Id=ext_php_mime_magic Title=$(loc.Featureext_php_mime_magicTitle) Description=$(loc.Featureext_php_mime_magicDescription) Level=10 ComponentRef Id=php_mime_magic/ - ComponentRef Id=magicMIME/ /Feature Feature AllowAdvertise=no Id=ext_php_ming Title=$(loc.Featureext_php_mingTitle) Description=$(loc.Featureext_php_mingDescription) Level=10 ComponentRef Id=php_ming/ @@ -240,8 +248,6 @@ ComponentRef Id=php_openssl/ ComponentRef Id=ssleay32DLL/ ComponentRef Id=libeay32DLL/ - ComponentRef Id=opensslCNF/ - ComponentRef Id=READMESSLTXT/ /Feature Feature AllowAdvertise=no Id=ext_php_operator Title=$(loc.Featureext_php_operatorTitle) Description=$(loc.Featureext_php_operatorDescription) Level=10 ComponentRef Id=php_operator/ @@ -348,7 +354,6 @@ /Feature Feature AllowAdvertise=no Id=ext_php_snmp Title=$(loc.Featureext_php_snmpTitle) Description=$(loc.Featureext_php_snmpDescription) Level=10 ComponentRef Id=php_snmp/ - ComponentRef Id=mibsdir / /Feature Feature AllowAdvertise=no Id=ext_php_soap Title=$(loc.Featureext_php_soapTitle) Description=$(loc.Featureext_php_soapDescription) TypicalDefault=install Level=1 ComponentRef Id=php_soap/ http://cvs.php.net/viewvc.cgi/win-installer/WixUI_en-us.wxl?r1=1.25r2=1.26diff_format=u Index: win-installer/WixUI_en-us.wxl diff -u win-installer/WixUI_en-us.wxl:1.25 win-installer/WixUI_en-us.wxl:1.26 --- win-installer/WixUI_en-us.wxl:1.25 Thu Aug 7 17:34:55 2008 +++ win-installer/WixUI_en-us.wxl Fri Aug 22 18:50:01 2008 @@ -678,6 +678,8 @@ String Id=Featureext_php_imapDescriptionIMAP POP3 and NNTP functions/String String Id=Featureext_php_interbaseTitleInterbase/String String Id=Featureext_php_interbaseDescriptionInterBase functions/String + String Id=Featureext_php_intlTitleInternationalization (intl)/String + String Id=Featureext_php_intlDescriptionInternationalization extension (further is referred as Intl) is a wrapper for ICU library, enabling PHP programmers to perform UCA-conformant collation and date/time/number/currency formatting in their scripts./String String Id=Featureext_php_javaTitleJava/String String Id=Featureext_php_javaDescriptionPHP / Java Integration/String String Id=Featureext_php_jsonTitlejson/String -- PHP
[PHP-CVS] cvs: win-installer / ExtensionsGUID.xml
jmertic Fri Aug 22 19:01:08 2008 UTC Modified files: /win-installer ExtensionsGUID.xml Log: Added guids for php_intl and php_oci8_11g http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsGUID.xml?r1=1.9r2=1.10diff_format=u Index: win-installer/ExtensionsGUID.xml diff -u win-installer/ExtensionsGUID.xml:1.9 win-installer/ExtensionsGUID.xml:1.10 --- win-installer/ExtensionsGUID.xml:1.9Mon Aug 4 15:11:38 2008 +++ win-installer/ExtensionsGUID.xmlFri Aug 22 19:01:07 2008 @@ -137,4 +137,6 @@ Extension Name=php_phk Guid=18FEB773-02FA-4B96-B682-04F08BCD1B7A/ Extension Name=php_sqlite3 Guid=47043346-952F-454A-B19A-615A32BD9EAD/ Extension Name=php_ffi Guid=B18F94FC-4688-4C7E-87A1-8EEC8F52417D/ + Extension Name=php_intl Guid=9048A2B4-188A-438D-8AB8-6BFE7D0910FE/ + Extension Name=php_oci8_11g Guid=0A362A05-C876-420C-8F82-9F8AB8912A78/ /Extensions -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php