]> granicus.if.org Git - php/log
php
8 years agoMerge branch 'PHP-7.1'
Derick Rethans [Fri, 7 Oct 2016 17:49:08 +0000 (13:49 -0400)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'microseconds-modify' into PHP-7.1
Derick Rethans [Fri, 7 Oct 2016 17:49:00 +0000 (13:49 -0400)]
Merge branch 'microseconds-modify' into PHP-7.1

8 years agoFixed bug #64887 (Allow DateTime modification with subsecond items).
Derick Rethans [Fri, 7 Oct 2016 17:40:06 +0000 (13:40 -0400)]
Fixed bug #64887 (Allow DateTime modification with subsecond items).

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Fri, 7 Oct 2016 14:36:38 +0000 (16:36 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 7 Oct 2016 14:36:13 +0000 (16:36 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoDocument that ext/shmop deals with resources as of PHP 7.0.0
Christoph M. Becker [Fri, 7 Oct 2016 14:35:37 +0000 (16:35 +0200)]
Document that ext/shmop deals with resources as of PHP 7.0.0

Second attempt

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Fri, 7 Oct 2016 14:22:23 +0000 (16:22 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 7 Oct 2016 14:21:52 +0000 (16:21 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoDocument that ext/shmop deals with resources as of PHP 7.0.0
Christoph M. Becker [Fri, 7 Oct 2016 14:13:24 +0000 (16:13 +0200)]
Document that ext/shmop deals with resources as of PHP 7.0.0

8 years agoUnify error handling of bundled and external libgd
Christoph M. Becker [Thu, 6 Oct 2016 23:06:24 +0000 (01:06 +0200)]
Unify error handling of bundled and external libgd

There's no need anymore to call an own error handler directly. Instead we
register our error handler and call libgd's error functions (which will
forward). We do this regardless of compiling with the bundled or an external
libgd.

8 years agoFix "already in use" check inconsistencies/bugs
Nikita Popov [Thu, 6 Oct 2016 21:09:41 +0000 (23:09 +0200)]
Fix "already in use" check inconsistencies/bugs

This fixes the following issues:
 * "use function" and "use const" inside namespaced code were checking
   for conflicts against class imports. Now they always check against
   the correct symbol type.
 * Symbol conflicts are now always checked within a single file only.
   Previously class uses inside namespaced code were checked globally.
   This behavior is illegal because symbols from other files are not
   visible if opcache is used, resulting in behavioral discrepancies.
   Additionally this made the presence/absence of symbol errors dependent
   on autoloading order, which is volatile.
 * The "single file" restriction is now enforced by collecting defined
   symbols inside a separate hash table. Previously it was enforced
   (for the non-namespaced case) by comparing the filename of the
   symbol declaration. However this is inaccurate if the same filename
   is used multiple times, such as may happen if eval() is used.
 * Additionally the previous approach relies on symbols being registered
   at compile-time, which is not the case for late-bound classes, which
   makes the behavior dependent on class declaration order, as well as
   opcache (which may cause delayed early-binding).
 * Lastly, conflicts are now consistently checked for conditionally
   defined symbols. Previously only declaration-after-use conflicts were
   checked in this case. Now use-after-declaration conflicts are
   detected as well.

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Thu, 6 Oct 2016 09:03:45 +0000 (11:03 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix datatype

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 6 Oct 2016 09:03:09 +0000 (11:03 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix datatype

8 years agofix datatype
Anatol Belski [Thu, 6 Oct 2016 09:01:27 +0000 (11:01 +0200)]
fix datatype

8 years agoMerge branch 'PHP-7.1'
Bob Weinand [Thu, 6 Oct 2016 08:36:40 +0000 (10:36 +0200)]
Merge branch 'PHP-7.1'

8 years agoUse better fix for preventing too early freeing of interned strings
Bob Weinand [Thu, 6 Oct 2016 08:36:12 +0000 (10:36 +0200)]
Use better fix for preventing too early freeing of interned strings
Works also with opcache now - just prevent zend_interned_strings_restore completely - zend_interned_strings_dtor will take care as phpdbg only ever uses one single request cycle per module cycle

8 years agoensure the flag doesn't overflow
Anatol Belski [Thu, 6 Oct 2016 08:15:38 +0000 (10:15 +0200)]
ensure the flag doesn't overflow

In certain case, it could take more than just 0/1, but 2 bits should
be enough.

8 years agoMerge branch 'PHP-7.1'
Dmitry Stogov [Thu, 6 Oct 2016 08:16:43 +0000 (11:16 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Updated reference-counting inferece rules. The previous rules refected PHP-5 behavior and were completely wrong for PHP-7. (e.g. scalars don't have reference counters at all). This change shouldn't affect anything, because results of this inference are not used yet.
  Fix NEWS after re-roll of RC3

8 years agoUpdated reference-counting inferece rules.
Dmitry Stogov [Thu, 6 Oct 2016 08:08:01 +0000 (11:08 +0300)]
Updated reference-counting inferece rules.
The previous rules refected PHP-5 behavior and were completely wrong for PHP-7. (e.g. scalars don't have reference counters at all).
This change shouldn't affect anything, because results of this inference are not used yet.

8 years agohandle the stream->__exposed flag correctly
Anatol Belski [Thu, 6 Oct 2016 00:14:16 +0000 (02:14 +0200)]
handle the stream->__exposed flag correctly

as it's a flag now, just set the value

8 years agoEnable QDBM support in ext/dba on Windows
Anatol Belski [Mon, 26 Sep 2016 14:49:42 +0000 (16:49 +0200)]
Enable QDBM support in ext/dba on Windows

8 years agocatch up with stream datatypes
Anatol Belski [Thu, 15 Sep 2016 15:50:05 +0000 (17:50 +0200)]
catch up with stream datatypes

8 years agouint vs. uint32_t
Anatol Belski [Thu, 15 Sep 2016 15:11:58 +0000 (17:11 +0200)]
uint vs. uint32_t

8 years agoreduce size of stream struct
Anatol Belski [Thu, 15 Sep 2016 14:48:29 +0000 (16:48 +0200)]
reduce size of stream struct

32 bytes are spared on 64-bit build

8 years agoprevent flags overflows
Anatol Belski [Thu, 15 Sep 2016 11:12:26 +0000 (13:12 +0200)]
prevent flags overflows

Sometimes int is overflown. That might still come out with a right
result, but is ofc not clean.

8 years agoreduce size of stream bucket struct by 8 bytes on 64-bit
Anatol Belski [Thu, 15 Sep 2016 11:08:54 +0000 (13:08 +0200)]
reduce size of stream bucket struct by 8 bytes on 64-bit

8 years agoFix NEWS after re-roll of RC3
Davey Shafik [Wed, 5 Oct 2016 20:07:47 +0000 (13:07 -0700)]
Fix NEWS after re-roll of RC3

8 years agoMerge branch 'PHP-7.1'
Derick Rethans [Wed, 5 Oct 2016 19:32:24 +0000 (15:32 -0400)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'microseconds' into PHP-7.1
Derick Rethans [Wed, 5 Oct 2016 19:32:11 +0000 (15:32 -0400)]
Merge branch 'microseconds' into PHP-7.1

8 years agoImprove support for microseconds with Date/Time microseconds
Derick Rethans [Wed, 5 Oct 2016 15:24:15 +0000 (11:24 -0400)]
Improve support for microseconds with Date/Time

It fixes several bugs:

- Fixed bug #45554 (Inconsistent behavior of the u format char).
- Fixed bug #48225 (DateTime parser doesn't set microseconds for "now").
- Fixed bug #52514 (microseconds are missing in DateTime class).
- Fixed bug #52519 (microseconds in DateInterval are missing).
- Fixed bug #68506 (General DateTime improvments needed for microseconds to become useful).
- Fixed bug #73109 (timelib_meridian doesn't parse dots correctly).
- Fixed bug #73247 (DateTime constructor does not initialise microseconds property).

It also updates timelib to 2016.04, and updates a data mapping file, which
causes changes to the volatile abbreviations tests.

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Wed, 5 Oct 2016 13:05:56 +0000 (15:05 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix bug #73037, second round

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 5 Oct 2016 13:04:55 +0000 (15:04 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #73037, second round

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Wed, 5 Oct 2016 13:03:38 +0000 (15:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix bug #73037, second round

8 years agoFix bug #73037, second round
Anatol Belski [Wed, 5 Oct 2016 12:54:06 +0000 (14:54 +0200)]
Fix bug #73037, second round

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Wed, 5 Oct 2016 11:13:04 +0000 (13:13 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'pull-request/2155' into PHP-7.1
Christoph M. Becker [Wed, 5 Oct 2016 11:07:39 +0000 (13:07 +0200)]
Merge branch 'pull-request/2155' into PHP-7.1

8 years agoMerge branch 'PHP-7.1'
Bob Weinand [Wed, 5 Oct 2016 10:22:39 +0000 (12:22 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Wed, 5 Oct 2016 10:20:06 +0000 (12:20 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoUpdate run command for allowing STDIN
Bob Weinand [Wed, 5 Oct 2016 10:14:02 +0000 (12:14 +0200)]
Update run command for allowing STDIN

8 years agoRemove phpdbg fix targeting 7.1 which landed in 7.0
Bob Weinand [Wed, 5 Oct 2016 10:08:20 +0000 (12:08 +0200)]
Remove phpdbg fix targeting 7.1 which landed in 7.0

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Wed, 5 Oct 2016 04:57:43 +0000 (21:57 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed test
  Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986
  Apparently negative wordwrap is a thing and should work as length = 0.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Wed, 5 Oct 2016 04:57:28 +0000 (21:57 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed test
  Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986
  Apparently negative wordwrap is a thing and should work as length = 0.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Wed, 5 Oct 2016 04:56:28 +0000 (21:56 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed test
  Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986
  Apparently negative wordwrap is a thing and should work as length = 0.

8 years agoFixed test
Ilia Alshanetsky [Wed, 28 Oct 2015 22:38:54 +0000 (18:38 -0400)]
Fixed test

8 years agoAdded validation to parse_url() to prohibit restricted characters inside login/pass...
Ilia Alshanetsky [Tue, 27 Oct 2015 16:40:53 +0000 (12:40 -0400)]
Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986

8 years agoSkip tests that rely on sessions if sessions aren't available
Craig Duncan [Tue, 4 Oct 2016 19:15:09 +0000 (20:15 +0100)]
Skip tests that rely on sessions if sessions aren't available

8 years agoApparently negative wordwrap is a thing and should work as length = 0.
Stanislav Malyshev [Tue, 4 Oct 2016 02:17:42 +0000 (19:17 -0700)]
Apparently negative wordwrap is a thing and should work as length = 0.

I'll leave it as is for now.

8 years agoMerge branch 'PHP-7.1'
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

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
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

8 years agoReally fix bug #73017
Stanislav Malyshev [Tue, 4 Oct 2016 01:06:59 +0000 (18:06 -0700)]
Really fix bug #73017

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Mon, 3 Oct 2016 16:56:36 +0000 (18:56 +0200)]
Merge branch 'PHP-7.1'

8 years agoFix #73207: Array ordering is same between 5.6.21 and 7.1.0 RC3
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

8 years agoMerge branch 'PHP-7.1'
Bob Weinand [Mon, 3 Oct 2016 10:55:45 +0000 (12:55 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoFix crash on Linux due to double fclose()
Bob Weinand [Mon, 3 Oct 2016 10:55:06 +0000 (12:55 +0200)]
Fix crash on Linux due to double fclose()

8 years agoMove freeing of truecolor pixels to a function
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>.

8 years agoChange gdImageTrueColorToPalette() to return success/failure
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.

8 years agoAdd support for gdEffectMultiply
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.

8 years agoMerge branch 'PHP-7.1'
Bob Weinand [Sun, 2 Oct 2016 11:46:45 +0000 (12:46 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoFix run command args passing when inmidst execution
Bob Weinand [Sun, 2 Oct 2016 11:45:20 +0000 (12:45 +0100)]
Fix run command args passing when inmidst execution

8 years agoSwitch to libgd anti-aliased drawing API
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.

8 years agoMerge branch 'PHP-7.1'
Bob Weinand [Sat, 1 Oct 2016 18:14:46 +0000 (19:14 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoAdd proper escape sequences and reading stdin from file in phpdbg run command
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

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sat, 1 Oct 2016 17:06:13 +0000 (19:06 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 1 Oct 2016 17:05:48 +0000 (19:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix leak in zend_exception_error
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.

8 years agoMerge branch 'PHP-7.1'
Bob Weinand [Sat, 1 Oct 2016 09:47:53 +0000 (10:47 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoFix invalid access to interned strings after they are freed in phpdbg
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

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Fri, 30 Sep 2016 22:02:05 +0000 (00:02 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 30 Sep 2016 21:46:28 +0000 (23:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #73213: Integer overflow in imageline() with antialiasing
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.

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Fri, 30 Sep 2016 20:10:32 +0000 (22:10 +0200)]
Merge branch 'PHP-7.1'

8 years agoUnwrap reference returns in cufa etc
Nikita Popov [Fri, 30 Sep 2016 20:08:08 +0000 (22:08 +0200)]
Unwrap reference returns in cufa etc

8 years agoMerge branch 'PHP-7.1'
Derick Rethans [Fri, 30 Sep 2016 19:50:13 +0000 (20:50 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Derick Rethans [Fri, 30 Sep 2016 19:49:53 +0000 (20:49 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFixed tests due to changes in underlaying data
Derick Rethans [Fri, 30 Sep 2016 19:49:44 +0000 (20:49 +0100)]
Fixed tests due to changes in underlaying data

8 years agoMerge branch 'PHP-7.1'
Derick Rethans [Fri, 30 Sep 2016 19:31:26 +0000 (20:31 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Derick Rethans [Fri, 30 Sep 2016 19:31:05 +0000 (20:31 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFixed parsing of AM/PM without all the expected dots in place
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

8 years agoFix overflow checks
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>.

8 years agoRemove further remains of the old antialiasing support
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.

8 years agoRemove basically effectless gdImageAABlend()
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>).

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Fri, 30 Sep 2016 09:50:57 +0000 (11:50 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 30 Sep 2016 09:40:10 +0000 (11:40 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #73203: passing additional_parameters causes mail to fail
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`.

8 years agoMerge branch 'PHP-7.1'
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

8 years agoMerge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
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

8 years agoCleanup exception handling after zend_fetch_class_by_name
Xinchen Hui [Fri, 30 Sep 2016 08:00:14 +0000 (16:00 +0800)]
Cleanup exception handling after zend_fetch_class_by_name

8 years agoMerge branch 'master' of https://github.com/php/php-src
Joe Watkins [Fri, 30 Sep 2016 06:23:19 +0000 (07:23 +0100)]
Merge branch 'master' of https://github.com/php/php-src

8 years agoMerge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
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

8 years agofix user filter bug
Joe Watkins [Fri, 30 Sep 2016 06:21:01 +0000 (07:21 +0100)]
fix user filter bug