Christopher Jones
b1431c6174
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
add test for bug #70700
2017-06-20 14:44:11 +10:00
Chuck Burgess
98bcc0bd43
add test for bug #70700
2017-06-20 14:43:20 +10:00
Christopher Jones
b742a18ba4
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
oci8 - Implementation of Oracle TAF Callback
2017-06-20 14:33:35 +10:00
KoenigsKind
1b797f7ad3
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
2017-06-20 14:32:52 +10:00
Christopher Jones
058bec9e33
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
add test for bug #60994
2017-06-20 14:24:07 +10:00
Chuck Burgess
51a7e35c24
add test for bug #60994
2017-06-20 14:22:28 +10:00
Jakub Zelenka
fbb884e532
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-18 19:08:51 +01:00
Jelle van der Waa
509f5097ab
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.
2017-06-18 19:02:51 +01:00
Jakub Zelenka
bfa9362d43
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-18 18:28:54 +01:00
Jakub Zelenka
887fabe78f
Regenerate and bump re2c version to 0.16
...
It also matches the re2c version for Zend language scanner
2017-06-18 18:26:48 +01:00
Jakub Zelenka
c2a348b5bc
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-16 17:14:23 +01:00
Jelle van der Waa
f19dfac830
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.
2017-06-16 16:51:50 +01:00
Dmitry Stogov
84b9b164a8
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)
2017-06-13 17:16:13 +03:00
Dmitry Stogov
648be8600f
Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)
2017-06-13 17:15:47 +03:00
Remi Collet
90f33b1ac7
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()
2017-06-13 08:50:10 +02:00
Remi Collet
78970d5338
Fix bug #74705 for collator_get_sort_key
2017-06-13 08:48:17 +02:00
Tyson Andre
5f07a895cc
Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
...
https://secure.php.net/manual/en/collator.getsortkey.php
2017-06-13 08:46:47 +02:00
Remi Collet
3aa80c482c
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
NEWS
Fixes bug #74708 reflection signatures for random_bytes+random_int
2017-06-13 08:14:57 +02:00
Tyson Andre
81b2533a68
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
2017-06-13 08:11:25 +02:00
Anatol Belski
0fa40b0546
group the change for bug #74720
2017-06-09 23:47:15 +02:00
Anatol Belski
cbe73b3cfe
Fixed bug #74720 pkcs7_en/decrypt does not work if \x1a is used in
...
content
2017-06-09 17:35:37 +02:00
Christoph M. Becker
1980234fc2
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Use reasonable SQLite3 module version
2017-06-09 14:05:04 +02:00
Christoph M. Becker
c3b910370c
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.
2017-06-09 13:49:32 +02:00
Remi Collet
c39a10bc6e
relax this test again (still encounter erratic failure)
2017-06-06 17:20:33 +02:00
Jakub Zelenka
ff93f74f63
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-04 18:11:49 +01:00
Jakub Zelenka
3704947696
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.
2017-06-04 18:08:51 +01:00
Nikita Popov
6af1d7ad01
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-03 15:08:59 +02:00
Nikita Popov
585c9f3c4b
Fix leak in WDDX serialization
2017-06-03 15:08:42 +02:00
Nikita Popov
d9fd44366d
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-03 00:42:30 +02:00
Tim Toohey
d027bc2add
Fixed bug #69373
...
xmlNodeSetContentLen() calls xmlFreeNode() on node->children. This
causes problems if there are other references around to those children.
2017-06-03 00:40:58 +02:00
Nikita Popov
bfedff58e3
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-03 00:05:52 +02:00
libnex
95c4564f93
Fixed bug #73473 : Stack Buffer Overflow in msgfmt_parse_message
2017-06-03 00:05:16 +02:00
Jelle van der Waa
c742abb3ce
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).
2017-06-02 23:52:43 +02:00
Jesper Hagström
cea34425f3
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.
2017-06-02 23:40:48 +02:00
Nikita Popov
e9ff1fac85
Revert "merge PR #2290 : enable opcache in CLI in 7.1+"
...
This reverts commit 71fe529afc
.
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.
2017-06-02 23:36:20 +02:00
andrewnester
48598a2302
Fixed #74639 - Added proper clone functionality for DatePeriod and DateInterval
2017-06-01 08:07:11 +01:00
Xinchen Hui
9064dca58b
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
2017-05-31 13:08:26 +08:00
Xinchen Hui
9c5717d0de
Fixed bug #74673 (Segfault when cast Reflection object to string with undefined constant)
2017-05-31 12:39:26 +08:00
Dmitry Stogov
316aaca155
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed wrong condition
2017-05-31 00:40:57 +03:00
Dmitry Stogov
77cbf8a657
Fixed wrong condition
2017-05-31 00:40:33 +03:00
Côme Bernigaud
1bb295e659
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
2017-05-30 16:48:16 +02:00
Côme Bernigaud
dc7e53690f
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.
2017-05-30 16:45:27 +02:00
Remi Collet
bee52f352f
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
2017-05-30 15:45:52 +02:00
Remi Collet
1c845d2950
Patch from the upstream git
...
https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
2017-05-30 15:40:32 +02:00
Remi Collet
5416deec66
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>
2017-05-30 15:39:21 +02:00
Remi Collet
6a8ae7cf8d
Patch from the upstream git
...
https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
2017-05-30 15:38:17 +02:00
Remi Collet
60b1829e1c
Patch from the upstream git
...
https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
2017-05-30 15:37:11 +02:00
Remi Collet
1e0c4386ab
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>
2017-05-30 15:35:42 +02:00
Fabien Villepinte
d6922ef8e3
Fix Bug #74386Phar::__construct(): wrong number of parameters by reflection
2017-05-29 08:31:47 +01:00
Fabien Villepinte
2dee44c74c
Fix Bug #74386 Phar::__construct(): wrong number of parameters by reflection
2017-05-29 08:29:30 +01:00