]> granicus.if.org Git - php/log
php
8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sun, 6 Nov 2016 16:57:29 +0000 (17:57 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  add missing RETURN_STRINGL_CHECK

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 6 Nov 2016 16:57:19 +0000 (17:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  add missing RETURN_STRINGL_CHECK

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Sun, 6 Nov 2016 16:56:14 +0000 (17:56 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  add missing RETURN_STRINGL_CHECK

8 years agoadd missing RETURN_STRINGL_CHECK
Anatol Belski [Sun, 6 Nov 2016 16:51:25 +0000 (17:51 +0100)]
add missing RETURN_STRINGL_CHECK

As RETVAL_STRINGL_CHECK is already there, this one is needed for
completion. One place in ext/bz2 is missing that, so it will likely
be useful for other possible fixes.

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sun, 6 Nov 2016 16:13:09 +0000 (17:13 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  update NEWS
  update NEWS

8 years agoupdate NEWS
Anatol Belski [Sun, 6 Nov 2016 16:12:46 +0000 (17:12 +0100)]
update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 6 Nov 2016 16:12:18 +0000 (17:12 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS

8 years agoupdate NEWS
Anatol Belski [Sun, 6 Nov 2016 16:11:19 +0000 (17:11 +0100)]
update NEWS

8 years agoIntroduce SKIP_IO_CAPTURE_TESTS group
Anatol Belski [Sat, 5 Nov 2016 23:04:53 +0000 (00:04 +0100)]
Introduce SKIP_IO_CAPTURE_TESTS group

to workaround false positives with some CI systems

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sat, 5 Nov 2016 22:11:42 +0000 (23:11 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 5 Nov 2016 22:10:19 +0000 (23:10 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoRemove this check as discussed with Anatol
Kalle Sommer Nielsen [Sat, 5 Nov 2016 22:08:08 +0000 (23:08 +0100)]
Remove this check as discussed with Anatol

8 years agoComplete the fix of bug #70172 for PHP 7
Nikita Popov [Sun, 23 Oct 2016 19:37:36 +0000 (21:37 +0200)]
Complete the fix of bug #70172 for PHP 7

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sat, 5 Nov 2016 21:55:04 +0000 (22:55 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix blob parameters binding. Fixes: #73087, #61183, #71494

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sat, 5 Nov 2016 21:54:44 +0000 (22:54 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix blob parameters binding. Fixes: #73087, #61183, #71494

8 years agoFix blob parameters binding. Fixes: #73087, #61183, #71494
Dorin Marcoci [Fri, 4 Nov 2016 11:15:01 +0000 (13:15 +0200)]
Fix blob parameters binding. Fixes: #73087, #61183, #71494

Adjusted formatting according to requirements

Test case for bug #73087

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Sat, 5 Nov 2016 21:00:58 +0000 (14:00 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  More int->size_t and string overflow fixes

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Sat, 5 Nov 2016 21:00:53 +0000 (14:00 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  More int->size_t and string overflow fixes

8 years agoMore int->size_t and string overflow fixes
Stanislav Malyshev [Sat, 5 Nov 2016 20:20:24 +0000 (13:20 -0700)]
More int->size_t and string overflow fixes

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Sat, 5 Nov 2016 20:59:56 +0000 (13:59 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  More int->size_t and string overflow fixes

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Sat, 5 Nov 2016 20:59:35 +0000 (13:59 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  More int->size_t and string overflow fixes

8 years agoMore int->size_t and string overflow fixes
Stanislav Malyshev [Sat, 5 Nov 2016 20:20:24 +0000 (13:20 -0700)]
More int->size_t and string overflow fixes

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Fri, 4 Nov 2016 17:44:14 +0000 (18:44 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  rename the tmp ini file, to keep it consistent with m4 variant

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 4 Nov 2016 17:43:56 +0000 (18:43 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  rename the tmp ini file, to keep it consistent with m4 variant

8 years agorename the tmp ini file, to keep it consistent with m4 variant
Anatol Belski [Fri, 4 Nov 2016 17:42:36 +0000 (18:42 +0100)]
rename the tmp ini file, to keep it consistent with m4 variant

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Fri, 4 Nov 2016 17:39:23 +0000 (18:39 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix dir separator in test

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 4 Nov 2016 17:39:09 +0000 (18:39 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix dir separator in test

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Fri, 4 Nov 2016 17:38:22 +0000 (18:38 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix dir separator in test

8 years agofix dir separator in test
Anatol Belski [Fri, 4 Nov 2016 17:29:54 +0000 (18:29 +0100)]
fix dir separator in test

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Fri, 4 Nov 2016 12:11:56 +0000 (13:11 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix dir separator

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 4 Nov 2016 12:11:29 +0000 (13:11 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix dir separator

8 years agofix dir separator
Anatol Belski [Fri, 4 Nov 2016 12:10:52 +0000 (13:10 +0100)]
fix dir separator

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Fri, 4 Nov 2016 05:54:12 +0000 (22:54 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Add length check for bzcompress too - fix for bug #73356
  More string length checks & fixes
  More string length checks & fixes

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Fri, 4 Nov 2016 05:53:05 +0000 (22:53 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Add length check for bzcompress too - fix for bug #73356
  More string length checks & fixes
  More string length checks & fixes

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Fri, 4 Nov 2016 05:12:23 +0000 (22:12 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Add length check for bzcompress too - fix for bug #73356

8 years agoAdd length check for bzcompress too - fix for bug #73356
Stanislav Malyshev [Fri, 4 Nov 2016 05:10:22 +0000 (22:10 -0700)]
Add length check for bzcompress too - fix for bug #73356

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Fri, 4 Nov 2016 05:05:25 +0000 (22:05 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  More string length checks & fixes

8 years agoMore string length checks & fixes
Stanislav Malyshev [Fri, 4 Nov 2016 03:36:52 +0000 (20:36 -0700)]
More string length checks & fixes

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Fri, 4 Nov 2016 03:45:13 +0000 (20:45 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  More string length checks & fixes

8 years agoMore string length checks & fixes
Stanislav Malyshev [Fri, 4 Nov 2016 03:36:52 +0000 (20:36 -0700)]
More string length checks & fixes

8 years agoUpdated to version 2016.9 (2016i)
Derick Rethans [Thu, 3 Nov 2016 17:57:33 +0000 (13:57 -0400)]
Updated to version 2016.9 (2016i)

8 years agoEmpty merge
Derick Rethans [Thu, 3 Nov 2016 17:57:33 +0000 (13:57 -0400)]
Empty merge

8 years agoUpdated to version 2016.9 (2016i)
Derick Rethans [Thu, 3 Nov 2016 17:57:32 +0000 (13:57 -0400)]
Updated to version 2016.9 (2016i)

8 years agoEmpty merge
Derick Rethans [Thu, 3 Nov 2016 17:57:32 +0000 (13:57 -0400)]
Empty merge

8 years agoUpdated to version 2016.9 (2016i)
Derick Rethans [Thu, 3 Nov 2016 17:57:31 +0000 (13:57 -0400)]
Updated to version 2016.9 (2016i)

8 years agoEmpty merge
Derick Rethans [Thu, 3 Nov 2016 17:57:30 +0000 (13:57 -0400)]
Empty merge

8 years agoUpdated to version 2016.9 (2016i)
Derick Rethans [Thu, 3 Nov 2016 17:57:28 +0000 (13:57 -0400)]
Updated to version 2016.9 (2016i)

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Wed, 2 Nov 2016 04:12:25 +0000 (12:12 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Update NEWS
  Fixed bug #73423 (Reproducible crash with GDB backtrace)

8 years agoUpdate NEWS
Xinchen Hui [Wed, 2 Nov 2016 04:12:12 +0000 (12:12 +0800)]
Update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Wed, 2 Nov 2016 04:11:48 +0000 (12:11 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73423 (Reproducible crash with GDB backtrace)

8 years agoFixed bug #73423 (Reproducible crash with GDB backtrace)
Xinchen Hui [Wed, 2 Nov 2016 04:11:30 +0000 (12:11 +0800)]
Fixed bug #73423 (Reproducible crash with GDB backtrace)

8 years agoMerge branch 'PHP-7.1'
Dmitry Stogov [Tue, 1 Nov 2016 19:58:59 +0000 (22:58 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Intriduced ZEND_ACC_INHERITED class flag. It's going to be helpful for static optimisations, when "parent" is not known yet.

8 years agoIntriduced ZEND_ACC_INHERITED class flag.
Dmitry Stogov [Tue, 1 Nov 2016 19:56:25 +0000 (22:56 +0300)]
Intriduced ZEND_ACC_INHERITED class flag.
It's going to be helpful for static optimisations, when "parent" is not known yet.

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Tue, 1 Nov 2016 19:30:18 +0000 (20:30 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 1 Nov 2016 19:29:11 +0000 (20:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Tue, 1 Nov 2016 19:24:10 +0000 (20:24 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #73436: Setting allow_url_fopen to Off makes several tests fail
Christoph M. Becker [Tue, 1 Nov 2016 19:13:53 +0000 (20:13 +0100)]
Fix #73436: Setting allow_url_fopen to Off makes several tests fail

We make sure that these tests run with allow_url_fopen=1.

8 years agoMerge branch 'PHP-7.1'
Sara Golemon [Tue, 1 Nov 2016 16:37:02 +0000 (09:37 -0700)]
Merge branch 'PHP-7.1'

This commit already landed on master as b041bebb
but I didn't realize we needed it on 7.1 as well.
Cherry-picking, then merging the pick to keep the repo happy.

* PHP-7.1:
  Change Big Endian backup implementations to use signed indexes

8 years agoChange Big Endian backup implementations to use signed indexes
Sara Golemon [Wed, 12 Oct 2016 03:43:02 +0000 (20:43 -0700)]
Change Big Endian backup implementations to use signed indexes

load64() counted down from 7..0, but the decrement turned 0 into 255.
This means the loop would never terminate on Big Endian systems.

Just use signed char integers since we're only dealing with values from 0..7 anyway.

Closes https://bugs.php.net/bug.php?id=73282

8 years agoMerge branch 'PHP-7.1'
Dmitry Stogov [Tue, 1 Nov 2016 16:04:23 +0000 (19:04 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed reference-counter inference

8 years agoFixed reference-counter inference
Dmitry Stogov [Tue, 1 Nov 2016 16:04:10 +0000 (19:04 +0300)]
Fixed reference-counter inference

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Tue, 1 Nov 2016 13:02:49 +0000 (14:02 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  add run target

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 1 Nov 2016 13:02:04 +0000 (14:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  add run target

8 years agoadd run target
Anatol Belski [Tue, 1 Nov 2016 12:50:46 +0000 (13:50 +0100)]
add run target

With this it is possible to run some code with the currently compiled
PHP and all the required environment included.

8 years agoMerge branch 'PHP-7.1'
Dmitry Stogov [Mon, 31 Oct 2016 21:18:34 +0000 (00:18 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed reference-counter inference

8 years agoFixed reference-counter inference
Dmitry Stogov [Mon, 31 Oct 2016 21:18:12 +0000 (00:18 +0300)]
Fixed reference-counter inference

8 years agoMerge branch 'PHP-7.1'
Dmitry Stogov [Mon, 31 Oct 2016 18:39:50 +0000 (21:39 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  typo

8 years agotypo
Dmitry Stogov [Mon, 31 Oct 2016 18:39:34 +0000 (21:39 +0300)]
typo

8 years agoUse more accurate types to avoid compiler warnings
Adam Baratz [Mon, 31 Oct 2016 17:15:03 +0000 (13:15 -0400)]
Use more accurate types to avoid compiler warnings

8 years agoMerge branch 'PHP-7.1'
Dmitry Stogov [Mon, 31 Oct 2016 16:51:50 +0000 (19:51 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed reference-counter inference

8 years agoFixed reference-counter inference
Dmitry Stogov [Mon, 31 Oct 2016 16:51:19 +0000 (19:51 +0300)]
Fixed reference-counter inference

8 years agoFix comment style
Adam Baratz [Mon, 31 Oct 2016 16:39:22 +0000 (12:39 -0400)]
Fix comment style

8 years agoMerge branch 'PHP-7.1'
Derick Rethans [Mon, 31 Oct 2016 10:43:54 +0000 (10:43 +0000)]
Merge branch 'PHP-7.1'

8 years ago- Fixed bug #73426: createFromFormat with 'z' format char results in incorrect time.
Derick Rethans [Mon, 31 Oct 2016 10:43:33 +0000 (10:43 +0000)]
- Fixed bug #73426: createFromFormat with 'z' format char results in incorrect time.

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Mon, 31 Oct 2016 00:12:21 +0000 (17:12 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Typo

8 years agoMerge branch 'pull-request/2179' into PHP-7.1
Stanislav Malyshev [Mon, 31 Oct 2016 00:11:18 +0000 (17:11 -0700)]
Merge branch 'pull-request/2179' into PHP-7.1

* pull-request/2179:
  Typo

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sun, 30 Oct 2016 20:27:54 +0000 (21:27 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  prefer symbols read from the bin to those matching the naming scheme

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 30 Oct 2016 20:27:35 +0000 (21:27 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  prefer symbols read from the bin to those matching the naming scheme

8 years agoprefer symbols read from the bin to those matching the naming scheme
Anatol Belski [Sun, 30 Oct 2016 20:22:24 +0000 (21:22 +0100)]
prefer symbols read from the bin to those matching the naming scheme

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sun, 30 Oct 2016 20:14:21 +0000 (21:14 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  remove debug out

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 30 Oct 2016 20:13:55 +0000 (21:13 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  remove debug out

8 years agoremove debug out
Anatol Belski [Sun, 30 Oct 2016 20:12:50 +0000 (21:12 +0100)]
remove debug out

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sun, 30 Oct 2016 20:09:31 +0000 (21:09 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix link with deps pdb availability

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 30 Oct 2016 20:07:20 +0000 (21:07 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix link with deps pdb availability

8 years agofix link with deps pdb availability
Anatol Belski [Sun, 30 Oct 2016 19:55:38 +0000 (20:55 +0100)]
fix link with deps pdb availability

Unlike debugger, linker is currently not able to read the pdb files,
even if they're put onto path. As result, a lot of LNK4099 warnings
and in some cases also missing debug information in the end binaries.
This is solved by copying the relevant pdb into the build dir, which
then can be picked up on link time. This also leads to the inclusion
of those pdb files into the debug package, so symbols won't be missed
in crash dumps. As otherwise the debug info for dependencies is only
contained in the dependency packages.

8 years agoMerge branch 'PHP-7.1'
Jakub Zelenka [Sun, 30 Oct 2016 19:13:21 +0000 (19:13 +0000)]
Merge branch 'PHP-7.1'

8 years agoDefine X509_get_signature_nid for LibreSSL
Jakub Zelenka [Sun, 30 Oct 2016 19:12:24 +0000 (19:12 +0000)]
Define X509_get_signature_nid for LibreSSL

It should hopefully fix the LibreSSL build. Thanks to Alice Wonder!

8 years agoMerge branch 'PHP-7.1'
Jakub Zelenka [Sun, 30 Oct 2016 19:02:46 +0000 (19:02 +0000)]
Merge branch 'PHP-7.1'

8 years agoFix EC_KEY memory leaks
Jakub Zelenka [Sun, 30 Oct 2016 18:58:11 +0000 (18:58 +0000)]
Fix EC_KEY memory leaks

It was caused by using of EVP_PKEY_get1_EC_KEY which increments an EC_KEY
reference. The fix it we simply use EVP_PKEY_get0_EC_KEY.

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sun, 30 Oct 2016 14:30:33 +0000 (15:30 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  use rather the makefile var
  rename the env setting target and reuse it for build-snap

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 30 Oct 2016 14:30:17 +0000 (15:30 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  use rather the makefile var
  rename the env setting target and reuse it for build-snap

8 years agouse rather the makefile var
Anatol Belski [Sun, 30 Oct 2016 14:28:56 +0000 (15:28 +0100)]
use rather the makefile var

8 years agorename the env setting target and reuse it for build-snap
Anatol Belski [Sun, 30 Oct 2016 14:22:45 +0000 (15:22 +0100)]
rename the env setting target and reuse it for build-snap

8 years agoMerge branch 'PHP-7.1'
Jakub Zelenka [Sun, 30 Oct 2016 13:22:45 +0000 (13:22 +0000)]
Merge branch 'PHP-7.1'

8 years agoIntroduce json encoder to fix globals related issues
Jakub Zelenka [Sun, 30 Oct 2016 13:20:10 +0000 (13:20 +0000)]
Introduce json encoder to fix globals related issues

It fixes bugs #66025 and #73254 by replacing globals with
a passed structure holding depth and error code. In addition
it fixes #72069 in a more generic way.

8 years agoMerge branch 'PHP-7.1'
Bob Weinand [Sat, 29 Oct 2016 16:50:36 +0000 (18:50 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sat, 29 Oct 2016 16:50:06 +0000 (18:50 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFixed build failure introduced by PR #2158
Bob Weinand [Sat, 29 Oct 2016 16:49:38 +0000 (18:49 +0200)]
Fixed build failure introduced by PR #2158

Note: AC_TRY_LINK interprets the source as part of a main function, ending up with int main() { /* ... */ int main() { /* ... */ } ; return 0; } here - Using AC_LINK_IFELSE with AC_LANG_SOURCE directly instead.

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sat, 29 Oct 2016 15:58:01 +0000 (17:58 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix condition

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sat, 29 Oct 2016 15:57:33 +0000 (17:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix condition