]> granicus.if.org Git - php/log
php
7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Wed, 21 Jun 2017 05:04:03 +0000 (15:04 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoRemove use of obsolete create_function()
Christopher Jones [Wed, 21 Jun 2017 05:02:58 +0000 (15:02 +1000)]
Remove use of obsolete create_function()

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Wed, 21 Jun 2017 04:29:43 +0000 (14:29 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoUpdate OCI8 version test and package.xml
Christopher Jones [Wed, 21 Jun 2017 04:29:30 +0000 (14:29 +1000)]
Update OCI8 version test and package.xml

7 years agoFix bug #73634 - grapheme_strpos illegal memory access
Stanislav Malyshev [Mon, 16 Jan 2017 09:18:16 +0000 (01:18 -0800)]
Fix bug #73634 - grapheme_strpos illegal memory access

7 years agoFix bug #73648 - integer overflow in substr
Stanislav Malyshev [Mon, 16 Jan 2017 20:11:50 +0000 (12:11 -0800)]
Fix bug #73648 - integer overflow in substr

7 years agobump versions
Joe Watkins [Tue, 20 Jun 2017 16:34:00 +0000 (17:34 +0100)]
bump versions

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 20 Jun 2017 13:45:05 +0000 (15:45 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Split requested size as expected by CreateFileMapping.

7 years agoSplit requested size as expected by CreateFileMapping.
Anatol Belski [Tue, 20 Jun 2017 13:38:25 +0000 (15:38 +0200)]
Split requested size as expected by CreateFileMapping.

Thus fixing ext\opcache\tests\log_verbosity_bug.phpt fails on 64-bit.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 20 Jun 2017 12:06:27 +0000 (14:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  move next

7 years agomove next
Anatol Belski [Tue, 20 Jun 2017 12:05:50 +0000 (14:05 +0200)]
move next

7 years agoUpdate NEWS
Christopher Jones [Tue, 20 Jun 2017 06:01:37 +0000 (16:01 +1000)]
Update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Tue, 20 Jun 2017 06:00:55 +0000 (16:00 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoPDO_OCI: support IC 12.2 in configure option
Christopher Jones [Tue, 20 Jun 2017 06:00:22 +0000 (16:00 +1000)]
PDO_OCI: support IC 12.2 in configure option

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Tue, 20 Jun 2017 04:55:27 +0000 (14:55 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Bump OCI8 version

7 years agoBump OCI8 version
Christopher Jones [Tue, 20 Jun 2017 04:54:45 +0000 (14:54 +1000)]
Bump OCI8 version

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Tue, 20 Jun 2017 04:44:11 +0000 (14:44 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  add test for bug #70700

7 years agoMerge branch 'pull-request/1569' into PHP-7.0
Christopher Jones [Tue, 20 Jun 2017 04:43:50 +0000 (14:43 +1000)]
Merge branch 'pull-request/1569' into PHP-7.0

* pull-request/1569:
  add test for bug #70700

7 years agoadd test for bug #70700
Chuck Burgess [Mon, 12 Oct 2015 19:56:59 +0000 (14:56 -0500)]
add test for bug #70700

7 years agoUpdate NEWS
Christopher Jones [Tue, 20 Jun 2017 04:37:52 +0000 (14:37 +1000)]
Update NEWS

7 years agoUpdate NEWS
Christopher Jones [Tue, 20 Jun 2017 04:37:16 +0000 (14:37 +1000)]
Update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Tue, 20 Jun 2017 04:33:35 +0000 (14:33 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  oci8 - Implementation of Oracle TAF Callback

7 years agoMerge branch 'pull-request/2459' into PHP-7.0
Christopher Jones [Tue, 20 Jun 2017 04:33:06 +0000 (14:33 +1000)]
Merge branch 'pull-request/2459' into PHP-7.0

* pull-request/2459:
  oci8 - Implementation of Oracle TAF Callback

7 years agooci8 - Implementation of Oracle TAF Callback
KoenigsKind [Fri, 7 Apr 2017 18:40:40 +0000 (20:40 +0200)]
oci8 - Implementation of Oracle TAF Callback

Adds support for the Transparent Application Failover Callback.
The php_oci_connection struct got a char* added which will contain the
callback function, it should be set to PHP_OCI_TAF_DISABLE_CALLBACK at
the end of a php request for permanent connections so that, if a TAF
callback occurs, no userspace function will be called.
Maybe add support for registering object functions (via array),
currently the register function only accepts a string. I didn't know how
to implement it correctly. As a failover occurs very rarely it might be
better to not keep the cache when saving the zend_fcall_info.

Things to do
[ ] config.m4 needs to compile oci8_failover.c
[ ] Check if correctly implemented (especially for multithreading)
[ ] Add support for registering callback function via array

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Tue, 20 Jun 2017 04:24:07 +0000 (14:24 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  add test for bug #60994

7 years agoMerge branch 'pull-request/1566' into PHP-7.0
Christopher Jones [Tue, 20 Jun 2017 04:23:20 +0000 (14:23 +1000)]
Merge branch 'pull-request/1566' into PHP-7.0

* pull-request/1566:
  add test for bug #60994

7 years agoadd test for bug #60994
Chuck Burgess [Mon, 12 Oct 2015 15:50:09 +0000 (10:50 -0500)]
add test for bug #60994

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Sun, 18 Jun 2017 18:08:51 +0000 (19:08 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoopenssl: Add openssl_pkcs12_(read, export) tests
Jelle van der Waa [Thu, 8 Jun 2017 12:31:48 +0000 (14:31 +0200)]
openssl: Add openssl_pkcs12_(read, export) tests

Add basic tests for openssl_pkcs12_read and openssl_pkcs12_export.
openssl_pkcs12_export has two tests disable which currently do not work
as intended and should be fixed.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Sun, 18 Jun 2017 17:28:54 +0000 (18:28 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoRegenerate and bump re2c version to 0.16
Jakub Zelenka [Sun, 18 Jun 2017 17:26:48 +0000 (18:26 +0100)]
Regenerate and bump re2c version to 0.16

It also matches the re2c version for Zend language scanner

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 16 Jun 2017 23:58:51 +0000 (01:58 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Next round on AppVeyor reliability.

7 years agoNext round on AppVeyor reliability.
Anatol Belski [Fri, 16 Jun 2017 23:57:47 +0000 (01:57 +0200)]
Next round on AppVeyor reliability.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Fri, 16 Jun 2017 16:14:23 +0000 (17:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoopenssl: Fix spkstr and spki leak in openssl_spki_new
Jelle van der Waa [Tue, 6 Jun 2017 14:45:39 +0000 (16:45 +0200)]
openssl: Fix spkstr and spki leak in openssl_spki_new

spkstr is not free'd when running the test and valgrind reports a leak
of 32,318 bytes. The free condition is not met since keyresource is not
NULL, apart from that OPENSSL_free actually free's the allocated memory
by OPENSSL_malloc inside OpenSSL.

Valgrind reports 768 bytes leaked in openssl_spki_new when running the
testsuite. Remove the keyresource check to always free spki.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Tue, 13 Jun 2017 14:16:13 +0000 (17:16 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)

7 years agoFixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)
Dmitry Stogov [Tue, 13 Jun 2017 14:15:47 +0000 (17:15 +0300)]
Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)

7 years agoNEWS
Remi Collet [Tue, 13 Jun 2017 06:50:24 +0000 (08:50 +0200)]
NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Remi Collet [Tue, 13 Jun 2017 06:50:10 +0000 (08:50 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  NEWS
  Fix bug #74705 for collator_get_sort_key
  Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()

7 years agoNEWS
Remi Collet [Tue, 13 Jun 2017 06:50:02 +0000 (08:50 +0200)]
NEWS

7 years agoFix bug #74705 for collator_get_sort_key
Remi Collet [Tue, 13 Jun 2017 06:48:17 +0000 (08:48 +0200)]
Fix bug #74705 for collator_get_sort_key

7 years agoFixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
Tyson Andre [Thu, 8 Jun 2017 04:32:57 +0000 (21:32 -0700)]
Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()

https://secure.php.net/manual/en/collator.getsortkey.php

7 years agoNEWS
Remi Collet [Tue, 13 Jun 2017 06:15:19 +0000 (08:15 +0200)]
NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Remi Collet [Tue, 13 Jun 2017 06:14:57 +0000 (08:14 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  NEWS
  Fixes bug #74708 reflection signatures for random_bytes+random_int

7 years agoNEWS
Remi Collet [Tue, 13 Jun 2017 06:14:34 +0000 (08:14 +0200)]
NEWS

7 years agoFixes bug #74708 reflection signatures for random_bytes+random_int
Tyson Andre [Thu, 8 Jun 2017 06:50:20 +0000 (23:50 -0700)]
Fixes bug #74708 reflection signatures for random_bytes+random_int

They have 1 and 2 required parameters, respectively
See https://secure.php.net/manual/en/function.random-int.php

7 years agoForgotten NEWs update
Xinchen Hui [Tue, 13 Jun 2017 04:21:45 +0000 (12:21 +0800)]
Forgotten NEWs update

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Tue, 13 Jun 2017 04:21:27 +0000 (12:21 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Forgotten NEWs update

7 years agoForgotten NEWs update
Xinchen Hui [Tue, 13 Jun 2017 04:20:42 +0000 (12:20 +0800)]
Forgotten NEWs update

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Mon, 12 Jun 2017 09:21:35 +0000 (17:21 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Add simple cli test for PATH/HOST ini sections
  Fixed bug #74600

7 years agoMerge branch 'bug74600' of https://github.com/manuelm/php-src into PHP-7.0
Xinchen Hui [Mon, 12 Jun 2017 09:12:15 +0000 (17:12 +0800)]
Merge branch 'bug74600' of https://github.com/manuelm/php-src into PHP-7.0

* 'bug74600' of https://github.com/manuelm/php-src:
  Add simple cli test for PATH/HOST ini sections
  Fixed bug #74600

7 years agogroup the change for bug #74720
Anatol Belski [Fri, 9 Jun 2017 21:47:15 +0000 (23:47 +0200)]
group the change for bug #74720

7 years agoAdd simple cli test for PATH/HOST ini sections
Manuel Mausz [Fri, 9 Jun 2017 21:28:19 +0000 (23:28 +0200)]
Add simple cli test for PATH/HOST ini sections

7 years agoupdate NEWS
Anatol Belski [Fri, 9 Jun 2017 15:40:45 +0000 (17:40 +0200)]
update NEWS

7 years agoFixed bug #74720 pkcs7_en/decrypt does not work if \x1a is used in
Anatol Belski [Fri, 9 Jun 2017 15:35:37 +0000 (17:35 +0200)]
Fixed bug #74720 pkcs7_en/decrypt does not work if \x1a is used in

content

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 9 Jun 2017 12:05:04 +0000 (14:05 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Use reasonable SQLite3 module version

7 years agoUse reasonable SQLite3 module version
Christoph M. Becker [Wed, 7 Jun 2017 13:22:20 +0000 (15:22 +0200)]
Use reasonable SQLite3 module version

Since PECL/sqlite3 has been moved to ext/sqlite3 in 2008, the SQLite3
module version is hardcoded to `0.7-dev`. It doesn't appear to make
much sense to have an own module version for a bundled extensions, but
as other code might rely on it, we don't remove the constant but rather
make it an alias of the PHP version.

7 years agoFixed bug #74600
Manuel Mausz [Thu, 8 Jun 2017 23:43:08 +0000 (01:43 +0200)]
Fixed bug #74600

Make sure the hash entry is an array.

The origin fix broke support for HOST/PATH ini sections. Only the
beginning of the string has to match. Revert this check but use
zend_binary_strncasecmp instead of strncasecmp.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 8 Jun 2017 15:16:02 +0000 (17:16 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  enforce exit status propagation and up the sdk version

7 years agoenforce exit status propagation and up the sdk version
Anatol Belski [Thu, 8 Jun 2017 15:14:52 +0000 (17:14 +0200)]
enforce exit status propagation and up the sdk version

7 years agorelax this test again (still encounter erratic failure)
Remi Collet [Tue, 6 Jun 2017 15:20:33 +0000 (17:20 +0200)]
relax this test again (still encounter erratic failure)

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Sun, 4 Jun 2017 17:11:49 +0000 (18:11 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoReplace ASN1_STRING_data with ASN1_STRING_get0_data
Jakub Zelenka [Sun, 4 Jun 2017 17:08:51 +0000 (18:08 +0100)]
Replace ASN1_STRING_data with ASN1_STRING_get0_data

This is a slightly modified version of the patch from Jelle van der Waa
( @jelly ) so full credit to him.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 3 Jun 2017 13:08:59 +0000 (15:08 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFix leak in WDDX serialization
Nikita Popov [Sat, 3 Jun 2017 13:08:42 +0000 (15:08 +0200)]
Fix leak in WDDX serialization

7 years agoTravis: Use opcache in release build
Nikita Popov [Sat, 3 Jun 2017 10:37:47 +0000 (12:37 +0200)]
Travis: Use opcache in release build

Our debug builds on Travis are often timing out recently. Opcache
causes quite a large performance hit on test run times, so move it
over to the release build, where it should have less impact.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 2 Jun 2017 22:42:18 +0000 (00:42 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFixed bug #69373
Tim Toohey [Fri, 2 Jun 2017 22:38:02 +0000 (00:38 +0200)]
Fixed bug #69373

xmlNodeSetContentLen() calls xmlFreeNode() on node->children. This
causes problems if there are other references around to those children.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 2 Jun 2017 22:05:35 +0000 (00:05 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFixed bug #73473: Stack Buffer Overflow in msgfmt_parse_message
libnex [Mon, 29 May 2017 13:13:52 +0000 (13:13 +0000)]
Fixed bug #73473: Stack Buffer Overflow in msgfmt_parse_message

7 years agoopenssl_pkcs12_read: add missing BIO_free
Jelle van der Waa [Tue, 30 May 2017 13:55:05 +0000 (15:55 +0200)]
openssl_pkcs12_read: add missing BIO_free

When filling the extracerts array with certificates bio_out is created
but not free'd leading to a small memory leak of 224 bytes (reported by
valgrind).

7 years agoSet timezone for intl/test/bug74298.phpt
Jesper Hagström [Fri, 2 Jun 2017 13:29:04 +0000 (15:29 +0200)]
Set timezone for intl/test/bug74298.phpt

Now sets UTC as default timezone for the DateTime which otherwise
uses the timezone defined in php.ini.

7 years agoRevert "merge PR #2290: enable opcache in CLI in 7.1+"
Nikita Popov [Fri, 2 Jun 2017 21:34:32 +0000 (23:34 +0200)]
Revert "merge PR #2290: enable opcache in CLI in 7.1+"

This reverts commit 71fe529afc2f9bfd99d85539c709a27f025c0caa.

Without the file cache (which is not enabled by default), this has
non-trivial impact on the startup time. It also significantly
increases the baseline memory usage of PHP on CLI.

7 years agoFixed #74639 - Added proper clone functionality for DatePeriod and DateInterval
andrewnester [Fri, 26 May 2017 10:56:41 +0000 (13:56 +0300)]
Fixed #74639 - Added proper clone functionality for DatePeriod and DateInterval

7 years agoUpdate NEWS
Xinchen Hui [Wed, 31 May 2017 05:09:38 +0000 (13:09 +0800)]
Update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Wed, 31 May 2017 05:08:26 +0000 (13:08 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74673 (Segfault when cast Reflection object to string with undefined constant)

Conflicts:
ext/reflection/php_reflection.c

7 years agoFixed bug #74673 (Segfault when cast Reflection object to string with undefined constant)
Xinchen Hui [Wed, 31 May 2017 04:39:26 +0000 (12:39 +0800)]
Fixed bug #74673 (Segfault when cast Reflection object to string with undefined constant)

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Tue, 30 May 2017 21:40:57 +0000 (00:40 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed wrong condition

7 years agoFixed wrong condition
Dmitry Stogov [Tue, 30 May 2017 21:40:33 +0000 (00:40 +0300)]
Fixed wrong condition

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Côme Bernigaud [Tue, 30 May 2017 14:48:16 +0000 (16:48 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap)
  ext/ldap: Allow default host from ldap.conf to work.

Conflicts:
ext/ldap/ldap.c

7 years agoMerge branch 'pull-request/2536' into PHP-7.0
Côme Bernigaud [Tue, 30 May 2017 14:45:27 +0000 (16:45 +0200)]
Merge branch 'pull-request/2536' into PHP-7.0

* pull-request/2536:
  ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap)
  ext/ldap: Allow default host from ldap.conf to work.

7 years agoNEWS
Remi Collet [Tue, 30 May 2017 13:46:15 +0000 (15:46 +0200)]
NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Remi Collet [Tue, 30 May 2017 13:45:52 +0000 (15:45 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  NEWS
  Patch from the upstream git https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)
  Patch from the upstream git https://github.com/kkos/oniguruma/issues/59 (CVE-2017-9229) b690371bbf97794b4a1d3f295d4fb9a8b05d402d Modified for onig 5.9.6
  Patch from the upstream git https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227)
  Patch from the upstream git https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224)
  Patch from the upstream git https://github.com/kkos/oniguruma/issues/55 (CVE-2017-9226) b4bf968ad52afe14e60a2dc8a95d3555c543353a Modified for onig 5.9.6 f015fbdd95f76438cd86366467bb2b39870dd7c6 Modified for onig 5.9.6

7 years agoNEWS
Remi Collet [Tue, 30 May 2017 13:45:09 +0000 (15:45 +0200)]
NEWS

7 years agoPatch from the upstream git
Remi Collet [Tue, 30 May 2017 13:40:32 +0000 (15:40 +0200)]
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)

Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>

7 years agoPatch from the upstream git
Remi Collet [Tue, 30 May 2017 13:39:21 +0000 (15:39 +0200)]
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/59 (CVE-2017-9229)
b690371bbf97794b4a1d3f295d4fb9a8b05d402d Modified for onig 5.9.6

Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>

7 years agoPatch from the upstream git
Remi Collet [Tue, 30 May 2017 13:38:17 +0000 (15:38 +0200)]
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227)

Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>

7 years agoPatch from the upstream git
Remi Collet [Tue, 30 May 2017 13:37:11 +0000 (15:37 +0200)]
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224)

Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>

7 years agoPatch from the upstream git
Remi Collet [Tue, 30 May 2017 13:35:42 +0000 (15:35 +0200)]
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/55 (CVE-2017-9226)
b4bf968ad52afe14e60a2dc8a95d3555c543353a Modified for onig 5.9.6
f015fbdd95f76438cd86366467bb2b39870dd7c6 Modified for onig 5.9.6

Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>

7 years agoFix Bug #74386Phar::__construct(): wrong number of parameters by reflection
Fabien Villepinte [Sat, 6 May 2017 12:38:17 +0000 (14:38 +0200)]
Fix Bug #74386Phar::__construct(): wrong number of parameters by reflection

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 29 May 2017 07:29:58 +0000 (08:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix Bug #74386 Phar::__construct(): wrong number of parameters by reflection

7 years agoFix Bug #74386 Phar::__construct(): wrong number of parameters by reflection
Fabien Villepinte [Wed, 10 May 2017 10:40:21 +0000 (12:40 +0200)]
Fix Bug #74386 Phar::__construct(): wrong number of parameters by reflection

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Sara Golemon [Sun, 28 May 2017 15:49:25 +0000 (08:49 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Bugfix #74556 stream_socket_get_name() returns empty string
  Fix abstract name handling to be binary safe

7 years agoBugfix #74556 stream_socket_get_name() returns empty string
Sara Golemon [Sun, 28 May 2017 14:23:57 +0000 (07:23 -0700)]
Bugfix #74556 stream_socket_get_name() returns empty string

The original bug report had it returning '\0',
but with a fix to abstract name handling (6d2d0bbda7)
it now actually returns ''.

Neither of these are good, as per unix(7)
an empty socket name indicates an unbound name
and "should not be inspected".

7 years agoFix abstract name handling to be binary safe
Sara Golemon [Sun, 28 May 2017 15:20:21 +0000 (08:20 -0700)]
Fix abstract name handling to be binary safe

Per unix(7):
abstract: an abstract socket address is distinguished (from a
pathname socket) by the fact that sun_path[0] is a null byte
('\0').  The socket's address in this namespace is given by the
additional bytes in sun_path that are covered by the specified
length of the address structure.  (Null bytes in the name have no
special significance.)  The name has no connection with filesystem
pathnames.  When the address of an abstract socket is returned,
the returned addrlen is greater than sizeof(sa_family_t) (i.e.,
greater than 2), and the name of the socket is contained in the
first (addrlen - sizeof(sa_family_t)) bytes of sun_path.

The existing implementation was assuming significance in null bytes
contained in the abstract address identifier.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Sara Golemon [Sun, 28 May 2017 04:14:02 +0000 (21:14 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Bugfix #74598 ftp:// ignores context

7 years agoBugfix #74598 ftp:// ignores context
Sara Golemon [Sun, 28 May 2017 04:12:49 +0000 (21:12 -0700)]
Bugfix #74598 ftp:// ignores context

7 years agoUpdate NEWS
Xinchen Hui [Sat, 27 May 2017 14:43:30 +0000 (22:43 +0800)]
Update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Sat, 27 May 2017 14:43:23 +0000 (22:43 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74663 (Segfault with opcache.memory_protect and validate_timestamp)

7 years agoFixed bug #74663 (Segfault with opcache.memory_protect and validate_timestamp)
Xinchen Hui [Sat, 27 May 2017 14:42:17 +0000 (22:42 +0800)]
Fixed bug #74663 (Segfault with opcache.memory_protect and validate_timestamp)