]> granicus.if.org Git - php/log
php
8 years agoMerge branch 'PHP-7.0'
Andrea Faulds [Thu, 18 Feb 2016 22:37:51 +0000 (22:37 +0000)]
Merge branch 'PHP-7.0'

8 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.

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

8 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

8 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

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

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

8 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

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

8 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

8 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

8 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

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

8 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

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

8 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

8 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

8 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

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

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

8 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

8 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

8 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

8 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

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

8 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

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

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

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

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

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

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

8 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

8 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.

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

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

8 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

8 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

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

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

8 years agoFix crash when advancing inside an internal function
Bob Weinand [Wed, 17 Feb 2016 19:26:47 +0000 (20:26 +0100)]
Fix crash when advancing inside an internal function

This just happened in the "double ctrl+c" mode, when we halted inside an internal function; there was some code assuming a proper op_array

8 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Wed, 17 Feb 2016 10:59:20 +0000 (13:59 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed process synchronisation problem, that may cause crashes after opcache restart

8 years agoFixed process synchronisation problem, that may cause crashes after opcache restart
Dmitry Stogov [Wed, 17 Feb 2016 10:58:05 +0000 (13:58 +0300)]
Fixed process synchronisation problem, that may cause crashes after opcache restart

8 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Wed, 17 Feb 2016 03:33:44 +0000 (11:33 +0800)]
Merge branch 'PHP-7.0'

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

Conflicts:
ext/standard/rand.c

8 years agoFix #71152: mt_rand() returns the different values from original mt19937ar.c
kusano [Thu, 17 Dec 2015 10:26:38 +0000 (19:26 +0900)]
Fix #71152: mt_rand() returns the different values from original mt19937ar.c

8 years agoMerge branch 'master' into fix-mt_rand
kusano [Tue, 16 Feb 2016 16:00:58 +0000 (01:00 +0900)]
Merge branch 'master' into fix-mt_rand

Conflicts:
ext/standard/rand.c

