]> granicus.if.org Git - php/log
php
7 years agoDo not create a new array when slicing all of input array.
Sara Golemon [Fri, 27 Oct 2017 14:00:17 +0000 (10:00 -0400)]
Do not create a new array when slicing all of input array.

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Fri, 27 Oct 2017 13:05:15 +0000 (15:05 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix test compat for PostgreSQL 10

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Fri, 27 Oct 2017 13:04:54 +0000 (15:04 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix test compat for PostgreSQL 10

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 27 Oct 2017 13:04:29 +0000 (15:04 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix test compat for PostgreSQL 10

7 years agoFix test compat for PostgreSQL 10
Anatol Belski [Fri, 27 Oct 2017 12:58:43 +0000 (14:58 +0200)]
Fix test compat for PostgreSQL 10

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Fri, 27 Oct 2017 12:18:55 +0000 (14:18 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Fri, 27 Oct 2017 12:18:27 +0000 (14:18 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 27 Oct 2017 12:17:57 +0000 (14:17 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107

7 years agoUse per-request heap instead of system one
Dmitry Stogov [Fri, 27 Oct 2017 11:45:54 +0000 (14:45 +0300)]
Use per-request heap instead of system one

7 years agoExtend zend_register_class_alias_ex() with additional argument to allow creating...
Dmitry Stogov [Fri, 27 Oct 2017 11:44:21 +0000 (14:44 +0300)]
Extend zend_register_class_alias_ex() with additional argument to allow creating persistent or per-request aliases

7 years agoMakrk persistent resources and references with GC_PERSISTENT flag
Dmitry Stogov [Fri, 27 Oct 2017 11:42:06 +0000 (14:42 +0300)]
Makrk persistent resources and references with GC_PERSISTENT flag

7 years agoApply upstream patch for CVE-2017-14107
Anatol Belski [Fri, 27 Oct 2017 11:20:15 +0000 (13:20 +0200)]
Apply upstream patch for CVE-2017-14107

7 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Fri, 27 Oct 2017 11:18:41 +0000 (13:18 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Backport and apply upstream patch for CVE-2017-14107

7 years agoBackport and apply upstream patch for CVE-2017-14107
Anatol Belski [Fri, 27 Oct 2017 11:16:56 +0000 (13:16 +0200)]
Backport and apply upstream patch for CVE-2017-14107

7 years agoReverted constant related change (this should be handled togrther with ohter constant...
Dmitry Stogov [Thu, 26 Oct 2017 19:43:45 +0000 (22:43 +0300)]
Reverted constant related change (this should be handled togrther with ohter constant related places)

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Thu, 26 Oct 2017 19:27:32 +0000 (21:27 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Binary SDK 2.0.12 stable

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Thu, 26 Oct 2017 19:27:09 +0000 (21:27 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Binary SDK 2.0.12 stable

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 26 Oct 2017 19:26:03 +0000 (21:26 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Binary SDK 2.0.12 stable

7 years agoBinary SDK 2.0.12 stable
Anatol Belski [Thu, 26 Oct 2017 19:25:08 +0000 (21:25 +0200)]
Binary SDK 2.0.12 stable

7 years agoRemoved useless reallocations
Dmitry Stogov [Thu, 26 Oct 2017 16:13:53 +0000 (19:13 +0300)]
Removed useless reallocations

7 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Thu, 26 Oct 2017 13:17:49 +0000 (16:17 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed indirect modification of magic ArrayAccess method arguments

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Thu, 26 Oct 2017 13:07:49 +0000 (16:07 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed indirect modification of magic ArrayAccess method arguments

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Thu, 26 Oct 2017 13:04:20 +0000 (16:04 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed indirect modification of magic ArrayAccess method arguments

7 years agoFixed indirect modification of magic ArrayAccess method arguments
Dmitry Stogov [Thu, 26 Oct 2017 13:03:42 +0000 (16:03 +0300)]
Fixed indirect modification of magic ArrayAccess method arguments

7 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Thu, 26 Oct 2017 11:12:58 +0000 (14:12 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Backport tests

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Thu, 26 Oct 2017 11:12:45 +0000 (14:12 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Backport tests

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Thu, 26 Oct 2017 11:12:33 +0000 (14:12 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Backport tests

7 years agoBackport tests
Dmitry Stogov [Thu, 26 Oct 2017 11:12:08 +0000 (14:12 +0300)]
Backport tests

7 years agoRestore object copying on magic method calls (It was removed in master only).
Dmitry Stogov [Thu, 26 Oct 2017 11:04:42 +0000 (14:04 +0300)]
Restore object copying on magic method calls (It was removed in master only).

7 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Thu, 26 Oct 2017 10:35:39 +0000 (13:35 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed indirect modification of magic method arguments.

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Thu, 26 Oct 2017 10:12:52 +0000 (13:12 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed indirect modification of magic method arguments.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Thu, 26 Oct 2017 10:11:59 +0000 (13:11 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed indirect modification of magic method arguments.

7 years agoFixed indirect modification of magic method arguments.
Dmitry Stogov [Thu, 26 Oct 2017 10:05:23 +0000 (13:05 +0300)]
Fixed indirect modification of magic method arguments.

7 years agoAvoid reallocations when concatenate with empty string
Dmitry Stogov [Thu, 26 Oct 2017 06:45:02 +0000 (09:45 +0300)]
Avoid reallocations when concatenate with empty string

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Thu, 26 Oct 2017 02:24:06 +0000 (10:24 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed test

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Xinchen Hui [Thu, 26 Oct 2017 02:24:00 +0000 (10:24 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed test

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Thu, 26 Oct 2017 02:23:52 +0000 (10:23 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed test

7 years agoFixed test
Xinchen Hui [Thu, 26 Oct 2017 02:23:43 +0000 (10:23 +0800)]
Fixed test

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Thu, 26 Oct 2017 02:16:55 +0000 (10:16 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Update NEWS
  Update NEWS
  Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)

Conflicts:
Zend/zend_object_handlers.c

7 years agoUpdate NEWS
Xinchen Hui [Thu, 26 Oct 2017 02:11:13 +0000 (10:11 +0800)]
Update NEWS

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Xinchen Hui [Thu, 26 Oct 2017 02:09:57 +0000 (10:09 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Update NEWS
  Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)

7 years agoUpdate NEWS
Xinchen Hui [Thu, 26 Oct 2017 02:09:41 +0000 (10:09 +0800)]
Update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Thu, 26 Oct 2017 02:08:39 +0000 (10:08 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)

Conflicts:
Zend/zend_object_handlers.c

7 years agoFixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)
Xinchen Hui [Thu, 26 Oct 2017 02:07:08 +0000 (10:07 +0800)]
Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)

7 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Wed, 25 Oct 2017 21:26:38 +0000 (00:26 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Fix typo in comments
  Fix typo in comments

7 years agoZend MM related tunning.
Dmitry Stogov [Wed, 25 Oct 2017 21:25:31 +0000 (00:25 +0300)]
Zend MM related tunning.

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Wed, 25 Oct 2017 20:00:13 +0000 (21:00 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix typo in comments

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Wed, 25 Oct 2017 20:00:03 +0000 (21:00 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix typo in comments

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Wed, 25 Oct 2017 19:59:51 +0000 (20:59 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix typo in comments

7 years agoFix typo in comments
Fabien Villepinte [Wed, 25 Oct 2017 08:42:13 +0000 (10:42 +0200)]
Fix typo in comments

7 years agoFix typo in comments
Fabien Villepinte [Wed, 25 Oct 2017 08:42:13 +0000 (10:42 +0200)]
Fix typo in comments

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Wed, 25 Oct 2017 16:15:16 +0000 (18:15 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Don't create plist files when using clang analyzer

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Wed, 25 Oct 2017 16:11:40 +0000 (18:11 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Don't create plist files when using clang analyzer

7 years agoDon't create plist files when using clang analyzer
Anatol Belski [Wed, 25 Oct 2017 16:06:56 +0000 (18:06 +0200)]
Don't create plist files when using clang analyzer

7 years agoReduce smart_string related reallocations and make them Zend MM friendly.
Dmitry Stogov [Wed, 25 Oct 2017 16:04:16 +0000 (19:04 +0300)]
Reduce smart_string related reallocations and make them Zend MM friendly.

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Wed, 25 Oct 2017 12:58:49 +0000 (14:58 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Wed, 25 Oct 2017 12:53:01 +0000 (14:53 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 25 Oct 2017 12:47:11 +0000 (14:47 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt

7 years agoFix the SKIPIF part in /ext/gd/tests/bug75437.phpt
Fabien Villepinte [Wed, 25 Oct 2017 11:53:52 +0000 (13:53 +0200)]
Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Wed, 25 Oct 2017 11:10:33 +0000 (13:10 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix bug #75437 Wrong reflection on imagewebp

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Wed, 25 Oct 2017 11:03:11 +0000 (13:03 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix bug #75437 Wrong reflection on imagewebp

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 25 Oct 2017 10:56:25 +0000 (12:56 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #75437 Wrong reflection on imagewebp

7 years agoFix bug #75437 Wrong reflection on imagewebp
Fabien Villepinte [Wed, 25 Oct 2017 10:06:54 +0000 (12:06 +0200)]
Fix bug #75437 Wrong reflection on imagewebp

7 years agoFixed signed/unsigned comparisons
Dmitry Stogov [Wed, 25 Oct 2017 08:45:17 +0000 (11:45 +0300)]
Fixed signed/unsigned comparisons

7 years agoMerge branch 'PHP-7.2'
Ferenc Kovacs [Wed, 25 Oct 2017 01:44:04 +0000 (03:44 +0200)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Ferenc Kovacs [Wed, 25 Oct 2017 01:42:55 +0000 (03:42 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Wed, 25 Oct 2017 01:40:49 +0000 (03:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 25 Oct 2017 01:39:34 +0000 (03:39 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

7 years ago5.6.33 is next
Ferenc Kovacs [Wed, 25 Oct 2017 01:36:30 +0000 (03:36 +0200)]
5.6.33 is next

7 years agoMerge branch 'PHP-7.2'
Ferenc Kovacs [Wed, 25 Oct 2017 01:23:34 +0000 (03:23 +0200)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Ferenc Kovacs [Wed, 25 Oct 2017 01:20:34 +0000 (03:20 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Wed, 25 Oct 2017 01:17:14 +0000 (03:17 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agouse trusty explicitly
Ferenc Kovacs [Wed, 25 Oct 2017 01:14:51 +0000 (03:14 +0200)]
use trusty explicitly

7 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 25 Oct 2017 01:13:40 +0000 (03:13 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

7 years agoThese tests all assume that IPV6 is available.
Rasmus Lerdorf [Sat, 10 Jan 2015 01:24:48 +0000 (17:24 -0800)]
These tests all assume that IPV6 is available.

7 years agofix the travis build for PHP-5.6 using precise instead of trusty
Ferenc Kovacs [Tue, 24 Oct 2017 23:51:48 +0000 (01:51 +0200)]
fix the travis build for PHP-5.6 using precise instead of trusty

7 years agofix the travis build for PHP-5.6 using precise instead of trusty
Ferenc Kovacs [Tue, 24 Oct 2017 23:47:21 +0000 (01:47 +0200)]
fix the travis build for PHP-5.6 using precise instead of trusty

7 years agoUpdate NEWS for 7.2.0RC6
Sara Golemon [Tue, 24 Oct 2017 16:27:46 +0000 (16:27 +0000)]
Update NEWS for 7.2.0RC6

7 years agoUpdate NEWS for PHP 7.2.0RC5
Sara Golemon [Tue, 24 Oct 2017 16:04:56 +0000 (16:04 +0000)]
Update NEWS for PHP 7.2.0RC5

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Tue, 24 Oct 2017 16:39:05 +0000 (18:39 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Parametrize the expected value to avoid platform false positives

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Tue, 24 Oct 2017 16:38:44 +0000 (18:38 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Parametrize the expected value to avoid platform false positives

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 24 Oct 2017 16:38:23 +0000 (18:38 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Parametrize the expected value to avoid platform false positives

7 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Tue, 24 Oct 2017 16:36:56 +0000 (18:36 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Parametrize the expected value to avoid platform false positives

7 years agoParametrize the expected value to avoid platform false positives
Anatol Belski [Tue, 24 Oct 2017 16:33:21 +0000 (18:33 +0200)]
Parametrize the expected value to avoid platform false positives

7 years agoMerge branch 'PHP-7.2'
Sara Golemon [Tue, 24 Oct 2017 15:38:32 +0000 (11:38 -0400)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Decref default_link when clearing

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Sara Golemon [Tue, 24 Oct 2017 15:38:24 +0000 (11:38 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Decref default_link when clearing

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Sara Golemon [Tue, 24 Oct 2017 15:38:17 +0000 (11:38 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Decref default_link when clearing

7 years agoDecref default_link when clearing
Sara Golemon [Tue, 24 Oct 2017 15:37:24 +0000 (11:37 -0400)]
Decref default_link when clearing

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Tue, 24 Oct 2017 15:23:24 +0000 (17:23 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #65148 (imagerotate may alter image dimensions)

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Tue, 24 Oct 2017 15:16:46 +0000 (17:16 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #65148 (imagerotate may alter image dimensions)

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 24 Oct 2017 15:09:14 +0000 (17:09 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #65148 (imagerotate may alter image dimensions)

7 years agoFixed bug #65148 (imagerotate may alter image dimensions)
Christoph M. Becker [Tue, 24 Oct 2017 12:42:03 +0000 (14:42 +0200)]
Fixed bug #65148 (imagerotate may alter image dimensions)

We apply the respective patches from external libgd, work around the
still missing `gdImageClone()`, and fix the special cased rotation
routines according to Pierre's patch
(https://gist.github.com/pierrejoye/59d72385ed1888cf8894a7ed437235ae).

We also cater to bug73272.phpt whose result obviously changes a bit.

7 years agoAvoid HashTable allocations for empty arrays (using zend_empty_array).
Dmitry Stogov [Tue, 24 Oct 2017 14:27:31 +0000 (17:27 +0300)]
Avoid HashTable allocations for empty arrays (using zend_empty_array).

7 years agoMerge branch 'PHP-7.2'
Derick Rethans [Tue, 24 Oct 2017 13:56:39 +0000 (14:56 +0100)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Derick Rethans [Tue, 24 Oct 2017 13:56:24 +0000 (14:56 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Tue, 24 Oct 2017 13:55:48 +0000 (14:55 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoUpdate timezonemap.h, which needs to match the bundled TZ db
Derick Rethans [Tue, 24 Oct 2017 13:55:13 +0000 (14:55 +0100)]
Update timezonemap.h, which needs to match the bundled TZ db

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Tue, 24 Oct 2017 12:59:19 +0000 (14:59 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix test

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Tue, 24 Oct 2017 12:58:56 +0000 (14:58 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix test

7 years agoFix test
Anatol Belski [Tue, 24 Oct 2017 12:58:01 +0000 (14:58 +0200)]
Fix test