com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_compile.c Zend/zend_virtual_cwd.c ext/s tandard/browscap.c
ext/standard/file.c sapi/apache2ha ndler/php_functions.c sapi/apache2handler/sapi_apache 2.c sapi/cli/php_cli_server.c

Commit: 6bb530d1eba583143efda0b4f49e43cb6d6fb203 Author: Anatol Belski <ab@php.net> Mon, 22 Sep 2014 10:26:17 +0200 Parents: 403709aaf46f2fe563df4d9f238528428287eb92 065edced71c7f15f32fc2fb483a9048328b8108e Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6bb530d1eba583143efda0b4f49e43cb6d6fb203 Log: Merge remote-tracking branch 'origin/master' into native-tls * origin/master: (24 commits) added a comment fix the REPARSE_DATA_BUFFER struct def simplify the condition Fix two memory errors by interning earlier Add smart_str_append for appending zend_strings Rename smart_str_append to smart_str_append_smart_str Use smart_str for exception stack traces Use smart_str in get_function_declaration Move smart_str implementation into Zend/ UPGRADING for Integer Semantics Fixed bug #66242 (don't assume char is signed) Fixed bug #67633 Fixed if/else if ordering Use SIZEOF_ZEND_LONG instead of SIZEOF_LONG Use zend_ polyfilled nan/finite, check finite Updated 32-bit << test Updated << 64-bit tests Prevent bit shift count wrapping quirkiness on some CPUs for left shift Cast NaN and Infinity to zero Updated >> 64-bit tests ... Bugs: https://bugs.php.net/66242 https://bugs.php.net/67633 Changed paths: MM Zend/zend_compile.c MM Zend/zend_virtual_cwd.c MM ext/standard/browscap.c MM ext/standard/file..c MM sapi/apache2handler/php_functions.c MM sapi/apache2handler/sapi_apache2.c MM sapi/cli/php_cli_server.c Diff: