]> granicus.if.org Git - php/log
php
9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Wed, 24 Feb 2016 16:44:33 +0000 (17:44 +0100)]
Merge branch 'PHP-7.0'

9 years agoFix leak on assignment to illegal AO offset
Nikita Popov [Wed, 24 Feb 2016 16:39:16 +0000 (17:39 +0100)]
Fix leak on assignment to illegal AO offset

9 years agoDon't use ht applyCount for AO sorting protection
Nikita Popov [Wed, 24 Feb 2016 16:18:07 +0000 (17:18 +0100)]
Don't use ht applyCount for AO sorting protection

Instead use the AOs own applyCount that just got freed up. Using the
apply count of the HashTable has various side effects, e.g. preventing
the ArrayObject from being dumped.

9 years agoRemove recursion checks from AO get_properties
Nikita Popov [Wed, 24 Feb 2016 16:10:28 +0000 (17:10 +0100)]
Remove recursion checks from AO get_properties

These are pointless, there is no recursion (of that kind) happening
there.

9 years agoFix "Call to member function on unknown"
Nikita Popov [Wed, 24 Feb 2016 16:00:04 +0000 (17:00 +0100)]
Fix "Call to member function on unknown"

Should be "on null".

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Wed, 24 Feb 2016 13:09:14 +0000 (14:09 +0100)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #71470
Nikita Popov [Wed, 24 Feb 2016 13:07:06 +0000 (14:07 +0100)]
Fixed bug #71470

