diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2013-11-08 19:14:58 -0500 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2013-11-08 19:14:58 -0500 |
| commit | 24e0b9910302f7828d1373a1f653f0358e05ff59 (patch) | |
| tree | 000b2af213559fbc8140ca00753e2eb324c44472 /Zend/tests/use_function/conditional_function_declaration.phpt | |
| parent | 602fef0e52caacf754eacfb96e9342ce32d29a37 (diff) | |
| parent | 0e5c5072e698438ee9857979cf8418805865518a (diff) | |
| download | php-git-24e0b9910302f7828d1373a1f653f0358e05ff59.tar.gz | |
Merge remote-tracking branch 'upstream/PHP-5.6' into use-function
* upstream/PHP-5.6: (399 commits)
Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).
Added tests for PHAR/OPCahce incompatibilities
Update NEWS
Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
Update NEWS
Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
NEWS entry
NEWS entry
Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
bump API versions
Add a couple more test cases to parse_url() tests
fix missing change from 'tcp_socket' to the more common 'server'
fix many parallel test issues
Cleanup temp test file
Revert "Fixed issue #115 (path issue when using phar)."
Update LiteSpeed SAPI code to V6.4
Fixed typo in Makefile.frag
updated NEWS
Remove outdate codes, make it clearer, although just a bit..
Update NEWS
...
Conflicts:
Zend/zend_compile.h
Diffstat (limited to 'Zend/tests/use_function/conditional_function_declaration.phpt')
0 files changed, 0 insertions, 0 deletions