]>
granicus.if.org Git - php/log
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
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
Anatol Belski [Tue, 24 Oct 2017 12:58:01 +0000 (14:58 +0200)]
Fix test
Anatol Belski [Tue, 24 Oct 2017 12:22:44 +0000 (14:22 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] update NEWS
[ci skip] update NEWS
[ci skip] update NEWS
Anatol Belski [Tue, 24 Oct 2017 12:22:25 +0000 (14:22 +0200)]
[ci skip] update NEWS
Anatol Belski [Tue, 24 Oct 2017 12:21:11 +0000 (14:21 +0200)]
[ci skip] update NEWS
Anatol Belski [Tue, 24 Oct 2017 12:19:45 +0000 (14:19 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update NEWS
[ci skip] update NEWS
Anatol Belski [Tue, 24 Oct 2017 12:18:59 +0000 (14:18 +0200)]
[ci skip] update NEWS
Anatol Belski [Tue, 24 Oct 2017 12:17:21 +0000 (14:17 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
[ci skip] update NEWS
Anatol Belski [Tue, 24 Oct 2017 12:16:54 +0000 (14:16 +0200)]
[ci skip] update NEWS
Anatol Belski [Tue, 24 Oct 2017 12:07:32 +0000 (14:07 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #72535 arcfour encryption stream filter crashes php
Anatol Belski [Tue, 24 Oct 2017 12:05:18 +0000 (14:05 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72535 arcfour encryption stream filter crashes php
Anatol Belski [Tue, 24 Oct 2017 12:04:08 +0000 (14:04 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #72535 arcfour encryption stream filter crashes php
Anatol Belski [Tue, 24 Oct 2017 11:59:18 +0000 (13:59 +0200)]
Fixed bug #72535 arcfour encryption stream filter crashes php
Anatol Belski [Tue, 24 Oct 2017 11:45:16 +0000 (13:45 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
Apply upstream patch for CVE-2016-1283
Anatol Belski [Tue, 24 Oct 2017 11:44:03 +0000 (13:44 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
Apply upstream patch for CVE-2016-1283
Anatol Belski [Tue, 24 Oct 2017 11:38:48 +0000 (13:38 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
Apply upstream patch for CVE-2016-1283
Anatol Belski [Tue, 24 Oct 2017 09:28:17 +0000 (11:28 +0200)]
Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
Anatol Belski [Thu, 28 Sep 2017 13:40:49 +0000 (15:40 +0200)]
Apply upstream patch for CVE-2016-1283
Fix bug #75207, see also
https://bugzilla.redhat.com/show_bug.cgi?id=
1295385
https://vcs.pcre.org/pcre?view=revision&revision=1636
(cherry picked from commit
d11fceab151cd0410645f81eb7444af4388470c3 )
Sara Golemon [Mon, 23 Oct 2017 18:56:50 +0000 (14:56 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
NEWS entry for pg_close() fix
Sara Golemon [Mon, 23 Oct 2017 18:56:10 +0000 (14:56 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
NEWS entry for pg_close() fix
Sara Golemon [Mon, 23 Oct 2017 18:55:32 +0000 (14:55 -0400)]
NEWS entry for pg_close() fix
Sara Golemon [Mon, 23 Oct 2017 18:44:40 +0000 (14:44 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Bugfix#75419 Fix clearing of default link during pg_close()
Sara Golemon [Mon, 23 Oct 2017 18:44:28 +0000 (14:44 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Bugfix#75419 Fix clearing of default link during pg_close()
Sara Golemon [Mon, 23 Oct 2017 18:41:44 +0000 (14:41 -0400)]
Bugfix#75419 Fix clearing of default link during pg_close()
Anatol Belski [Mon, 23 Oct 2017 17:18:25 +0000 (19:18 +0200)]
Update libmagic.patch
Anatol Belski [Mon, 23 Oct 2017 17:01:14 +0000 (19:01 +0200)]
Fail hard when re2c is not found or the version requirement not met
With 7.2, the binary SDK supplies the minimal required version, thus no
reason to fail later at the compilation time.
Anatol Belski [Mon, 23 Oct 2017 16:49:17 +0000 (18:49 +0200)]
Fix mismatching alloc
Derick Rethans [Mon, 23 Oct 2017 16:31:23 +0000 (17:31 +0100)]
Updated to version 2017.3 (2017c)
Derick Rethans [Mon, 23 Oct 2017 16:31:23 +0000 (17:31 +0100)]
Empty merge
Derick Rethans [Mon, 23 Oct 2017 16:31:21 +0000 (17:31 +0100)]
Updated to version 2017.3 (2017c)
Derick Rethans [Mon, 23 Oct 2017 16:31:21 +0000 (17:31 +0100)]
Empty merge
Derick Rethans [Mon, 23 Oct 2017 16:31:20 +0000 (17:31 +0100)]
Updated to version 2017.3 (2017c)
Anatol Belski [Mon, 23 Oct 2017 13:40:37 +0000 (15:40 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix memory leak
Anatol Belski [Mon, 23 Oct 2017 13:40:05 +0000 (15:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix memory leak
Anatol Belski [Mon, 23 Oct 2017 13:26:08 +0000 (15:26 +0200)]
Fix memory leak
Anatol Belski [Mon, 23 Oct 2017 10:02:41 +0000 (12:02 +0200)]
Fix uninitialized vars
Anatol Belski [Mon, 23 Oct 2017 05:14:14 +0000 (07:14 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Renaming cache folder is not a solution, too. Disable cache for now.
Revert "Rename build cache folder and separate sdk"
Anatol Belski [Mon, 23 Oct 2017 05:13:51 +0000 (07:13 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Renaming cache folder is not a solution, too. Disable cache for now.
Revert "Rename build cache folder and separate sdk"
Anatol Belski [Mon, 23 Oct 2017 05:13:00 +0000 (07:13 +0200)]
Renaming cache folder is not a solution, too. Disable cache for now.
Anatol Belski [Mon, 23 Oct 2017 05:12:33 +0000 (07:12 +0200)]
Revert "Rename build cache folder and separate sdk"
This reverts commit
58dd892156bc0a45a5b78316e8023fd2dc7cca4b .
Anatol Belski [Mon, 23 Oct 2017 05:09:52 +0000 (07:09 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Rename build cache folder and separate sdk
Revert "Invalidate the whole cache when .appveyor.yml was changed"
Anatol Belski [Mon, 23 Oct 2017 05:09:35 +0000 (07:09 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Rename build cache folder and separate sdk
Revert "Invalidate the whole cache when .appveyor.yml was changed"
Anatol Belski [Mon, 23 Oct 2017 05:08:45 +0000 (07:08 +0200)]
Rename build cache folder and separate sdk
Anatol Belski [Mon, 23 Oct 2017 05:05:48 +0000 (07:05 +0200)]
Revert "Invalidate the whole cache when .appveyor.yml was changed"
This reverts commit
25d40602cb618cfe989b1d048ef38618a243f6ff .
Anatol Belski [Mon, 23 Oct 2017 05:02:15 +0000 (07:02 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Invalidate the whole cache when .appveyor.yml was changed
Anatol Belski [Mon, 23 Oct 2017 05:01:43 +0000 (07:01 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Invalidate the whole cache when .appveyor.yml was changed
Anatol Belski [Mon, 23 Oct 2017 05:00:36 +0000 (07:00 +0200)]
Invalidate the whole cache when .appveyor.yml was changed
Jakub Zelenka [Sun, 22 Oct 2017 17:58:15 +0000 (18:58 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Sun, 22 Oct 2017 17:57:14 +0000 (18:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Sun, 22 Oct 2017 17:54:15 +0000 (18:54 +0100)]
Fix clean up for openssl_pkcs12_export_to_file_basic
Jelle van der Waa [Fri, 11 Aug 2017 23:46:34 +0000 (01:46 +0200)]
openssl: Fix openssl_pkcs12_export extracerts test
Fix the openssl_pkcs12_export testcase for extracerts, the 'extracerts'
option needs to be the key of the certificate value otherwise
openssl_pkcs12_export will ignore it.
Anatol Belski [Sat, 21 Oct 2017 15:24:42 +0000 (17:24 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
With ICU 58+, set the default restriction level to high