granicus.if.org Git

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Fabien Villepinte [Wed, 25 Oct 2017 08:42:13 +0000 (10:42 +0200)]

Fix typo in comments

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Wed, 25 Oct 2017 16:06:56 +0000 (18:06 +0200)]

Don't create plist files when using clang analyzer

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Fabien Villepinte [Wed, 25 Oct 2017 11:53:52 +0000 (13:53 +0200)]

Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Fabien Villepinte [Wed, 25 Oct 2017 10:06:54 +0000 (12:06 +0200)]

Fix bug #75437 Wrong reflection on imagewebp

commit | commitdiff | tree

Ferenc Kovacs [Wed, 25 Oct 2017 01:42:55 +0000 (03:42 +0200)]

Merge branch 'PHP-7.1' into PHP-7.2

commit | commitdiff | tree

Ferenc Kovacs [Wed, 25 Oct 2017 01:40:49 +0000 (03:40 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Ferenc Kovacs [Wed, 25 Oct 2017 01:39:34 +0000 (03:39 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Ferenc Kovacs [Wed, 25 Oct 2017 01:36:30 +0000 (03:36 +0200)]

commit | commitdiff | tree

Ferenc Kovacs [Wed, 25 Oct 2017 01:20:34 +0000 (03:20 +0200)]

Merge branch 'PHP-7.1' into PHP-7.2

commit | commitdiff | tree

Ferenc Kovacs [Wed, 25 Oct 2017 01:17:14 +0000 (03:17 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Ferenc Kovacs [Wed, 25 Oct 2017 01:14:51 +0000 (03:14 +0200)]

use trusty explicitly

commit | commitdiff | tree

Ferenc Kovacs [Wed, 25 Oct 2017 01:13:40 +0000 (03:13 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Rasmus Lerdorf [Sat, 10 Jan 2015 01:24:48 +0000 (17:24 -0800)]

These tests all assume that IPV6 is available.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sara Golemon [Tue, 24 Oct 2017 16:27:46 +0000 (16:27 +0000)]

Update NEWS for 7.2.0RC6

commit | commitdiff | tree

Sara Golemon [Tue, 24 Oct 2017 16:04:56 +0000 (16:04 +0000)]

Update NEWS for PHP 7.2.0RC5

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Tue, 24 Oct 2017 16:33:21 +0000 (18:33 +0200)]

Parametrize the expected value to avoid platform false positives

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sara Golemon [Tue, 24 Oct 2017 15:37:24 +0000 (11:37 -0400)]

Decref default_link when clearing

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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.

commit | commitdiff | tree

Derick Rethans [Tue, 24 Oct 2017 13:56:24 +0000 (14:56 +0100)]

Merge branch 'PHP-7.1' into PHP-7.2

commit | commitdiff | tree

Derick Rethans [Tue, 24 Oct 2017 13:55:48 +0000 (14:55 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Derick Rethans [Tue, 24 Oct 2017 13:55:13 +0000 (14:55 +0100)]

Update timezonemap.h, which needs to match the bundled TZ db

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Tue, 24 Oct 2017 12:58:01 +0000 (14:58 +0200)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Tue, 24 Oct 2017 12:22:25 +0000 (14:22 +0200)]

[ci skip] update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 24 Oct 2017 12:21:11 +0000 (14:21 +0200)]

[ci skip] update NEWS

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Tue, 24 Oct 2017 12:18:59 +0000 (14:18 +0200)]

[ci skip] update NEWS

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Tue, 24 Oct 2017 12:16:54 +0000 (14:16 +0200)]

[ci skip] update NEWS

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Tue, 24 Oct 2017 11:59:18 +0000 (13:59 +0200)]

Fixed bug #72535 arcfour encryption stream filter crashes php

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Tue, 24 Oct 2017 09:28:17 +0000 (11:28 +0200)]

Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sara Golemon [Mon, 23 Oct 2017 18:55:32 +0000 (14:55 -0400)]

NEWS entry for pg_close() fix

commit | commitdiff | tree

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()

commit | commitdiff | tree

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()

commit | commitdiff | tree

Sara Golemon [Mon, 23 Oct 2017 18:41:44 +0000 (14:41 -0400)]

Bugfix#75419 Fix clearing of default link during pg_close()

commit | commitdiff | tree

Anatol Belski [Mon, 23 Oct 2017 17:18:25 +0000 (19:18 +0200)]

Update libmagic.patch

commit | commitdiff | tree

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.

commit | commitdiff | tree

Anatol Belski [Mon, 23 Oct 2017 16:49:17 +0000 (18:49 +0200)]

Fix mismatching alloc

commit | commitdiff | tree

Derick Rethans [Mon, 23 Oct 2017 16:31:23 +0000 (17:31 +0100)]

Updated to version 2017.3 (2017c)

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom