Xinchen Hui
5c4d9123fa
Drop support for bison < 2.4 when building PHP from GIT source
2013-04-05 21:35:09 +08:00
Xinchen Hui
aac43c9ee8
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-04 14:56:00 +08:00
Xinchen Hui
4f2acd8cde
Update test script to make sure the error occurred
2013-04-04 14:55:17 +08:00
Xinchen Hui
65e368debd
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-04 14:48:53 +08:00
Xinchen Hui
82ac3106e0
Use 5.4 specifical warnnig & Update NEWs
2013-04-04 14:47:49 +08:00
Xinchen Hui
f4f8b5a94b
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-04 14:44:28 +08:00
Xinchen Hui
c96a5bc6be
Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: segfault)
2013-04-04 14:34:11 +08:00
Xinchen Hui
db3d629f05
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-04 13:40:46 +08:00
Xinchen Hui
7fc8077e4c
Fixed Bug #64578
2013-04-04 13:40:21 +08:00
Nikita Popov
1f34ccbe34
Fix bug #64555 : foreach no longer copies keys if they are interned
2013-04-03 20:29:19 +02:00
Xinchen Hui
42f94aa978
Fix test due to opcache
2013-04-03 19:52:09 +08:00
Xinchen Hui
bbb4a44f98
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-03 18:51:19 +08:00
ptarjan
e8d80b770b
Fix #64572 : Clean up after the test
...
Lets not leave stuff lying around.
2013-04-03 18:50:18 +08:00
Nikita Popov
8345abcabb
Remove support for cloning generators
2013-03-29 11:42:10 +01:00
Dmitry Stogov
aa791a4d72
Removed deprecated check
2013-03-29 03:18:04 +04:00
Lars Strojny
25b3c94944
Added XOR support for expressions in INI parser: NEWS and zend_language_scanner.c
2013-03-27 21:30:56 +01:00
Dejan Marjanovic
05016b7e96
Added XOR support for expressions in INI parser
2013-03-27 21:28:53 +01:00
Dmitry Stogov
6e8aa09696
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64529 (Ran out of opcode space)
Conflicts:
NEWS
Zend/zend_execute_API.c
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
2013-03-28 00:08:11 +04:00
Dmitry Stogov
85e5e60777
Fixed bug #64529 (Ran out of opcode space)
2013-03-28 00:03:40 +04:00
Xinchen Hui
ed31582301
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
2013-03-26 12:02:48 +08:00
Xinchen Hui
1182a3356c
Update test script
2013-03-26 11:50:47 +08:00
Xinchen Hui
5e9377ebd5
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
2013-03-26 11:44:57 +08:00
Xinchen Hui
975d26667b
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
2013-03-25 23:48:21 +08:00
Dmitry Stogov
96e5f5eb05
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-03-25 15:47:45 +04:00
Dmitry Stogov
e9f996c00d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-03-25 15:23:49 +04:00
Dmitry Stogov
c4686b4de9
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
2013-03-25 15:07:27 +04:00
Xinchen Hui
79925094c4
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-21 21:10:32 +08:00
Xinchen Hui
7dce0194c8
Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11)
2013-03-21 21:09:30 +08:00
Anatol Belski
6f0f5d5281
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix C90 compat
2013-03-19 14:44:20 +01:00
Anatol Belski
7687b8b81c
fix C90 compat
2013-03-19 14:42:18 +01:00
Dmitry Stogov
4837bdb910
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63976 (Parent class incorrectly using child constant in class property)
Conflicts:
NEWS
2013-03-19 17:04:35 +04:00
Dmitry Stogov
7b0993bfb4
Fixed bug #63976 (Parent class incorrectly using child constant in class property)
2013-03-19 16:59:01 +04:00
Dmitry Stogov
960d5be528
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Partial fix for bug #64239
2013-03-19 15:47:43 +04:00
Dmitry Stogov
984561cfa8
Partial fix for bug #64239
2013-03-19 15:45:48 +04:00
Dmitry Stogov
74e11fb14c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #62343 (Show class_alias In get_declared_classes())
Conflicts:
NEWS
2013-03-19 15:00:24 +04:00
Dmitry Stogov
84630a1109
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62343 (Show class_alias In get_declared_classes())
2013-03-19 14:59:08 +04:00
Dmitry Stogov
4a6291508d
Fixed bug #62343 (Show class_alias In get_declared_classes())
2013-03-19 14:56:53 +04:00
Dmitry Stogov
ef8c8eaa95
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
Conflicts:
NEWS
Zend/zend_compile.c
2013-03-19 13:07:32 +04:00
Dmitry Stogov
e62bb03257
Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
2013-03-19 12:48:23 +04:00
Dmitry Stogov
e9641141aa
Made test compatible with O+
2013-03-16 16:11:00 +04:00
Nikita Popov
b7788c52f1
Fix wrong macro usage and add missing NEWS entry
2013-03-15 13:48:33 +01:00
Dmitry Stogov
dd1c358d1b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
fix the fix
fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind
Forgot to remove some now unused variables
Add support for non-scalar Iterator keys in foreach
fixed headers order
- Updated to version 2013.2 (2013b)
fixed the test
Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])
Disable zend_always_inline in debug build
2013-03-14 14:19:41 +04:00
Dmitry Stogov
d77c865aff
Removed redundand code
2013-03-13 17:51:10 +04:00
Nikita Popov
fcc6611de9
Add support for non-scalar Iterator keys in foreach
...
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-03-12 17:27:31 +01:00
Xinchen Hui
4573405c5d
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-11 15:16:47 +08:00
Xinchen Hui
0444708c5c
Disable zend_always_inline in debug build
...
it will be much more easier for debuging
2013-03-11 15:15:22 +08:00
Nikita Popov
9490118fdb
Fix tests after laruence unserialize change
2013-03-09 20:21:33 +01:00
Xinchen Hui
1be745ce1b
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/standard/var_unserializer.c
2013-03-09 23:10:48 +08:00
Xinchen Hui
7197f0ffcc
Fixed confused exception message while user threw exception
2013-03-09 23:08:14 +08:00
Xinchen Hui
01049ca7ae
Fixed bug #61025 (__invoke() visibility not honored)
2013-03-08 10:34:17 +08:00