4788a961f1
Merge branch 'PHP-5.5'
2013-04-04 14:56:10 +08:00
aac43c9ee8
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-04 14:56:00 +08:00
4f2acd8cde
Update test script to make sure the error occurred
2013-04-04 14:55:17 +08:00
cf0ee2d332
Merge branch 'PHP-5.5'
2013-04-04 14:49:58 +08:00
65e368debd
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-04 14:48:53 +08:00
82ac3106e0
Use 5.4 specifical warnnig & Update NEWs
2013-04-04 14:47:49 +08:00
f4f8b5a94b
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-04 14:44:28 +08:00
c96a5bc6be
Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: segfault)
2013-04-04 14:34:11 +08:00
db3d629f05
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-04 13:40:46 +08:00
7fc8077e4c
Fixed Bug #64578
2013-04-04 13:40:21 +08:00
d1ee0349d6
Merge branch 'PHP-5.5'
2013-04-03 20:30:31 +02:00
1f34ccbe34
Fix bug #64555 : foreach no longer copies keys if they are interned
2013-04-03 20:29:19 +02:00
8333dcce68
Merge branch 'PHP-5.5'
2013-04-03 19:52:56 +08:00
42f94aa978
Fix test due to opcache
2013-04-03 19:52:09 +08:00
e15a97f924
Merge branch 'PHP-5.5'
2013-04-03 18:51:44 +08:00
bbb4a44f98
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-03 18:51:19 +08:00
e8d80b770b
Fix #64572 : Clean up after the test
...
Lets not leave stuff lying around.
2013-04-03 18:50:18 +08:00
2f4c3ff330
Merge branch 'PHP-5.5'
2013-03-29 11:43:19 +01:00
8345abcabb
Remove support for cloning generators
2013-03-29 11:42:10 +01:00
606c9bb658
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed deprecated check
2013-03-29 03:18:51 +04:00
aa791a4d72
Removed deprecated check
2013-03-29 03:18:04 +04:00
218bcee202
Merge branch 'PHP-5.5'
...
Conflicts:
Zend/zend_ini_scanner.c
2013-03-27 21:37:42 +01:00
25b3c94944
Added XOR support for expressions in INI parser: NEWS and zend_language_scanner.c
2013-03-27 21:30:56 +01:00
05016b7e96
Added XOR support for expressions in INI parser
2013-03-27 21:28:53 +01:00
9a80cec0ce
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64529 (Ran out of opcode space)
Conflicts:
Zend/zend_language_scanner.c
2013-03-28 00:10:13 +04:00
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
85e5e60777
Fixed bug #64529 (Ran out of opcode space)
2013-03-28 00:03:40 +04:00
c2afd2765b
Merge branch 'PHP-5.5'
2013-03-26 12:03:37 +08:00
ed31582301
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
2013-03-26 12:02:48 +08:00
1182a3356c
Update test script
2013-03-26 11:50:47 +08:00
5e9377ebd5
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
2013-03-26 11:44:57 +08:00
c356038c6e
Merge branch 'PHP-5.5'
2013-03-25 23:49:23 +08:00
975d26667b
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
2013-03-25 23:48:21 +08:00
0ff3065474
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
add new functions and constants for GD
2013-03-25 15:49:18 +04:00
a4c386f32c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
2013-03-25 15:48:13 +04:00
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
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
7da6272fe7
conflict
2013-03-25 12:20:01 +01:00
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
04c659a042
Merge branch 'PHP-5.5'
...
* PHP-5.5:
2013-03-24 14:06:25 +01:00
0bf7549772
Merge branch 'PHP-5.5'
2013-03-21 21:11:42 +08:00
79925094c4
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-21 21:10:32 +08:00
7dce0194c8
Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11)
2013-03-21 21:09:30 +08:00
bc7b287a61
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- add imageaffinematrixget and imagematrixconcat
- add affine matrix helper for translate, scale, rotate and shear
- fix unix build
- add new files for interpolation
- config.m4 sync with .w32
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 12:19:46 +01:00
22159fb7b7
- add new interpolation method
...
. imagescale
. imageaffine
. replace imagerotate with new generic and optimized new implementations
. imagesetinterpolationmethod, to set the default interpolation to be
used with the new functions
. add imagepalettetotruecolor
2013-03-20 07:46:59 +01:00
3b922794ab
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix C90 compat
2013-03-19 14:45:57 +01:00
6f0f5d5281
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix C90 compat
2013-03-19 14:44:20 +01:00
7687b8b81c
fix C90 compat
2013-03-19 14:42:18 +01:00
b8ab827e4f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63976 (Parent class incorrectly using child constant in class property)
2013-03-19 17:05:36 +04:00
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
Xinchen Hui