[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_builtin_functions.c ext/reflection/php_reflection.c

2013-12-10 Thread Remi Collet 
Commit:9f4d1ee51c19c50a60284a5687f247785fd26f6a
Author:Remi Collet r...@php.net Tue, 10 Dec 2013 16:09:41 +0100
Parents:   552e8b2b4c5708cb90faf148bd99e3f67fa926b5 
3e963f8eb44863ef3d758eabe791190b0fd7bb9a
Branches:  PHP-5.5 PHP-5.6 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9f4d1ee51c19c50a60284a5687f247785fd26f6a

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed Bug #66218 zend_register_functions breaks reflection

Bugs:
https://bugs.php.net/66218

Changed paths:
  MM  Zend/zend_builtin_functions.c
  MM  ext/reflection/php_reflection.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_builtin_functions.c Zend/zend_compile.c Zend/zend_execute_API.c Zend/zend_globals.h Zend/zend_language_scanner.h configure.in ext/

2013-08-04 Thread Stanislav Malyshev 
Commit:c793a6569013f9ab46f2cd7331cc1a04aa42cbed
Author:Stanislav Malyshev s...@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;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_builtin_functions.c

2013-07-21 Thread Xinchen Hui 
Commit:629965abe20b9d4ed4a793570791c983e705aa49
Author:Xinchen Hui larue...@php.net Sun, 21 Jul 2013 16:19:13 
+0800
Parents:   3363e04fb48088cb6873ab79d993e556880483a3 
cc91fbe986c208c40b50af8154373693d4bd7c9b
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=629965abe20b9d4ed4a793570791c983e705aa49

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Changed paths:
  MM  Zend/zend_builtin_functions.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_builtin_functions.c

2013-03-19 Thread Dmitry Stogov 
Commit:74e11fb14c983302c84ee88fee40248b6f9b0f9a
Author:Dmitry Stogov dmi...@zend.com Tue, 19 Mar 2013 15:00:24 
+0400
Parents:   ef8c8eaa9583130029facf2817d2c5c4b01f1c41 
84630a1109084507bc0c78301db831328229f1cb
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=74e11fb14c983302c84ee88fee40248b6f9b0f9a

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #62343 (Show class_alias In get_declared_classes())

Conflicts:
NEWS

Bugs:
https://bugs.php.net/62343

Changed paths:
  MM  Zend/zend_builtin_functions.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_builtin_functions.c

2013-03-19 Thread Dmitry Stogov 
Commit:960d5be52873acdf1afc67aa12b72d2cdc93119c
Author:Dmitry Stogov dmi...@zend.com Tue, 19 Mar 2013 15:47:43 
+0400
Parents:   74e11fb14c983302c84ee88fee40248b6f9b0f9a 
984561cfa81adfd893833bce506544349b04c803
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=960d5be52873acdf1afc67aa12b72d2cdc93119c

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Partial fix for bug #64239

Bugs:
https://bugs.php.net/64239

Changed paths:
  MM  Zend/zend_builtin_functions.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php