Bob Weinand
82b1e22b57
Preserve return value in zend_vm_call_opcode_handler with global opline/ex registers enabled
2015-07-13 14:12:45 +02:00
Xinchen Hui
420b745a05
Merge branch 'shmop-extension_improve-test-coverage' of https://github.com/edgarsandi/php-src
2015-07-13 19:12:18 +08:00
Xinchen Hui
646694529f
Merge branch 'basename-function_improve-test-coverage' of https://github.com/edgarsandi/php-src
2015-07-13 19:08:25 +08:00
Xinchen Hui
833e4ced87
Merge branch 'goto_branch_hint' of https://github.com/bogdanandone/php-src
2015-07-13 19:07:11 +08:00
Xinchen Hui
5384ccf5bb
Revert "Fixed test fail in travis from time to time"
...
Some tests rely on this warning... :<
This reverts commit aed4c03cf9
.
2015-07-13 17:22:34 +08:00
Xinchen Hui
8c2658ed52
Merge branch 'master' of https://github.com/Geolim4/php-src
2015-07-13 16:40:56 +08:00
Xinchen Hui
aed4c03cf9
Fixed test fail in travis from time to time
2015-07-13 16:36:19 +08:00
Xinchen Hui
3b170531c4
Update NEWS
2015-07-13 16:24:54 +08:00
Xinchen Hui
e5a996f268
Fixed bug #70057 (Build failure on 32-bit Mac OS X 10.6.8: recursive inlining)
2015-07-13 16:22:55 +08:00
Xinchen Hui
eef41c57a3
Merge branch 'zend_update_static_property' of https://github.com/dreamsxin/php-src
2015-07-13 16:02:21 +08:00
Xinchen Hui
b8eff44b0e
Fixed Bug #70058 Build fails when building for i386
...
(I don't have a m32 build env, so this is not tested)
2015-07-13 15:05:04 +08:00
Christopher Jones
8586e67c1c
Some OCI8 fixes (Rajendra)
2015-07-13 11:50:00 +10:00
Dreamsxin
7554e83037
Updated zend_update_static_property
2015-07-13 08:42:18 +08:00
Christopher Jones
a846ff5d52
Merge branch 'master' of https://git.php.net/repository/php-src
2015-07-13 09:56:00 +10:00
Christoph M. Becker
1d16d106f4
updated NEWS
2015-07-13 01:50:09 +02:00
Christoph M. Becker
42d1fa29c7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #53154 : Zero-height rectangle has whiskers
2015-07-13 01:46:09 +02:00
Christoph M. Becker
2939bce9f3
updated NEWS
2015-07-13 01:41:46 +02:00
Christoph M. Becker
094decc3c0
Fix #53154 : Zero-height rectangle has whiskers
...
To avoid drawing the corner pixels twice, gdImageRectangle() draws the vertical
lines 2 points shorter than the actual side of the rectangle. However, this
causes "whiskers" for rectangles with height 0. This patch fixes this issue and
at the same time optimizes the algorithm by drawing only a single line for zero
height and zero width rectangles.
2015-07-13 01:33:00 +02:00
Christoph M. Becker
33da8a60d9
updated NEWS
2015-07-12 23:18:59 +02:00
Christoph M. Becker
930a9910d7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #67447 : imagecrop() adds a black line when cropping
2015-07-12 23:15:06 +02:00
Christoph M. Becker
591fd4cdc3
updated NEWS
2015-07-12 23:13:13 +02:00
Christoph M. Becker
891ff131ef
Fix #67447 : imagecrop() adds a black line when cropping
...
A simple one-off error: imagecrop)() copied only width-1 and height-1 pixels.
2015-07-12 23:05:53 +02:00
Tjerk Meesters
03d18d9a52
Fixed #70053 MutlitpleIterator array-keys incompatible change in PHP 7
2015-07-13 00:33:55 +08:00
Christoph M. Becker
fcdf1d0527
updated NEWS
2015-07-12 16:43:38 +02:00
Christoph M. Becker
ce7b5af03f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #68714 : copy 'n paste error
2015-07-12 16:39:50 +02:00
Christoph M. Becker
c0ac51dc07
updated NEWS
2015-07-12 16:38:23 +02:00
Christoph M. Becker
ba7c3a1bb4
Fix #68714 : copy 'n paste error
...
Actually, this is not really a bug fix, but rather a simplification and
optimization in the same vein as has been done with the external libgd, but
going a small step further and joining both for loops.
2015-07-12 16:32:38 +02:00
Christoph M. Becker
a50dda901c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added XFAIL test for bug #53640
2015-07-12 00:12:31 +02:00
Christoph M. Becker
a8dbe655e5
Added XFAIL test for bug #53640
2015-07-12 00:10:56 +02:00
Geolim4
c10c47ae1e
Fix #70048 : When running a phpinfo(), if you have a very long cell value you got a table overflow.
2015-07-11 21:44:23 +02:00
Christoph M. Becker
649fd428d9
updated NEWS
2015-07-11 21:03:40 +02:00
Christoph M. Becker
77cd79012e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #66339 : PHP segfaults in imagexbm
2015-07-11 21:01:01 +02:00
Christoph M. Becker
bac1fe7438
updated NEWS
2015-07-11 20:58:50 +02:00
Christoph M. Becker
c40f40656e
Fix #66339 : PHP segfaults in imagexbm
...
The file parameter of the XBM image ZPP is not properly taken into account. If
it is NULL that would result in a segfault, because gdImageXbmCtx() is not
prepared to take a NULL file_name. If it is not NULL the XBM data would be
written to STDOUT, because the stream is not initialized. This patch fixes both
issues.
2015-07-11 20:54:07 +02:00
Christoph M. Becker
1a94e51859
updated NEWS
2015-07-11 17:56:33 +02:00
Christoph M. Becker
6f574c6dd8
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #70047 : gd_info() doesn't report WebP support
2015-07-11 17:52:22 +02:00
Christoph M. Becker
6ac4c57f72
updated NEWS
2015-07-11 17:50:42 +02:00
Christoph M. Becker
450fbdc740
Fix #70047 : gd_info() doesn't report WebP support
...
Despite being documented, the array returned by gd_info() doesn't have a 'WebP
Support' key. This patch adds it.
2015-07-11 17:49:13 +02:00
Xinchen Hui
e63c756c09
Better implementation
2015-07-11 18:59:09 +08:00
Christoph M. Becker
0cd9c4eb2b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Adding tests for getprotobyname and getprotobynumber functions
2015-07-11 00:20:46 +02:00
Rasmus Lerdorf
1af1afdfdc
DOMDocument::saveXML has a 2nd optional arg
2015-07-10 15:17:06 -07:00
Edgar R. Sandi
49c0c1299a
Adding tests for getprotobyname and getprotobynumber functions
2015-07-11 00:16:42 +02:00
Bob Weinand
0584df0ad9
hmm, we do not need the nop after compilation, so does not matter for opcache...
2015-07-10 23:35:05 +02:00
Bob Weinand
56800e470b
a: try { ... } ≠ try { a: ... }
2015-07-10 23:29:07 +02:00
Ferenc Kovacs
ed62db9abc
Merge branch 'PHP-5.6'
...
* PHP-5.6:
add missing NEWS entry
2015-07-10 17:26:09 +02:00
Ferenc Kovacs
a7dc1274f0
add missing NEWS entry
2015-07-10 17:25:44 +02:00
Xinchen Hui
8e709d7f5d
Fixed invalid read (Part issue of #69579 )
2015-07-10 22:26:53 +08:00
Nikita Popov
25d327e53f
Move try/catch/finally tests to common directory
2015-07-10 13:35:14 +02:00
Nikita Popov
725fed4902
Mark temporary_cleaning_006.phpt as XFAIL
...
And adjust it to fail even with opcode.
2015-07-10 13:33:32 +02:00
Nikita Popov
bd72fdca98
Better opcode dump for finally
...
* Move opcode decode into opline decode, so we can adjust it for
extended_value.
* Show extended_value and secondary jump ops for FAST_CALL and
FAST_RET.
2015-07-10 11:39:54 +02:00