8 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 16 Feb 2016 08:15:25 +0000 (09:15 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  prepare next

8 years agoprepare next
Anatol Belski [Tue, 16 Feb 2016 08:14:05 +0000 (09:14 +0100)]
prepare next

8 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 16 Feb 2016 07:29:54 +0000 (08:29 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  yet two test fixes in openssl in 5.6

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Tue, 16 Feb 2016 07:29:37 +0000 (08:29 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  yet two test fixes in openssl in 5.6

8 years agoyet two test fixes in openssl in 5.6
Anatol Belski [Tue, 16 Feb 2016 07:28:10 +0000 (08:28 +0100)]
yet two test fixes in openssl in 5.6

8 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 16 Feb 2016 07:06:57 +0000 (08:06 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  improve test

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Tue, 16 Feb 2016 07:06:38 +0000 (08:06 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  improve test

8 years agoimprove test
Anatol Belski [Tue, 16 Feb 2016 07:05:16 +0000 (08:05 +0100)]
improve test

8 years agoSave one strlen here
Xinchen Hui [Tue, 16 Feb 2016 06:00:07 +0000 (14:00 +0800)]
Save one strlen here

8 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Tue, 16 Feb 2016 03:03:09 +0000 (11:03 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #71603 (compact() maintains references in php7)

8 years agoFixed bug #71603 (compact() maintains references in php7)
Xinchen Hui [Tue, 16 Feb 2016 03:02:57 +0000 (11:02 +0800)]
Fixed bug #71603 (compact() maintains references in php7)

8 years agoMerge branch 'PHP-7.0'
Bob Weinand [Mon, 15 Feb 2016 21:43:58 +0000 (22:43 +0100)]
Merge branch 'PHP-7.0'

8 years agoFixed bug #71601 (finally block not executed after yield from)
Bob Weinand [Mon, 15 Feb 2016 21:37:21 +0000 (22:37 +0100)]
Fixed bug #71601 (finally block not executed after yield from)

8 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 15 Feb 2016 15:53:57 +0000 (16:53 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix timelib compat with PHP5

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Mon, 15 Feb 2016 15:53:31 +0000 (16:53 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix timelib compat with PHP5

8 years agoFix timelib compat with PHP5
Anatol Belski [Mon, 15 Feb 2016 15:50:42 +0000 (16:50 +0100)]
Fix timelib compat with PHP5

Windows builds in PHP5 are always using long which is 32-bit even
in 64-bit build. Thus in PHP5, timelib_long and the company have
to always evaluate to a 32-bit.

8 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 15 Feb 2016 14:16:06 +0000 (15:16 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Backported fix for bug #71525

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Mon, 15 Feb 2016 14:15:52 +0000 (15:15 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Backported fix for bug #71525

8 years agoBackported fix for bug #71525
Anatol Belski [Mon, 15 Feb 2016 14:14:23 +0000 (15:14 +0100)]
Backported fix for bug #71525

8 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Mon, 15 Feb 2016 13:40:21 +0000 (16:40 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed possible memory leak

8 years agoFixed possible memory leak
Dmitry Stogov [Mon, 15 Feb 2016 13:40:05 +0000 (16:40 +0300)]
Fixed possible memory leak

8 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Mon, 15 Feb 2016 13:37:48 +0000 (16:37 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Added missing semicolon

8 years agoAdded missing semicolon
Dmitry Stogov [Mon, 15 Feb 2016 13:37:27 +0000 (16:37 +0300)]
Added missing semicolon

8 years agoMerge branch 'PHP-7.0'
Stanislav Malyshev [Mon, 15 Feb 2016 09:53:24 +0000 (01:53 -0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  More fixing for bug #71540

8 years agoMore fixing for bug #71540
Stanislav Malyshev [Mon, 15 Feb 2016 09:53:02 +0000 (01:53 -0800)]
More fixing for bug #71540

8 years agoMerge branch 'PHp-7.0'
Stanislav Malyshev [Mon, 15 Feb 2016 08:10:27 +0000 (00:10 -0800)]
Merge branch 'PHp-7.0'

* PHp-7.0:
  Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()
  Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()

8 years agoFix bug #71540 - NULL pointer dereference in xsl_ext_function_php()
Stanislav Malyshev [Mon, 15 Feb 2016 07:35:29 +0000 (23:35 -0800)]
Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Mon, 15 Feb 2016 08:09:30 +0000 (00:09 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()

Conflicts:
ext/xsl/xsltprocessor.c

8 years agoFix bug #71540 - NULL pointer dereference in xsl_ext_function_php()
Stanislav Malyshev [Mon, 15 Feb 2016 07:35:29 +0000 (23:35 -0800)]
Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()

8 years agoFix bug #71540 - NULL pointer dereference in xsl_ext_function_php()
Stanislav Malyshev [Mon, 15 Feb 2016 07:35:29 +0000 (23:35 -0800)]
Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()

8 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 15 Feb 2016 08:02:35 +0000 (09:02 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix dir separator in test
  fix dir separator in test

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Mon, 15 Feb 2016 08:01:59 +0000 (09:01 +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 [Mon, 15 Feb 2016 08:00:07 +0000 (09:00 +0100)]
fix dir separator in test

8 years agofix dir separator in test
Anatol Belski [Mon, 15 Feb 2016 07:58:20 +0000 (08:58 +0100)]
fix dir separator in test

8 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 15 Feb 2016 07:39:19 +0000 (08:39 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  make sure the tests always uses same tz

8 years agomake sure the tests always uses same tz
Anatol Belski [Mon, 15 Feb 2016 07:38:17 +0000 (08:38 +0100)]
make sure the tests always uses same tz

8 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 15 Feb 2016 07:33:00 +0000 (15:33 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:

8 years agoMerge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Mon, 15 Feb 2016 07:32:52 +0000 (15:32 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:/php-src:
  fixed news entry
  fix NEWS entry
  update NEWS
  Fix bug #71525

8 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Mon, 15 Feb 2016 07:32:17 +0000 (15:32 +0800)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  fixed news entry
  fix NEWS entry
  update NEWS
  Fix bug #71525

8 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 15 Feb 2016 07:31:00 +0000 (15:31 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed typo (I think it should be a typo)

8 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 15 Feb 2016 07:28:24 +0000 (08:28 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fixed news entry
  fix NEWS entry

8 years agofixed news entry
Anatol Belski [Mon, 15 Feb 2016 07:27:41 +0000 (08:27 +0100)]
fixed news entry

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Mon, 15 Feb 2016 07:27:17 +0000 (08:27 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix NEWS entry

8 years agoFixed typo (I think it should be a typo)
Xinchen Hui [Mon, 15 Feb 2016 07:26:44 +0000 (15:26 +0800)]
Fixed typo (I think it should be a typo)

8 years agofix NEWS entry
Anatol Belski [Mon, 15 Feb 2016 07:25:23 +0000 (08:25 +0100)]
fix NEWS entry

8 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 15 Feb 2016 07:22:08 +0000 (08:22 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update NEWS