com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_b uiltin_functions.c Zend/zend_compile.c Zend/zend_ execute_API.c Zend/zend_globals.h
Zend/zend_langu age_scanner.h configure.in ext/date/php_date.c ext/date/php_date.h ext/mbstring/oniguruma/HISTORY ext/ mysql/php_mysql.c
ext/mysqlnd/mysqlnd_net.c ext/ref lection/php_reflection.c ext/sqlite3/libsqlite/sqlite 3.c ext/standard/pack.c
| From: | Stanislav Malyshev | Date: | Sun, 04 Aug 2013 23:06:24 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_b uiltin_functions.c Zend/zend_compile.c Zend/zend_ execute_API.c Zend/zend_globals.h Zend/zend_langu age_scanner.h configure.in ext/date/php_date.c ext/date/php_date.h ext/mbstring/oniguruma/HISTORY ext/ mysql/php_mysql.c ext/mysqlnd/mysqlnd_net.c ext/ref lection/php_reflection.c ext/sqlite3/libsqlite/sqlite 3.c ext/standard/pack.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72821@lists.php.net to get a copy of this message | ||
Commit: c793a6569013f9ab46f2cd7331cc1a04aa42cbed
Author: Stanislav Malyshev <stas@php.net> Sun, 4 Aug 2013 16:06:24 -0700
Parents: 3626db6142eda230586357a707b6cb4a0887e971 8d86597d7368460383a33a4399ea7a8b244cd6fa
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c793a6569013f9ab46f2cd7331cc1a04aa42cbed
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
Changed paths:
MM Zend/zend_builtin_functions.c
MM Zend/zend_compile.c
MM Zend/zend_execute_API.c
MM Zend/zend_globals.h
MM Zend/zend_language_scanner.h
MM configure.in
MM ext/date/php_date.c
MM ext/date/php_date.h
MM ext/mbstring/oniguruma/HISTORY
MM ext/mysql/php_mysql.c
MM ext/mysqlnd/mysqlnd_net.c
MM ext/reflection/php_reflection.c
MM ext/sqlite3/libsqlite/sqlite3.c
MM ext/standard/pack.c
Diff:
diff --cc Zend/zend_compile.c
index 196688e,326d4ef..f250b2b
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -1734,7 -1723,7 +1734,7 @@@ void zend_do_begin_function_declaration
}
{
- /* Push a seperator to the switch stack */
- /* Push a separator to the switch and foreach stacks */
++ /* Push a separator to the switch stack */
zend_switch_entry switch_entry;
switch_entry.cond.op_type = IS_UNUSED;