Anatol Belski [Thu, 16 Jul 2015 13:04:41 +0000 (15:04 +0200)]
forked test for windows
Xinchen Hui [Thu, 16 Jul 2015 10:32:42 +0000 (18:32 +0800)]
Fixed bug #70079 (Segmentation fault after more than 100 SoapClient calls)
Bob Weinand [Thu, 16 Jul 2015 08:28:59 +0000 (10:28 +0200)]
Cleanup exception displaying code in phpdbg
Bob Weinand [Thu, 16 Jul 2015 07:24:57 +0000 (09:24 +0200)]
Fix test; this should properly throw an Error, just as every other by-ref assignment to an overloaded object
Christopher Jones [Thu, 16 Jul 2015 03:06:35 +0000 (13:06 +1000)]
More OCI8 diff fixes (Rajendra)
Bob Weinand [Wed, 15 Jul 2015 20:36:42 +0000 (22:36 +0200)]
Fixed bug #70083 (Use after free with assign by ref on overloaded objects)
Bob Weinand [Wed, 15 Jul 2015 20:30:12 +0000 (22:30 +0200)]
Fix crash on non-debug for phpdbg_end_oplog()
Rasmus Lerdorf [Wed, 15 Jul 2015 16:59:31 +0000 (09:59 -0700)]
unserialize() takes a 2nd optional arg and it can't be a bool
Xinchen Hui [Wed, 15 Jul 2015 02:55:41 +0000 (10:55 +0800)]
Improve the conditions(save one comparison)
Xinchen Hui [Wed, 15 Jul 2015 02:38:23 +0000 (10:38 +0800)]
Fixed segfault if opcache is disabled and with file_cache
Xinchen Hui [Tue, 14 Jul 2015 10:58:43 +0000 (18:58 +0800)]
Fixed bug #70067 (Cross-compile failure in opcache when SIZEOF_ZEND_LONG < SIZEOF_SIZE_T)
Lior Kaplan [Tue, 14 Jul 2015 09:00:26 +0000 (12:00 +0300)]
Format alignment (needed for news2html)
Lior Kaplan [Tue, 14 Jul 2015 08:28:39 +0000 (11:28 +0300)]
Format alignment (needed for news2html)
Christoph M. Becker [Tue, 14 Jul 2015 08:11:50 +0000 (10:11 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #53840: Misleading extension entries in php.ini
Christoph M. Becker [Tue, 14 Jul 2015 08:09:29 +0000 (10:09 +0200)]
Fix #53840: Misleading extension entries in php.ini
As of PHP 5.3.0 the php_pspell.dll is not delivered anymore with the Windows
binaries, and according to bug #47464 that's highly unlike to change. So it's
appropriate to remove the respective extension entry from php.ini.
Christoph M. Becker [Tue, 14 Jul 2015 08:02:25 +0000 (10:02 +0200)]
Merge branch 'master' of http://git.php.net/repository/php-src
# By Bob Weinand (5) and others
# Via Bob Weinand
* 'master' of http://git.php.net/repository/php-src:
We want to track phpdbg bugs in official bug tracker now; updated URL
Show also runtime-bound functions/classes/methods with phpdbg -p
One less comparison
Fix potential segfault
Closures only have {closure}() as method name Prefixing a class name does not make sense as they may be rebound to another scope, where this will be confusing
Fix __METHOD__ in functions nested into methods
Init variable to NULL before passing to zpp
Format alignment
PHP 7 OCI8: fix bug57702.phpt regression
Bob Weinand [Tue, 14 Jul 2015 06:31:44 +0000 (08:31 +0200)]
We want to track phpdbg bugs in official bug tracker now; updated URL
Bob Weinand [Tue, 14 Jul 2015 04:28:15 +0000 (06:28 +0200)]
Show also runtime-bound functions/classes/methods with phpdbg -p
Rasmus Lerdorf [Tue, 14 Jul 2015 02:44:51 +0000 (19:44 -0700)]
One less comparison
Rasmus Lerdorf [Tue, 14 Jul 2015 02:38:55 +0000 (19:38 -0700)]
Fix potential segfault
Bob Weinand [Tue, 14 Jul 2015 00:52:09 +0000 (02:52 +0200)]
Closures only have {closure}() as method name
Prefixing a class name does not make sense as they may be rebound to another scope, where this will be confusing
Bob Weinand [Tue, 14 Jul 2015 00:37:35 +0000 (02:37 +0200)]
Fix __METHOD__ in functions nested into methods
Bob Weinand [Mon, 13 Jul 2015 23:55:32 +0000 (01:55 +0200)]
Init variable to NULL before passing to zpp
Lior Kaplan [Mon, 13 Jul 2015 23:43:11 +0000 (02:43 +0300)]
Format alignment
Christopher Jones [Mon, 13 Jul 2015 22:39:59 +0000 (08:39 +1000)]
PHP 7 OCI8: fix bug57702.phpt regression
Christoph M. Becker [Mon, 13 Jul 2015 22:30:17 +0000 (00:30 +0200)]
Merge branch 'master' of http://git.php.net/repository/php-src
# By Anatol Belski
# Via Anatol Belski
* 'master' of http://git.php.net/repository/php-src:
remove #ifdef
remove comment, it's not right
Anatol Belski [Mon, 13 Jul 2015 22:12:35 +0000 (00:12 +0200)]
remove #ifdef
Anatol Belski [Mon, 13 Jul 2015 21:42:40 +0000 (23:42 +0200)]
remove comment, it's not right
Christoph M. Becker [Mon, 13 Jul 2015 20:39:12 +0000 (22:39 +0200)]
Merge branch 'master' of http://git.php.net/repository/php-src
# By Christoph M. Becker (6) and others
* 'master' of http://git.php.net/repository/php-src:
updated NEWS
updated NEWS
Fix #66882: imagerotate by -90 degrees truncates image by 1px
update NEWS
Fixed bug #70065 curl_getinfo() returns corrupted values
Revert SplFileInfo BC break while keeping fix for assertion removal
Fix issue with SplFileInfo::getExtension() on files with only a leading '.' character
updated NEWS
updated NEWS
Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory
Christoph M. Becker [Mon, 13 Jul 2015 20:33:43 +0000 (22:33 +0200)]
updated NEWS
Christoph M. Becker [Mon, 13 Jul 2015 20:30:43 +0000 (22:30 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fix #66882: imagerotate by -90 degrees truncates image by 1px
Christoph M. Becker [Mon, 13 Jul 2015 20:29:10 +0000 (22:29 +0200)]
updated NEWS
Christoph M. Becker [Mon, 13 Jul 2015 20:14:13 +0000 (22:14 +0200)]
Fix #66882: imagerotate by -90 degrees truncates image by 1px
Contrary to the external libgd, the bundled libgd doesn't use optimized
rotation algorithms for negative square angles. We fix that now.
There are other improvements in gdImageRotateInterpolated() in the external
libgd. I'll leave them out for now, in the hope that we'll be able to rejoin
the two libraries rather soon.
Christoph M. Becker [Mon, 13 Jul 2015 20:14:13 +0000 (22:14 +0200)]
Fix #66882: imagerotate by -90 degrees truncates image by 1px
Contrary to the external libgd, the bundled libgd doesn't use optimized
rotation algorithms for negative square angles. We fix that now.
There are other improvements in gdImageRotateInterpolated() in the external
libgd. I'll leave them out for now, in the hope that we'll be able to rejoin
the two libraries rather soon.
Anatol Belski [Mon, 13 Jul 2015 19:48:45 +0000 (21:48 +0200)]
update NEWS
Anatol Belski [Mon, 13 Jul 2015 19:46:51 +0000 (21:46 +0200)]
Fixed bug #70065 curl_getinfo() returns corrupted values
Anthony Ferrara [Mon, 13 Jul 2015 17:27:06 +0000 (13:27 -0400)]
Revert SplFileInfo BC break while keeping fix for assertion removal
This reverts the minor bc-break where .test would return an empty extension. This is different from 5.x's behavior.
In 7, it would result in an assertion failure crash. The fix for the removal of this assertion is kept, keeping BC with 5.x.
Anthony Ferrara [Mon, 13 Jul 2015 17:12:45 +0000 (13:12 -0400)]
Fix issue with SplFileInfo::getExtension() on files with only a leading '.' character
Currently, there is an assert() that fails on files like .gitignore crashing PHP. This patch fixes that.
Instead, now an empty string is returned (since the file has no extension). A test has been added to test this behavior.
Christoph M. Becker [Mon, 13 Jul 2015 16:39:11 +0000 (18:39 +0200)]
updated NEWS
Christoph M. Becker [Mon, 13 Jul 2015 16:36:15 +0000 (18:36 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory
Christoph M. Becker [Mon, 13 Jul 2015 16:34:40 +0000 (18:34 +0200)]
updated NEWS
Christoph M. Becker [Mon, 13 Jul 2015 16:30:33 +0000 (18:30 +0200)]
Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory
A temporary image (tmp_im) is created with gdImageTrueColor() and freed with
gdFree() instead of gdImageDestroy(). Let's fix that.
Christoph M. Becker [Mon, 13 Jul 2015 15:50:26 +0000 (17:50 +0200)]
Merge branch 'master' of http://git.php.net/repository/php-src
# By Christoph M. Becker (3) and Bob Weinand (2)
* 'master' of http://git.php.net/repository/php-src:
updated NEWS
updated NEWS
Fix #69024: imagescale segfault with palette based image
Fix weird asm instruction order with gcc by marking as volatile in phpdbg
Preserve return value in zend_vm_call_opcode_handler with global opline/ex registers enabled
Christoph M. Becker [Mon, 13 Jul 2015 13:59:40 +0000 (15:59 +0200)]
updated NEWS
Christoph M. Becker [Mon, 13 Jul 2015 13:56:39 +0000 (15:56 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fix #69024: imagescale segfault with palette based image
Christoph M. Becker [Mon, 13 Jul 2015 13:54:57 +0000 (15:54 +0200)]
updated NEWS
Christoph M. Becker [Mon, 13 Jul 2015 13:43:16 +0000 (15:43 +0200)]
Fix #69024: imagescale segfault with palette based image
imagescale(..., IMG_BICUBIC) is not supposed to work with palette images, so we
fix that by converting to true color if necessary. Basically the same fix has
already been applied to the external libgd[1].
[1] <https://github.com/libgd/libgd/commit/
723ea520bed3b5854df87393c687323d3930edf3>
Christoph M. Becker [Mon, 13 Jul 2015 13:43:16 +0000 (15:43 +0200)]
Fix #69024: imagescale segfault with palette based image
imagescale(..., IMG_BICUBIC) is not supposed to work with palette images, so we
fix that by converting to true color if necessary. Basically the same fix has
already been applied to the external libgd[1].
[1] <https://github.com/libgd/libgd/commit/
723ea520bed3b5854df87393c687323d3930edf3>
Bob Weinand [Mon, 13 Jul 2015 12:11:39 +0000 (14:11 +0200)]
Fix weird asm instruction order with gcc by marking as volatile in phpdbg
Bob Weinand [Mon, 13 Jul 2015 11:45:27 +0000 (13:45 +0200)]
Preserve return value in zend_vm_call_opcode_handler with global opline/ex registers enabled
Christoph M. Becker [Mon, 13 Jul 2015 11:59:33 +0000 (13:59 +0200)]
Merge branch 'master' of http://git.php.net/repository/php-src
# By Xinchen Hui (5) and others
# Via Xinchen Hui (6) and others
* 'master' of http://git.php.net/repository/php-src:
Revert "Fixed test fail in travis from time to time"
Fixed test fail in travis from time to time
Update NEWS
Fixed bug #70057 (Build failure on 32-bit Mac OS X 10.6.8: recursive inlining)
Fixed Bug #70058 Build fails when building for i386
Some OCI8 fixes (Rajendra)
Updated zend_update_static_property
updated NEWS
updated NEWS
Fix #53154: Zero-height rectangle has whiskers
Fix #70048: When running a phpinfo(), if you have a very long cell value you got a table overflow.
Hint label lookup table initialization branch on GOTO VM kind.
adding scenario of test to improve test coverage
Added php tests to improve extension coverage
Xinchen Hui [Mon, 13 Jul 2015 11:12:18 +0000 (19:12 +0800)]
Merge branch 'shmop-extension_improve-test-coverage' of https://github.com/edgarsandi/php-src
Xinchen Hui [Mon, 13 Jul 2015 11:08:25 +0000 (19:08 +0800)]
Merge branch 'basename-function_improve-test-coverage' of https://github.com/edgarsandi/php-src
Xinchen Hui [Mon, 13 Jul 2015 11:07:11 +0000 (19:07 +0800)]
Merge branch 'goto_branch_hint' of https://github.com/bogdanandone/php-src
Xinchen Hui [Mon, 13 Jul 2015 09:22:34 +0000 (17:22 +0800)]
Revert "Fixed test fail in travis from time to time"
Some tests rely on this warning... :<
This reverts commit
aed4c03cf9a360cd31a6d95304723896530bbdb8.
Xinchen Hui [Mon, 13 Jul 2015 08:40:56 +0000 (16:40 +0800)]
Merge branch 'master' of https://github.com/Geolim4/php-src
Xinchen Hui [Mon, 13 Jul 2015 08:36:19 +0000 (16:36 +0800)]
Fixed test fail in travis from time to time
Xinchen Hui [Mon, 13 Jul 2015 08:24:54 +0000 (16:24 +0800)]
Update NEWS
Xinchen Hui [Mon, 13 Jul 2015 08:22:55 +0000 (16:22 +0800)]
Fixed bug #70057 (Build failure on 32-bit Mac OS X 10.6.8: recursive inlining)
Xinchen Hui [Mon, 13 Jul 2015 08:02:21 +0000 (16:02 +0800)]
Merge branch 'zend_update_static_property' of https://github.com/dreamsxin/php-src
Xinchen Hui [Mon, 13 Jul 2015 07:05:04 +0000 (15:05 +0800)]
Fixed Bug #70058 Build fails when building for i386
(I don't have a m32 build env, so this is not tested)
Christopher Jones [Mon, 13 Jul 2015 01:50:00 +0000 (11:50 +1000)]
Some OCI8 fixes (Rajendra)
Dreamsxin [Mon, 13 Jul 2015 00:42:18 +0000 (08:42 +0800)]
Updated zend_update_static_property
Christopher Jones [Sun, 12 Jul 2015 23:56:00 +0000 (09:56 +1000)]
Merge branch 'master' of https://git.php.net/repository/php-src
Christoph M. Becker [Sun, 12 Jul 2015 23:50:09 +0000 (01:50 +0200)]
updated NEWS
Christoph M. Becker [Sun, 12 Jul 2015 23:46:09 +0000 (01:46 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fix #53154: Zero-height rectangle has whiskers
Christoph M. Becker [Sun, 12 Jul 2015 23:41:46 +0000 (01:41 +0200)]
updated NEWS
Christoph M. Becker [Sun, 12 Jul 2015 23:29:01 +0000 (01:29 +0200)]
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.
Christoph M. Becker [Sun, 12 Jul 2015 23:29:01 +0000 (01:29 +0200)]
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.
Christoph M. Becker [Sun, 12 Jul 2015 22:33:18 +0000 (00:33 +0200)]
Merge branch 'master' of http://git.php.net/repository/php-src
* 'master' of http://git.php.net/repository/php-src:
updated NEWS
updated NEWS
Fix #67447: imagecrop() adds a black line when cropping
Christoph M. Becker [Sun, 12 Jul 2015 21:18:59 +0000 (23:18 +0200)]
updated NEWS
Christoph M. Becker [Sun, 12 Jul 2015 21:15:06 +0000 (23:15 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fix #67447: imagecrop() adds a black line when cropping
Christoph M. Becker [Sun, 12 Jul 2015 21:13:13 +0000 (23:13 +0200)]
updated NEWS
Christoph M. Becker [Sun, 28 Jun 2015 23:36:39 +0000 (01:36 +0200)]
Fix #67447: imagecrop() adds a black line when cropping
A simple one-off error: imagecrop)() copied only width-1 and height-1 pixels.
Christoph M. Becker [Sun, 12 Jul 2015 17:06:09 +0000 (19:06 +0200)]
Merge branch 'master' of http://git.php.net/repository/php-src
# By Christoph M. Becker (3) and Tjerk Meesters (1)
# Via Christoph M. Becker (1) and Tjerk Meesters (1)
* 'master' of http://git.php.net/repository/php-src:
Fixed #70053 MutlitpleIterator array-keys incompatible change in PHP 7
updated NEWS
updated NEWS
Fix #68714: copy 'n paste error
Tjerk Meesters [Sun, 12 Jul 2015 16:33:55 +0000 (00:33 +0800)]
Fixed #70053 MutlitpleIterator array-keys incompatible change in PHP 7
Christoph M. Becker [Sun, 12 Jul 2015 14:43:38 +0000 (16:43 +0200)]
updated NEWS
Christoph M. Becker [Sun, 12 Jul 2015 14:39:50 +0000 (16:39 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fix #68714: copy 'n paste error
Christoph M. Becker [Sun, 12 Jul 2015 14:38:23 +0000 (16:38 +0200)]
updated NEWS
Christoph M. Becker [Sun, 12 Jul 2015 14:26:16 +0000 (16:26 +0200)]
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.
Christoph M. Becker [Sun, 12 Jul 2015 14:26:16 +0000 (16:26 +0200)]
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.
Christoph M. Becker [Sat, 11 Jul 2015 22:12:31 +0000 (00:12 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Added XFAIL test for bug #53640
Christoph M. Becker [Sat, 11 Jul 2015 22:10:56 +0000 (00:10 +0200)]
Added XFAIL test for bug #53640
Geolim4 [Sat, 11 Jul 2015 19:44:23 +0000 (21:44 +0200)]
Fix #70048: When running a phpinfo(), if you have a very long cell value you got a table overflow.
Christoph M. Becker [Sat, 11 Jul 2015 19:03:40 +0000 (21:03 +0200)]
updated NEWS
Christoph M. Becker [Sat, 11 Jul 2015 19:01:01 +0000 (21:01 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fix #66339: PHP segfaults in imagexbm
Christoph M. Becker [Sat, 11 Jul 2015 18:58:50 +0000 (20:58 +0200)]
updated NEWS
Christoph M. Becker [Sat, 11 Jul 2015 18:50:54 +0000 (20:50 +0200)]
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.
Christoph M. Becker [Sat, 11 Jul 2015 15:56:33 +0000 (17:56 +0200)]
updated NEWS
Christoph M. Becker [Sat, 11 Jul 2015 15:52:22 +0000 (17:52 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fix #70047: gd_info() doesn't report WebP support
Christoph M. Becker [Sat, 11 Jul 2015 15:50:42 +0000 (17:50 +0200)]
updated NEWS
Christoph M. Becker [Sat, 11 Jul 2015 15:49:13 +0000 (17:49 +0200)]
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.
Xinchen Hui [Sat, 11 Jul 2015 10:59:09 +0000 (18:59 +0800)]
Better implementation
Christoph M. Becker [Fri, 10 Jul 2015 22:20:46 +0000 (00:20 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Adding tests for getprotobyname and getprotobynumber functions
Rasmus Lerdorf [Fri, 10 Jul 2015 22:17:06 +0000 (15:17 -0700)]
DOMDocument::saveXML has a 2nd optional arg
Edgar R. Sandi [Thu, 9 Jul 2015 19:59:26 +0000 (16:59 -0300)]
Adding tests for getprotobyname and getprotobynumber functions
Bob Weinand [Fri, 10 Jul 2015 21:35:05 +0000 (23:35 +0200)]
hmm, we do not need the nop after compilation, so does not matter for opcache...
Bob Weinand [Fri, 10 Jul 2015 21:29:07 +0000 (23:29 +0200)]
a: try { ... } ≠ try { a: ... }
Ferenc Kovacs [Fri, 10 Jul 2015 15:26:09 +0000 (17:26 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add missing NEWS entry
Ferenc Kovacs [Fri, 10 Jul 2015 15:25:44 +0000 (17:25 +0200)]
add missing NEWS entry