Don't report hashtable iterator leaks on unclean shutdown, those
are expected.

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Wed, 24 Feb 2016 11:30:00 +0000 (12:30 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix NEWS

9 years agofix NEWS
Anatol Belski [Wed, 24 Feb 2016 11:29:23 +0000 (12:29 +0100)]
fix NEWS

9 years agoMerge branch 'PHP-7.0'
Remi Collet [Wed, 24 Feb 2016 11:26:37 +0000 (12:26 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix NEWS

9 years agofix NEWS
Remi Collet [Wed, 24 Feb 2016 11:26:25 +0000 (12:26 +0100)]
fix NEWS

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Wed, 24 Feb 2016 11:07:06 +0000 (12:07 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update NEWS
  Port patch and test for bug #47803 to 7.0

9 years agoupdate NEWS
Anatol Belski [Wed, 24 Feb 2016 11:06:35 +0000 (12:06 +0100)]
update NEWS

9 years agoPort patch and test for bug #47803 to 7.0
Anatol Belski [Wed, 24 Feb 2016 11:00:26 +0000 (12:00 +0100)]
Port patch and test for bug #47803 to 7.0

See ff115e285ab5192f9e12a43d5dc202d88b01f1ea

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Wed, 24 Feb 2016 10:57:46 +0000 (11:57 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update NEWS
  add test for bug #47803
  Fixed bug #47803

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Wed, 24 Feb 2016 10:57:15 +0000 (11:57 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS
  add test for bug #47803
  Fixed bug #47803

9 years agoupdate NEWS
Anatol Belski [Wed, 24 Feb 2016 10:56:12 +0000 (11:56 +0100)]
update NEWS

9 years agoadd test for bug #47803
Anatol Belski [Wed, 24 Feb 2016 10:49:02 +0000 (11:49 +0100)]
add test for bug #47803

9 years agoFixed bug #47803
Anatol Belski [Wed, 24 Feb 2016 10:40:35 +0000 (11:40 +0100)]
Fixed bug #47803

Executing prepared statements is succesfull only for the first two statements

The reworked patch descends to the bug #69526 which is fixed by
this as well. The broken logic in the current code was, that
SQLDescribeParam was executed in odbc_execute every time. This piece
is now moved into odbc_prepare and the results are carried on in an
additional structure.

Since the ext/odbc headers are not being currently installed and the
corresponding structs like odbc_result are not used outside ext/odbc,
the binary compatibility persists. Executing SQLDescribeParam only once
in odbc_prepare is also an optimization as the filds usually won't
change that fast and thus requestind the descriptions on every
execution is not required.

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Wed, 24 Feb 2016 08:05:58 +0000 (11:05 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #71535 (Integer overflow in zend_mm_alloc_heap())

9 years agoFixed bug #71535 (Integer overflow in zend_mm_alloc_heap())
Dmitry Stogov [Wed, 24 Feb 2016 08:04:48 +0000 (11:04 +0300)]
Fixed bug #71535 (Integer overflow in zend_mm_alloc_heap())

9 years agofix callback signature compat
Anatol Belski [Tue, 23 Feb 2016 17:18:34 +0000 (18:18 +0100)]
fix callback signature compat

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 23 Feb 2016 13:39:49 +0000 (14:39 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  add test for bug #71171

9 years agoadd test for bug #71171
Anatol Belski [Tue, 23 Feb 2016 13:39:17 +0000 (14:39 +0100)]
add test for bug #71171

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 23 Feb 2016 13:22:39 +0000 (14:22 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  make ext/odbc test credentials configurable

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Tue, 23 Feb 2016 13:22:06 +0000 (14:22 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  make ext/odbc test credentials configurable

9 years agomake ext/odbc test credentials configurable
Anatol Belski [Tue, 23 Feb 2016 13:21:04 +0000 (14:21 +0100)]
make ext/odbc test credentials configurable

9 years agoMove free_chunk and resize_chunk into memory pool
Nikita Popov [Mon, 22 Feb 2016 17:40:45 +0000 (18:40 +0100)]
Move free_chunk and resize_chunk into memory pool

Drops 24 bytes from each chunk. For the example in bug #71468 it
reduces memory usage by 30%.

9 years agoDrop mysqlnd mempool refcount
Nikita Popov [Mon, 22 Feb 2016 16:33:41 +0000 (17:33 +0100)]
Drop mysqlnd mempool refcount

This member was no longer used.

Also fix handling of from_pool in resize_chunk. It was setting
pool to NULL instead of from_pool to FALSE.

9 years agoMerge branch 'PHP-7.0'
Remi Collet [Mon, 22 Feb 2016 17:45:30 +0000 (18:45 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  missing include

9 years agomissing include
Remi Collet [Mon, 22 Feb 2016 17:45:18 +0000 (18:45 +0100)]
missing include

9 years agoMerge branch 'PHP-7.0'
Remi Collet [Mon, 22 Feb 2016 17:18:43 +0000 (18:18 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update bundled libzip to 1.1.2

9 years agoupdate bundled libzip to 1.1.2
Remi Collet [Mon, 22 Feb 2016 17:18:30 +0000 (18:18 +0100)]
update bundled libzip to 1.1.2

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Mon, 22 Feb 2016 12:11:24 +0000 (13:11 +0100)]
Merge branch 'PHP-7.0'

9 years agoRemove check_std_props arg from get_hash_table
Nikita Popov [Mon, 22 Feb 2016 12:09:54 +0000 (13:09 +0100)]
Remove check_std_props arg from get_hash_table

get_properties() is the only place using it, so handle it only
there.

9 years agoDon't recurse into USE_OTHER checking STD_PROP_LIST
Nikita Popov [Mon, 22 Feb 2016 12:04:19 +0000 (13:04 +0100)]
Don't recurse into USE_OTHER checking STD_PROP_LIST

If STD_PROP_LIST is explicitly disabled in the constructor, it
should really be disabled.

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Mon, 22 Feb 2016 11:40:30 +0000 (12:40 +0100)]
Merge branch 'PHP-7.0'

9 years agoFix typo in previous commit
Nikita Popov [Mon, 22 Feb 2016 11:39:07 +0000 (12:39 +0100)]
Fix typo in previous commit

Happened to be correct because array is the first member, but
definitely not what I wanted...

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Mon, 22 Feb 2016 11:35:09 +0000 (12:35 +0100)]
Merge branch 'PHP-7.0'

9 years agoFix ArrayObject clone for certain USE_OTHER cases
Nikita Popov [Mon, 22 Feb 2016 11:33:41 +0000 (12:33 +0100)]
Fix ArrayObject clone for certain USE_OTHER cases

We can't simply use HASH_OF, need to use the usual hash table
getter.

9 years agoUse USE_OTHER for ArrayIterator cloning
Nikita Popov [Mon, 22 Feb 2016 11:19:03 +0000 (12:19 +0100)]
Use USE_OTHER for ArrayIterator cloning

intern->array should never be an array with refcount 2.

9 years agoMerge branch 'PHP-7.0'
Remi Collet [Mon, 22 Feb 2016 08:26:48 +0000 (09:26 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  cleanup $Id

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Remi Collet [Mon, 22 Feb 2016 08:26:14 +0000 (09:26 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  cleanup $Id

9 years agocleanup $Id
Remi Collet [Mon, 22 Feb 2016 08:26:00 +0000 (09:26 +0100)]
cleanup $Id

9 years agoMerge branch 'PHP-7.0'
Stanislav Malyshev [Mon, 22 Feb 2016 01:11:51 +0000 (17:11 -0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix bug #71629: sync php_url_decode definition

9 years agoFix bug #71629: sync php_url_decode definition
Stanislav Malyshev [Mon, 22 Feb 2016 01:02:55 +0000 (17:02 -0800)]
Fix bug #71629: sync php_url_decode definition

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Sun, 21 Feb 2016 12:01:28 +0000 (13:01 +0100)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #71617
Nikita Popov [Sun, 21 Feb 2016 11:59:57 +0000 (12:59 +0100)]
Fixed bug #71617

9 years agoMerge branch 'PHP-7.0'
Remi Collet [Sat, 20 Feb 2016 16:43:09 +0000 (17:43 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  cleanup, ext/json is simple PHP now

9 years agocleanup, ext/json is simple PHP now
Remi Collet [Sat, 20 Feb 2016 16:42:26 +0000 (17:42 +0100)]
cleanup, ext/json is simple PHP now

9 years agoAdded comments about special functions
Dmitry Stogov [Fri, 19 Feb 2016 12:44:11 +0000 (15:44 +0300)]
Added comments about special functions

9 years agoEvaluate ord(<string>), chr(<int>) and defined(<persistent-constant>) at compile...
Dmitry Stogov [Fri, 19 Feb 2016 11:14:27 +0000 (14:14 +0300)]
Evaluate ord(<string>), chr(<int>) and defined(<persistent-constant>) at compile time

9 years agoMerge branch 'PHP-7.0'
Andrea Faulds [Thu, 18 Feb 2016 22:37:51 +0000 (22:37 +0000)]
Merge branch 'PHP-7.0'

9 years agoTest that mt_rand() consistently produces the wrong results
Andrea Faulds [Thu, 18 Feb 2016 22:35:44 +0000 (22:35 +0000)]
Test that mt_rand() consistently produces the wrong results

See 6f6bd8ce531636134efd5f669a4e8373fb2e9e51 and its revert,
a0724d30817600540946b41e40f4cfc2a0c30f80.

9 years agoFixed incorrrect merge (regenrate zend_vm_execute.h)
Dmitry Stogov [Thu, 18 Feb 2016 21:09:17 +0000 (00:09 +0300)]
Fixed incorrrect merge (regenrate zend_vm_execute.h)

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Thu, 18 Feb 2016 20:18:56 +0000 (23:18 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string

9 years agoSet proper type flags (REFCOUNTED and COPYABLE) according to interned or regular...
Dmitry Stogov [Thu, 18 Feb 2016 20:15:38 +0000 (23:15 +0300)]
Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Thu, 18 Feb 2016 20:15:28 +0000 (23:15 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Better fix for bug #71622 (Strings used in pass-as-reference cannot be used to invoke C::$callable())

9 years agoBetter fix for bug #71622 (Strings used in pass-as-reference cannot be used to invoke...
Dmitry Stogov [Thu, 18 Feb 2016 20:14:46 +0000 (23:14 +0300)]
Better fix for bug #71622 (Strings used in pass-as-reference cannot be used to invoke C::$callable())

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 18 Feb 2016 18:52:04 +0000 (19:52 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  refix broken 20ca0b89bda3822001474514ab9dffd62c559f01

9 years agorefix broken 20ca0b89bda3822001474514ab9dffd62c559f01
Anatol Belski [Thu, 18 Feb 2016 18:51:18 +0000 (19:51 +0100)]
refix broken 20ca0b89bda3822001474514ab9dffd62c559f01

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 18 Feb 2016 18:45:22 +0000 (19:45 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix typo

9 years agoMerge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
Anatol Belski [Thu, 18 Feb 2016 18:44:58 +0000 (19:44 +0100)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 18 Feb 2016 18:43:48 +0000 (19:43 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update NEWS
  update NEWS

9 years agoupdate NEWS
Anatol Belski [Thu, 18 Feb 2016 18:43:27 +0000 (19:43 +0100)]
update NEWS

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Thu, 18 Feb 2016 18:43:03 +0000 (19:43 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS

9 years agoupdate NEWS
Anatol Belski [Thu, 18 Feb 2016 18:42:18 +0000 (19:42 +0100)]
update NEWS

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 18 Feb 2016 18:40:39 +0000 (19:40 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  add test for bug #71625, 7 variant
  add test for bug #71625

9 years agoadd test for bug #71625, 7 variant
Anatol Belski [Thu, 18 Feb 2016 18:40:17 +0000 (19:40 +0100)]
add test for bug #71625, 7 variant

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Thu, 18 Feb 2016 18:39:30 +0000 (19:39 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  add test for bug #71625

9 years agoadd test for bug #71625
Anatol Belski [Thu, 18 Feb 2016 18:38:39 +0000 (19:38 +0100)]
add test for bug #71625

9 years agoFix typo
Rasmus Lerdorf [Thu, 18 Feb 2016 18:35:40 +0000 (10:35 -0800)]
Fix typo

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 18 Feb 2016 18:34:22 +0000 (19:34 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #71625 Crash in php7.dll with bad phar filename

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Thu, 18 Feb 2016 18:33:27 +0000 (19:33 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed bug #71625 Crash in php7.dll with bad phar filename

9 years agoFixed bug #71625 Crash in php7.dll with bad phar filename
Anatol Belski [Thu, 18 Feb 2016 18:32:08 +0000 (19:32 +0100)]
Fixed bug #71625 Crash in php7.dll with bad phar filename

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 18 Feb 2016 18:18:18 +0000 (19:18 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update NEWS
  update NEWS

9 years agoupdate NEWS
Anatol Belski [Thu, 18 Feb 2016 18:17:54 +0000 (19:17 +0100)]
update NEWS

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Thu, 18 Feb 2016 18:17:22 +0000 (19:17 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS

9 years agoupdate NEWS
Anatol Belski [Thu, 18 Feb 2016 18:16:39 +0000 (19:16 +0100)]
update NEWS

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 18 Feb 2016 18:14:37 +0000 (19:14 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Bug #71596 Segmentation fault on ZTS with date function (setlocale)

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Thu, 18 Feb 2016 18:14:22 +0000 (19:14 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Bug #71596 Segmentation fault on ZTS with date function (setlocale)

9 years agoBug #71596 Segmentation fault on ZTS with date function (setlocale)
Anatol Belski [Thu, 18 Feb 2016 18:13:07 +0000 (19:13 +0100)]
Bug #71596 Segmentation fault on ZTS with date function (setlocale)

9 years agoMerge branch 'PHP-7.0'
Bob Weinand [Thu, 18 Feb 2016 12:54:19 +0000 (13:54 +0100)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #71622 (Strings used in pass-as-reference cannot be used to invoke C::...
Bob Weinand [Thu, 18 Feb 2016 12:53:15 +0000 (13:53 +0100)]
Fixed bug #71622 (Strings used in pass-as-reference cannot be used to invoke C::$callable())

9 years agoMerge branch 'PHP-7.0'
Leigh [Thu, 18 Feb 2016 11:25:15 +0000 (11:25 +0000)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Revert "Fix #71152: mt_rand() returns the different values from original mt19937ar.c"

`mt_rand()` is seedable with `mt_srand()` which means it can be used to (re)produce specific streams of numbers. All code (no matter how few instances that may be) that previously depended on this behaviour will no longer produce the same results.

This kind of change needs to be discussed before being committed

9 years agoRevert "Fix #71152: mt_rand() returns the different values from original mt19937ar.c"
Leigh [Thu, 18 Feb 2016 11:09:01 +0000 (11:09 +0000)]
Revert "Fix #71152: mt_rand() returns the different values from original mt19937ar.c"

This reverts commit 6f6bd8ce531636134efd5f669a4e8373fb2e9e51.

`mt_rand()` is seedable with `mt_srand()` which means it can be used to (re)produce specific streams of numbers. All code (no matter how few instances that may be) that previously depended on this behaviour will no longer produce the same results.

This kind of change needs to be discussed before being committed.

9 years agoMerge branch 'PHP-7.0'
Lior Kaplan [Thu, 18 Feb 2016 09:25:10 +0000 (11:25 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Sort 7.0.4 extensions by name, merge FPM entries

9 years agoSort 7.0.4 extensions by name, merge FPM entries
Lior Kaplan [Thu, 18 Feb 2016 09:24:03 +0000 (11:24 +0200)]
Sort 7.0.4 extensions by name, merge FPM entries

9 years agoMerge branch 'PHP-7.0'
Stanislav Malyshev [Thu, 18 Feb 2016 06:44:50 +0000 (22:44 -0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Remove TSRMLS_* from code, they are not used anymore

9 years agoRemove TSRMLS_* from code, they are not used anymore
Stanislav Malyshev [Thu, 18 Feb 2016 06:44:05 +0000 (22:44 -0800)]
Remove TSRMLS_* from code, they are not used anymore

9 years agoMerge branch 'PHP-7.0'
Stanislav Malyshev [Thu, 18 Feb 2016 06:37:03 +0000 (22:37 -0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Remove TSRMLS_* from docs as it's not used anymore

Conflicts:
ext/intl/ERROR.CONVENTIONS

9 years agoRemove TSRMLS_* from docs as it's not used anymore
Stanislav Malyshev [Thu, 18 Feb 2016 06:36:01 +0000 (22:36 -0800)]
Remove TSRMLS_* from docs as it's not used anymore

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 18 Feb 2016 06:13:14 +0000 (07:13 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix ts buld

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Thu, 18 Feb 2016 06:12:42 +0000 (07:12 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix ts buld

9 years agofix ts buld
Anatol Belski [Thu, 18 Feb 2016 06:11:36 +0000 (07:11 +0100)]
fix ts buld

9 years agoMissed semicolon
Xinchen Hui [Thu, 18 Feb 2016 04:04:27 +0000 (12:04 +0800)]
Missed semicolon

9 years agoMerge branch 'PHP-7.0'
Ferenc Kovacs [Wed, 17 Feb 2016 23:32:48 +0000 (00:32 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  5.6.20 is next

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 17 Feb 2016 23:32:15 +0000 (00:32 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  5.6.20 is next

9 years ago5.6.20 is next
Ferenc Kovacs [Wed, 17 Feb 2016 23:31:18 +0000 (00:31 +0100)]
5.6.20 is next

9 years agoMerge branch 'PHP-7.0'
Bob Weinand [Wed, 17 Feb 2016 19:28:07 +0000 (20:28 +0100)]
Merge branch 'PHP-7.0'