]>
granicus.if.org Git - php/log
Joe Watkins [Fri, 27 Oct 2017 15:06:38 +0000 (16:06 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Fri, 27 Oct 2017 15:06:12 +0000 (16:06 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
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
Anatol Belski [Fri, 27 Oct 2017 14:23:19 +0000 (16:23 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 27 Oct 2017 14:19:42 +0000 (16:19 +0200)]
Skip test on PostgreSQL 10
Anatol Belski [Fri, 27 Oct 2017 13:04:54 +0000 (15:04 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Fri, 27 Oct 2017 13:04:29 +0000 (15:04 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
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
Anatol Belski [Fri, 27 Oct 2017 12:17:57 +0000 (14:17 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
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
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
Anatol Belski [Thu, 26 Oct 2017 19:26:03 +0000 (21:26 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
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
Dmitry Stogov [Thu, 26 Oct 2017 13:04:20 +0000 (16:04 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
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
Dmitry Stogov [Thu, 26 Oct 2017 11:12:33 +0000 (14:12 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
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
Dmitry Stogov [Thu, 26 Oct 2017 10:11:59 +0000 (13:11 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
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
Xinchen Hui [Thu, 26 Oct 2017 02:23:52 +0000 (10:23 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
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
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
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
Joe Watkins [Wed, 25 Oct 2017 19:59:51 +0000 (20:59 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
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
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
Christoph M. Becker [Wed, 25 Oct 2017 12:47:11 +0000 (14:47 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
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
Christoph M. Becker [Wed, 25 Oct 2017 10:56:25 +0000 (12:56 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
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
Anatol Belski [Tue, 24 Oct 2017 16:38:23 +0000 (18:38 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 24 Oct 2017 16:36:56 +0000 (18:36 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
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
Sara Golemon [Tue, 24 Oct 2017 15:38:17 +0000 (11:38 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
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
Christoph M. Becker [Tue, 24 Oct 2017 15:09:14 +0000 (17:09 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
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
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
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
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
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
Anatol Belski [Tue, 24 Oct 2017 12:05:18 +0000 (14:05 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 24 Oct 2017 12:04:08 +0000 (14:04 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
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
Anatol Belski [Tue, 24 Oct 2017 11:44:03 +0000 (13:44 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 24 Oct 2017 11:38:48 +0000 (13:38 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
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
Sara Golemon [Mon, 23 Oct 2017 18:56:10 +0000 (14:56 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
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
Sara Golemon [Mon, 23 Oct 2017 18:44:28 +0000 (14:44 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
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
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
projects / php / log