]>
granicus.if.org Git - php/log
Stanislav Malyshev [Tue, 4 Oct 2016 01:39:20 +0000 (18:39 -0700)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Really fix bug #73017
Stanislav Malyshev [Tue, 4 Oct 2016 01:39:05 +0000 (18:39 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Really fix bug #73017
Stanislav Malyshev [Tue, 4 Oct 2016 01:37:24 +0000 (18:37 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Really fix bug #73017
Stanislav Malyshev [Tue, 4 Oct 2016 01:06:59 +0000 (18:06 -0700)]
Really fix bug #73017
Christoph M. Becker [Mon, 3 Oct 2016 16:56:36 +0000 (18:56 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Mon, 3 Oct 2016 16:55:39 +0000 (18:55 +0200)]
Fix #73207: Array ordering is same between 5.6.21 and 7.1.0 RC3
Bob Weinand [Mon, 3 Oct 2016 10:55:45 +0000 (12:55 +0200)]
Merge branch 'PHP-7.1'
Bob Weinand [Mon, 3 Oct 2016 10:55:23 +0000 (12:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Mon, 3 Oct 2016 10:55:06 +0000 (12:55 +0200)]
Fix crash on Linux due to double fclose()
Christoph M. Becker [Mon, 3 Oct 2016 10:11:46 +0000 (12:11 +0200)]
Move freeing of truecolor pixels to a function
We port <https://github.com/libgd/libgd/commit/
81675d39 >.
Christoph M. Becker [Mon, 3 Oct 2016 09:38:22 +0000 (11:38 +0200)]
Change gdImageTrueColorToPalette() to return success/failure
We're porting the relevant changes from
<https://github.com/libgd/libgd/commit/
34a00a40 >.
We also check the return value in the PHP binding, and throw E_WARNING if
the conversion failed.
Christoph M. Becker [Sun, 2 Oct 2016 17:06:59 +0000 (19:06 +0200)]
Add support for gdEffectMultiply
gdLayerMultiply() has been introduced in libgd 2.1.1, and as such would have
been already available for imagelayereffect() with a system libgd. We port
the respective code to the bundled libgd, and also make IMG_EFFECT_MULTIPLY
available to userland.
Bob Weinand [Sun, 2 Oct 2016 11:46:45 +0000 (12:46 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Sun, 2 Oct 2016 11:46:22 +0000 (12:46 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sun, 2 Oct 2016 11:45:20 +0000 (12:45 +0100)]
Fix run command args passing when inmidst execution
Christoph M. Becker [Sun, 2 Oct 2016 10:47:22 +0000 (12:47 +0200)]
Switch to libgd anti-aliased drawing API
Instead of rolling our own in the bundled libgd, we use libgd's anti-aliased
drawing API. This way imageantialias() is also available, when built against
a system libgd.
Bob Weinand [Sat, 1 Oct 2016 18:14:46 +0000 (19:14 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Sat, 1 Oct 2016 18:14:26 +0000 (19:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sat, 1 Oct 2016 17:54:44 +0000 (18:54 +0100)]
Add proper escape sequences and reading stdin from file in phpdbg run command
Nikita Popov [Sat, 1 Oct 2016 17:06:13 +0000 (19:06 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 1 Oct 2016 17:06:05 +0000 (19:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 1 Oct 2016 17:05:48 +0000 (19:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 1 Oct 2016 17:03:54 +0000 (19:03 +0200)]
Fix leak in zend_exception_error
Only occurs if a non-fatal severity level is used, e.g. when using
interactive mode.
Bob Weinand [Sat, 1 Oct 2016 09:47:53 +0000 (10:47 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Sat, 1 Oct 2016 09:47:31 +0000 (10:47 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sat, 1 Oct 2016 09:46:21 +0000 (10:46 +0100)]
Fix invalid access to interned strings after they are freed in phpdbg
Christoph M. Becker [Fri, 30 Sep 2016 22:02:05 +0000 (00:02 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Fri, 30 Sep 2016 21:55:29 +0000 (23:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 30 Sep 2016 21:46:28 +0000 (23:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 30 Sep 2016 21:25:23 +0000 (23:25 +0200)]
Fix #73213: Integer overflow in imageline() with antialiasing
We port the respective fixes <https://github.com/libgd/libgd/commit/
eca37d620 >
and <https://github.com/libgd/libgd/commit/
837b7327 > to our bundled libgd.
Nikita Popov [Fri, 30 Sep 2016 20:10:32 +0000 (22:10 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Fri, 30 Sep 2016 20:08:08 +0000 (22:08 +0200)]
Unwrap reference returns in cufa etc
Derick Rethans [Fri, 30 Sep 2016 19:50:13 +0000 (20:50 +0100)]
Merge branch 'PHP-7.1'
Derick Rethans [Fri, 30 Sep 2016 19:50:00 +0000 (20:50 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Fri, 30 Sep 2016 19:49:53 +0000 (20:49 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Derick Rethans [Fri, 30 Sep 2016 19:49:44 +0000 (20:49 +0100)]
Fixed tests due to changes in underlaying data
Derick Rethans [Fri, 30 Sep 2016 19:31:26 +0000 (20:31 +0100)]
Merge branch 'PHP-7.1'
Derick Rethans [Fri, 30 Sep 2016 19:31:16 +0000 (20:31 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Fri, 30 Sep 2016 19:31:05 +0000 (20:31 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Derick Rethans [Fri, 30 Sep 2016 19:21:48 +0000 (20:21 +0100)]
Fixed parsing of AM/PM without all the expected dots in place
Christoph M. Becker [Fri, 30 Sep 2016 18:15:15 +0000 (20:15 +0200)]
Fix overflow checks
We check for the proper sizeofs, cf.
<https://github.com/libgd/libgd/commit/
c3cf674c >.
Christoph M. Becker [Fri, 30 Sep 2016 15:04:37 +0000 (17:04 +0200)]
Remove further remains of the old antialiasing support
Curiously, while the external GD claims "just a few vestiges after switching
to the fast, memory-cheap implementation from PHP-gd", that stuff was still
in the bundled GD.
Christoph M. Becker [Fri, 30 Sep 2016 14:12:47 +0000 (16:12 +0200)]
Remove basically effectless gdImageAABlend()
This had already be done for GD 2.0.26 as part of the improved antialiasing
support (<https://boutell.com/gd/manual2.0.26.html#whatsnew2.0.26>).
Christoph M. Becker [Fri, 30 Sep 2016 09:50:57 +0000 (11:50 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Fri, 30 Sep 2016 09:46:06 +0000 (11:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 30 Sep 2016 09:40:10 +0000 (11:40 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 30 Sep 2016 09:05:53 +0000 (11:05 +0200)]
Fix #73203: passing additional_parameters causes mail to fail
We make sure that there's no unsigned underflow, which happened for `y==0`.
Xinchen Hui [Fri, 30 Sep 2016 08:01:43 +0000 (16:01 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Cleanup exception handling after zend_fetch_class_by_name
fix user filter bug
Xinchen Hui [Fri, 30 Sep 2016 08:01:19 +0000 (16:01 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
fix user filter bug
Xinchen Hui [Fri, 30 Sep 2016 08:00:14 +0000 (16:00 +0800)]
Cleanup exception handling after zend_fetch_class_by_name
Joe Watkins [Fri, 30 Sep 2016 06:23:19 +0000 (07:23 +0100)]
Merge branch 'master' of https://github.com/php/php-src
Joe Watkins [Fri, 30 Sep 2016 06:22:50 +0000 (07:22 +0100)]
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
Joe Watkins [Fri, 30 Sep 2016 06:21:01 +0000 (07:21 +0100)]
fix user filter bug
Joe Watkins [Fri, 30 Sep 2016 06:21:01 +0000 (07:21 +0100)]
fix user filter bug
Joe Watkins [Fri, 30 Sep 2016 06:21:01 +0000 (07:21 +0100)]
fix user filter bug
Xinchen Hui [Fri, 30 Sep 2016 05:19:39 +0000 (13:19 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Use smart branch
Xinchen Hui [Fri, 30 Sep 2016 05:19:11 +0000 (13:19 +0800)]
Use smart branch
Dmitry Stogov [Thu, 29 Sep 2016 23:42:05 +0000 (02:42 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Special handling for $php_errormsg and $http_response_header.
Dmitry Stogov [Thu, 15 Sep 2016 00:07:31 +0000 (03:07 +0300)]
Special handling for $php_errormsg and $http_response_header.
Christoph M. Becker [Thu, 29 Sep 2016 12:42:48 +0000 (14:42 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Thu, 29 Sep 2016 12:41:12 +0000 (14:41 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 29 Sep 2016 12:39:39 +0000 (14:39 +0200)]
Merge branch 'pull-request/2128' into PHP-7.0
Anatol Belski [Thu, 29 Sep 2016 11:02:54 +0000 (13:02 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
sync win32 makefile with makedist zendparse exports
Anatol Belski [Thu, 29 Sep 2016 11:02:03 +0000 (13:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
sync win32 makefile with makedist zendparse exports
Anatol Belski [Thu, 29 Sep 2016 10:56:49 +0000 (12:56 +0200)]
sync win32 makefile with makedist zendparse exports
With a newer bison this part is relevant. Whil bison 2.4.1 is still
used, this changes cater for the forward compatibility.
Dmitry Stogov [Thu, 29 Sep 2016 08:00:13 +0000 (11:00 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
zval_dtor_func_for_ptr() -> zval_dtor_func()
Dmitry Stogov [Thu, 29 Sep 2016 07:59:54 +0000 (10:59 +0300)]
zval_dtor_func_for_ptr() -> zval_dtor_func()
Dmitry Stogov [Thu, 29 Sep 2016 07:57:39 +0000 (10:57 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Better fix for bug #72854 (avoid extra copy and creating reference to stack variable)
Dmitry Stogov [Thu, 29 Sep 2016 07:57:09 +0000 (10:57 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Better fix for bug #72854 (avoid extra copy and creating reference to stack variable)
Dmitry Stogov [Thu, 29 Sep 2016 07:56:01 +0000 (10:56 +0300)]
Better fix for bug #72854 (avoid extra copy and creating reference to stack variable)
Ferenc Kovacs [Wed, 28 Sep 2016 23:02:20 +0000 (01:02 +0200)]
Merge branch 'PHP-7.1'
Ferenc Kovacs [Wed, 28 Sep 2016 22:59:50 +0000 (00:59 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Wed, 28 Sep 2016 22:58:02 +0000 (00:58 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
configure.in
main/php_version.h
Ferenc Kovacs [Wed, 28 Sep 2016 22:55:36 +0000 (00:55 +0200)]
5.6.28 is next
Derick Rethans [Wed, 28 Sep 2016 22:30:29 +0000 (23:30 +0100)]
Updated to version 2016.7 (2016g)
Derick Rethans [Wed, 28 Sep 2016 22:30:29 +0000 (23:30 +0100)]
Empty merge
Derick Rethans [Wed, 28 Sep 2016 22:30:28 +0000 (23:30 +0100)]
Updated to version 2016.7 (2016g)
Derick Rethans [Wed, 28 Sep 2016 22:30:28 +0000 (23:30 +0100)]
Empty merge
Derick Rethans [Wed, 28 Sep 2016 22:30:27 +0000 (23:30 +0100)]
Updated to version 2016.7 (2016g)
Derick Rethans [Wed, 28 Sep 2016 22:30:27 +0000 (23:30 +0100)]
Empty merge
Derick Rethans [Wed, 28 Sep 2016 22:30:26 +0000 (23:30 +0100)]
Updated to version 2016.7 (2016g)
Nikita Popov [Wed, 28 Sep 2016 21:23:01 +0000 (23:23 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 28 Sep 2016 21:22:48 +0000 (23:22 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Wed, 28 Sep 2016 21:12:45 +0000 (23:12 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Wed, 28 Sep 2016 21:11:02 +0000 (23:11 +0200)]
Handle resource keys in constexpr arrays
Nikita Popov [Wed, 28 Sep 2016 21:05:21 +0000 (23:05 +0200)]
Fix the constant array case as well
Nikita Popov [Wed, 28 Sep 2016 20:39:17 +0000 (22:39 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 28 Sep 2016 20:38:47 +0000 (22:38 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Wed, 28 Sep 2016 20:36:36 +0000 (22:36 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Wed, 28 Sep 2016 20:33:40 +0000 (22:33 +0200)]
Check next_index_insert failure in ADD_ARRAY_ELEMENT
Davey Shafik [Wed, 28 Sep 2016 20:02:02 +0000 (13:02 -0700)]
Prepare to Re-roll 7.1.0RC3
Nikita Popov [Wed, 28 Sep 2016 19:43:58 +0000 (21:43 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 28 Sep 2016 19:41:56 +0000 (21:41 +0200)]
Combine code for keyed/unkeyed list()
Nikita Popov [Wed, 28 Sep 2016 19:31:06 +0000 (21:31 +0200)]
Fix segfault when empty entry in keyed array assignment
Anatol Belski [Wed, 28 Sep 2016 19:30:59 +0000 (21:30 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix exports which are now referenced by phpdbg
Update UPGRADING to reflect new reality
Update NEWS for 7.1.0RC4
Update NEWS
Anatol Belski [Wed, 28 Sep 2016 18:06:10 +0000 (20:06 +0200)]
fix exports which are now referenced by phpdbg
(cherry picked from commit
cd0f1c8a5ed6d4e677dbf891fc69326e5b05cccc )
Davey Shafik [Wed, 28 Sep 2016 18:23:31 +0000 (11:23 -0700)]
Update UPGRADING to reflect new reality
Davey Shafik [Wed, 28 Sep 2016 18:07:19 +0000 (18:07 +0000)]
Update NEWS for 7.1.0RC4
Anatol Belski [Wed, 28 Sep 2016 18:06:10 +0000 (20:06 +0200)]
fix exports which are now referenced by phpdbg
Davey Shafik [Wed, 28 Sep 2016 17:31:22 +0000 (10:31 -0700)]
Update NEWS