]>
granicus.if.org Git - php/log
Xinchen Hui [Mon, 30 Oct 2017 10:21:00 +0000 (18:21 +0800)]
Merge branch 'PHP-7.2' of git.php.net:/php-src into PHP-7.2
* 'PHP-7.2' of git.php.net:/php-src:
Fix SDK version comparison and add more verbosity
Don't use the cache dependency, SDK version is handled in script
Xinchen Hui [Mon, 30 Oct 2017 10:17:41 +0000 (18:17 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Use abbrev
Xinchen Hui [Mon, 30 Oct 2017 10:17:27 +0000 (18:17 +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:
Remove status check on the SDK repo and add version check
Anatol Belski [Mon, 30 Oct 2017 10:16:33 +0000 (11:16 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix SDK version comparison and add more verbosity
Don't use the cache dependency, SDK version is handled in script
Anatol Belski [Mon, 30 Oct 2017 10:15:51 +0000 (11:15 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix SDK version comparison and add more verbosity
Don't use the cache dependency, SDK version is handled in script
Anatol Belski [Mon, 30 Oct 2017 09:53:12 +0000 (10:53 +0100)]
Fix SDK version comparison and add more verbosity
Anatol Belski [Mon, 30 Oct 2017 09:34:11 +0000 (10:34 +0100)]
Don't use the cache dependency, SDK version is handled in script
Anatol Belski [Mon, 30 Oct 2017 09:17:25 +0000 (10:17 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Remove status check on the SDK repo and add version check
Anatol Belski [Mon, 30 Oct 2017 09:16:39 +0000 (10:16 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Remove status check on the SDK repo and add version check
Anatol Belski [Mon, 30 Oct 2017 09:14:05 +0000 (10:14 +0100)]
Remove status check on the SDK repo and add version check
If Appveyor fails to unzip, .git would be in an arbitrary state anyway.
Thus this check doesn't help. For the version check - rely on the branch
naming scheme in the SDK.
Xinchen Hui [Mon, 30 Oct 2017 08:26:59 +0000 (16:26 +0800)]
Use abbrev
Anatol Belski [Mon, 30 Oct 2017 07:57:29 +0000 (08:57 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Catch with the latest AppVeyor unzip errors
Anatol Belski [Mon, 30 Oct 2017 07:56:52 +0000 (08:56 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Catch with the latest AppVeyor unzip errors
Dmitry Stogov [Mon, 30 Oct 2017 07:44:12 +0000 (10:44 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed type inference
Anatol Belski [Mon, 30 Oct 2017 07:42:59 +0000 (08:42 +0100)]
Catch with the latest AppVeyor unzip errors
Dmitry Stogov [Mon, 30 Oct 2017 07:41:27 +0000 (10:41 +0300)]
Fixed type inference
Joe Watkins [Mon, 30 Oct 2017 06:55:43 +0000 (06:55 +0000)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
Joe Watkins [Mon, 30 Oct 2017 06:55:13 +0000 (06:55 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
Fabien Villepinte [Sun, 29 Oct 2017 08:14:56 +0000 (09:14 +0100)]
Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
Anatol Belski [Sun, 29 Oct 2017 09:09:45 +0000 (10:09 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Re-enable AppVeyor cache
Anatol Belski [Sun, 29 Oct 2017 09:09:18 +0000 (10:09 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Re-enable AppVeyor cache
Anatol Belski [Sun, 29 Oct 2017 09:08:31 +0000 (10:08 +0100)]
Re-enable AppVeyor cache
Joe Watkins [Sun, 29 Oct 2017 04:38:08 +0000 (04:38 +0000)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
make sure run-tests reports exit status upon prerequisite error
Joe Watkins [Sun, 29 Oct 2017 04:37:55 +0000 (04:37 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
make sure run-tests reports exit status upon prerequisite error
Joe Watkins [Sun, 29 Oct 2017 04:37:21 +0000 (04:37 +0000)]
make sure run-tests reports exit status upon prerequisite error
Nikita Popov [Sat, 28 Oct 2017 10:58:11 +0000 (12:58 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Sat, 28 Oct 2017 10:57:36 +0000 (12:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Fabien Villepinte [Sat, 28 Oct 2017 08:40:00 +0000 (10:40 +0200)]
Fix bug #75434 Wrong reflection for mysqli_fetch_all function
Sara Golemon [Fri, 27 Oct 2017 17:05:38 +0000 (13:05 -0400)]
Don't optimize input arrays with suffix holes
Joe Watkins [Fri, 27 Oct 2017 15:06:38 +0000 (16:06 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #75307 Wrong reflection for openssl_open function
Joe Watkins [Fri, 27 Oct 2017 15:06:12 +0000 (16:06 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #75307 Wrong reflection for openssl_open function
Fabien Villepinte [Fri, 27 Oct 2017 12:14:04 +0000 (14:14 +0200)]
Fix bug #75307 Wrong reflection for openssl_open function
Anatol Belski [Fri, 27 Oct 2017 14:23:50 +0000 (16:23 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Skip test on PostgreSQL 10
Anatol Belski [Fri, 27 Oct 2017 14:23:19 +0000 (16:23 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Skip test on PostgreSQL 10
Anatol Belski [Fri, 27 Oct 2017 14:19:42 +0000 (16:19 +0200)]
Skip test on PostgreSQL 10
The 42P18 error is not produced by the server anymore.
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
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
Anatol Belski [Fri, 27 Oct 2017 12:58:43 +0000 (14:58 +0200)]
Fix test compat for PostgreSQL 10
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
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
Anatol Belski [Fri, 27 Oct 2017 11:20:15 +0000 (13:20 +0200)]
Apply upstream patch for CVE-2017-14107
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
Anatol Belski [Fri, 27 Oct 2017 11:16:56 +0000 (13:16 +0200)]
Backport and apply upstream patch for CVE-2017-14107
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
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
Anatol Belski [Thu, 26 Oct 2017 19:25:08 +0000 (21:25 +0200)]
Binary SDK 2.0.12 stable
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
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
Dmitry Stogov [Thu, 26 Oct 2017 13:03:42 +0000 (16:03 +0300)]
Fixed indirect modification of magic ArrayAccess method arguments
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
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
Dmitry Stogov [Thu, 26 Oct 2017 11:12:08 +0000 (14:12 +0300)]
Backport tests
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.
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.
Dmitry Stogov [Thu, 26 Oct 2017 10:05:23 +0000 (13:05 +0300)]
Fixed indirect modification of magic method arguments.
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
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
Xinchen Hui [Thu, 26 Oct 2017 02:23:43 +0000 (10:23 +0800)]
Fixed test
Xinchen Hui [Thu, 26 Oct 2017 02:11:13 +0000 (10:11 +0800)]
Update NEWS
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)
Xinchen Hui [Thu, 26 Oct 2017 02:09:41 +0000 (10:09 +0800)]
Update NEWS
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
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)
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
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
Fabien Villepinte [Wed, 25 Oct 2017 08:42:13 +0000 (10:42 +0200)]
Fix typo in comments
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
Anatol Belski [Wed, 25 Oct 2017 16:06:56 +0000 (18:06 +0200)]
Don't create plist files when using clang analyzer
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
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
Fabien Villepinte [Wed, 25 Oct 2017 11:53:52 +0000 (13:53 +0200)]
Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt
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
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
Fabien Villepinte [Wed, 25 Oct 2017 10:06:54 +0000 (12:06 +0200)]
Fix bug #75437 Wrong reflection on imagewebp
Ferenc Kovacs [Wed, 25 Oct 2017 01:42:55 +0000 (03:42 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Ferenc Kovacs [Wed, 25 Oct 2017 01:40:49 +0000 (03:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Wed, 25 Oct 2017 01:39:34 +0000 (03:39 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 25 Oct 2017 01:36:30 +0000 (03:36 +0200)]
5.6.33 is next
Ferenc Kovacs [Wed, 25 Oct 2017 01:20:34 +0000 (03:20 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Ferenc Kovacs [Wed, 25 Oct 2017 01:17:14 +0000 (03:17 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Wed, 25 Oct 2017 01:14:51 +0000 (03:14 +0200)]
use trusty explicitly
Ferenc Kovacs [Wed, 25 Oct 2017 01:13:40 +0000 (03:13 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Rasmus Lerdorf [Sat, 10 Jan 2015 01:24:48 +0000 (17:24 -0800)]
These tests all assume that IPV6 is available.
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
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
Sara Golemon [Tue, 24 Oct 2017 16:27:46 +0000 (16:27 +0000)]
Update NEWS for 7.2.0RC6
Sara Golemon [Tue, 24 Oct 2017 16:04:56 +0000 (16:04 +0000)]
Update NEWS for PHP 7.2.0RC5
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
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
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
Anatol Belski [Tue, 24 Oct 2017 16:33:21 +0000 (18:33 +0200)]
Parametrize the expected value to avoid platform false positives
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
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
Sara Golemon [Tue, 24 Oct 2017 15:37:24 +0000 (11:37 -0400)]
Decref default_link when clearing
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)
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)
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.
Derick Rethans [Tue, 24 Oct 2017 13:56:24 +0000 (14:56 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Derick Rethans [Tue, 24 Oct 2017 13:55:48 +0000 (14:55 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Tue, 24 Oct 2017 13:55:13 +0000 (14:55 +0100)]
Update timezonemap.h, which needs to match the bundled TZ db