]>
granicus.if.org Git - php/log
Stanislav Malyshev [Wed, 5 Jul 2017 03:25:11 +0000 (20:25 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix tests
Stanislav Malyshev [Wed, 5 Jul 2017 03:18:57 +0000 (20:18 -0700)]
Fix wddx
Stanislav Malyshev [Wed, 5 Jul 2017 03:12:57 +0000 (20:12 -0700)]
Fix tests
Stanislav Malyshev [Wed, 5 Jul 2017 02:44:51 +0000 (19:44 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Update NEWS
Fix bug #74087
Fixed parsing of strange formats with mixed month/day and time strings
Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
Fixed bug #74111
Fix #74435: Buffer over-read into uninitialized memory
Fix bug #74603 - use correct buffer size
Fix bug #74651 - check EVP_SealInit as it can return -1
Update NEWS
Fix bug #73807
Nikita Popov [Sun, 25 Jun 2017 19:15:26 +0000 (21:15 +0200)]
Fixed bug #74111
Stanislav Malyshev [Tue, 20 Jun 2017 07:09:01 +0000 (00:09 -0700)]
Fix bug #74603 - use correct buffer size
Stanislav Malyshev [Tue, 20 Jun 2017 06:06:24 +0000 (23:06 -0700)]
Fix bug #74651 - check EVP_SealInit as it can return -1
Stanislav Malyshev [Wed, 5 Jul 2017 02:30:29 +0000 (19:30 -0700)]
Update NEWS
Stanislav Malyshev [Wed, 5 Jul 2017 02:21:28 +0000 (19:21 -0700)]
Fix bug #74087
Ported from https://vcs.pcre.org/pcre/code/trunk/pcre_jit_compile.c?r1=1676&r2=1680&view=patch
Derick Rethans [Mon, 3 Jul 2017 11:37:11 +0000 (12:37 +0100)]
Fixed parsing of strange formats with mixed month/day and time strings
Stanislav Malyshev [Sun, 2 Jul 2017 21:25:54 +0000 (14:25 -0700)]
Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
Nikita Popov [Sun, 25 Jun 2017 19:15:26 +0000 (21:15 +0200)]
Fixed bug #74111
Christoph M. Becker [Tue, 20 Jun 2017 14:45:42 +0000 (16:45 +0200)]
Fix #74435: Buffer over-read into uninitialized memory
The stack allocated color map buffers were not zeroed before usage, and
so undefined palette indexes could cause information leakage.
Stanislav Malyshev [Tue, 20 Jun 2017 07:09:01 +0000 (00:09 -0700)]
Fix bug #74603 - use correct buffer size
Stanislav Malyshev [Tue, 20 Jun 2017 06:06:24 +0000 (23:06 -0700)]
Fix bug #74651 - check EVP_SealInit as it can return -1
Remi Collet [Tue, 4 Jul 2017 18:25:59 +0000 (20:25 +0200)]
Adapt for 32-bits which fails at different offset (49 vs 38)
Anatol Belski [Tue, 4 Jul 2017 14:37:17 +0000 (16:37 +0200)]
fix datatype
Anatol Belski [Tue, 4 Jul 2017 10:12:51 +0000 (12:12 +0200)]
[ci skip] sync NEWS
Anatol Belski [Tue, 4 Jul 2017 09:29:00 +0000 (11:29 +0200)]
update NEWS
Nikita Popov [Sun, 25 Jun 2017 18:58:50 +0000 (20:58 +0200)]
Fixed bug #74101 and bug #74614
Anatol Belski [Sat, 1 Jul 2017 16:56:32 +0000 (18:56 +0200)]
yet one C++ compat fix
Anatol Belski [Sat, 1 Jul 2017 16:36:43 +0000 (18:36 +0200)]
fix C++ compat
Bob Weinand [Sat, 1 Jul 2017 09:52:03 +0000 (11:52 +0200)]
Fixed bug #74840 (Opcache overwrites argument of GENERATOR_RETURN within finally)
Julien Pauli [Thu, 29 Jun 2017 18:23:37 +0000 (20:23 +0200)]
Updated NEWS
Julien Pauli [Thu, 29 Jun 2017 18:22:21 +0000 (20:22 +0200)]
Fix bug #74832, crash in extension loading
Adam Baratz [Thu, 29 Jun 2017 09:14:38 +0000 (11:14 +0200)]
Fixed #69356: PDOStatement::debugDumpParams() truncates query
George Wang [Wed, 28 Jun 2017 03:14:36 +0000 (23:14 -0400)]
[BUGFIX] fixes the issue that a value from .user.ini displays in phpinfo(), but not applies.
[BUGFIX] when lsapi used the php_value has higher priority then ini_set when called from the script by itself .
Nikita Popov [Sun, 25 Jun 2017 18:14:58 +0000 (20:14 +0200)]
Fixed bug #73173
Patch by tloi at fortinet dot com.
Bob Weinand [Sun, 25 Jun 2017 18:11:53 +0000 (20:11 +0200)]
Expose inflate_get_status() and inflate_get_read_len() functions
Matthew Trescott [Sun, 25 Jun 2017 09:07:14 +0000 (11:07 +0200)]
Add more constants, improve comments, and add tests
Nikita Popov [Sun, 25 Jun 2017 17:48:17 +0000 (19:48 +0200)]
Fixed bug #73900
Nikita Popov [Sun, 25 Jun 2017 13:08:36 +0000 (15:08 +0200)]
Don't leave holes in func_get_args() and backtraces
Argument lists should always be continuous and hole-free, even if
local variables are unset. Replace UNDEF values with NULLs.
Bob Weinand [Sun, 25 Jun 2017 08:57:36 +0000 (10:57 +0200)]
Fixed bug #73944 (inflate_init() dictionary option) - add NEWS entry
wapmorgan [Sat, 24 Jun 2017 19:44:01 +0000 (22:44 +0300)]
Remove invalid check of dictionary content and add initialization of dictionary if raw compression used
Stanislav Malyshev [Sun, 25 Jun 2017 06:32:59 +0000 (23:32 -0700)]
Update NEWS
ideal [Wed, 21 Jun 2017 05:16:05 +0000 (13:16 +0800)]
Fix error if compiled without -fpermissive flag.
danchukas [Thu, 22 Jun 2017 14:25:40 +0000 (17:25 +0300)]
fix method "eof"
replace "eof" with "feof"
because:
1) http://php.net/manual/ru/function.feof.php
2) Error: Call to undefined function eof()
Thomas Punt [Wed, 21 Jun 2017 20:47:22 +0000 (21:47 +0100)]
Remove superfluous branch
Peter Kokot [Thu, 15 Jun 2017 00:30:39 +0000 (02:30 +0200)]
Fix configure error
This patch fixes configure error on some systems such as Alpine.
```
line 3472: test: =: unary operator expected
```
One of the fixes has been suggested also here already:
https://bugs.php.net/bug.php?id=39835
Thank you for considering merging this.
jhdxr [Sun, 30 Apr 2017 05:33:53 +0000 (13:33 +0800)]
fix bug #73471 PHP freezes with AppendIterator
jhdxr [Tue, 20 Jun 2017 18:03:13 +0000 (02:03 +0800)]
fix bug #74780 parse_url() borken when query string contains colon
Christopher Jones [Wed, 21 Jun 2017 05:55:28 +0000 (15:55 +1000)]
Merge branch 'pull-request/2532' into PHP-7.0
* pull-request/2532:
Add bug #74625 to package.xml
Add IN bind case to bug74625.phpt
Fixed bug #74625 (Integer overflow in oci_bind_array_by_name).
Christopher Jones [Wed, 21 Jun 2017 05:50:51 +0000 (15:50 +1000)]
Add bug #74625 to package.xml
Christopher Jones [Wed, 21 Jun 2017 05:47:32 +0000 (15:47 +1000)]
Add IN bind case to bug74625.phpt
Ingmar Runge [Mon, 22 May 2017 06:58:18 +0000 (08:58 +0200)]
Fixed bug #74625 (Integer overflow in oci_bind_array_by_name).
Christopher Jones [Wed, 21 Jun 2017 05:02:58 +0000 (15:02 +1000)]
Remove use of obsolete create_function()
Christopher Jones [Wed, 21 Jun 2017 04:29:30 +0000 (14:29 +1000)]
Update OCI8 version test and package.xml
Stanislav Malyshev [Mon, 16 Jan 2017 09:18:16 +0000 (01:18 -0800)]
Fix bug #73634 - grapheme_strpos illegal memory access
Stanislav Malyshev [Mon, 16 Jan 2017 20:11:50 +0000 (12:11 -0800)]
Fix bug #73648 - integer overflow in substr
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.
Anatol Belski [Tue, 20 Jun 2017 12:05:50 +0000 (14:05 +0200)]
move next
Nikita Popov [Thu, 2 Feb 2017 15:04:02 +0000 (16:04 +0100)]
Fix bug #73807
Christopher Jones [Tue, 20 Jun 2017 06:00:22 +0000 (16:00 +1000)]
PDO_OCI: support IC 12.2 in configure option
Christopher Jones [Tue, 20 Jun 2017 04:54:45 +0000 (14:54 +1000)]
Bump OCI8 version
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
Chuck Burgess [Mon, 12 Oct 2015 19:56:59 +0000 (14:56 -0500)]
add test for bug #70700
Christopher Jones [Tue, 20 Jun 2017 04:37:16 +0000 (14:37 +1000)]
Update NEWS
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
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
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
Chuck Burgess [Mon, 12 Oct 2015 15:50:09 +0000 (10:50 -0500)]
add test for bug #60994
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.
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
Anatol Belski [Fri, 16 Jun 2017 23:57:47 +0000 (01:57 +0200)]
Next round on AppVeyor reliability.
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.
Dmitry Stogov [Tue, 13 Jun 2017 14:15:47 +0000 (17:15 +0300)]
Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)
Remi Collet [Tue, 13 Jun 2017 06:50:02 +0000 (08:50 +0200)]
NEWS
Remi Collet [Tue, 13 Jun 2017 06:48:17 +0000 (08:48 +0200)]
Fix bug #74705 for collator_get_sort_key
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
Remi Collet [Tue, 13 Jun 2017 06:14:34 +0000 (08:14 +0200)]
NEWS
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
Xinchen Hui [Tue, 13 Jun 2017 04:20:42 +0000 (12:20 +0800)]
Forgotten NEWs update
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
Manuel Mausz [Fri, 9 Jun 2017 21:28:19 +0000 (23:28 +0200)]
Add simple cli test for PATH/HOST ini sections
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.
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.
Anatol Belski [Thu, 8 Jun 2017 15:14:52 +0000 (17:14 +0200)]
enforce exit status propagation and up the sdk version
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.
Nikita Popov [Sat, 3 Jun 2017 13:08:42 +0000 (15:08 +0200)]
Fix leak in WDDX serialization
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.
libnex [Mon, 29 May 2017 13:13:52 +0000 (13:13 +0000)]
Fixed bug #73473: Stack Buffer Overflow in msgfmt_parse_message
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)
Dmitry Stogov [Tue, 30 May 2017 21:40:33 +0000 (00:40 +0300)]
Fixed wrong condition
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.
Remi Collet [Tue, 30 May 2017 13:45:09 +0000 (15:45 +0200)]
NEWS
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>
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>
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>
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>
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>
Fabien Villepinte [Wed, 10 May 2017 10:40:21 +0000 (12:40 +0200)]
Fix Bug #74386 Phar::__construct(): wrong number of parameters by reflection
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".
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.
Sara Golemon [Sun, 28 May 2017 04:12:49 +0000 (21:12 -0700)]
Bugfix #74598 ftp:// ignores context
Xinchen Hui [Sat, 27 May 2017 14:42:17 +0000 (22:42 +0800)]
Fixed bug #74663 (Segfault with opcache.memory_protect and validate_timestamp)
Xinchen Hui [Sat, 27 May 2017 04:11:53 +0000 (12:11 +0800)]
Correct the location
Xinchen Hui [Sat, 27 May 2017 04:06:43 +0000 (12:06 +0800)]
Fixed bug #74657 (Undefined constants in array properties result in broken properties)
David Caldwell [Thu, 25 May 2017 21:27:11 +0000 (21:27 +0000)]
ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap)
David Caldwell [Thu, 25 May 2017 00:41:12 +0000 (00:41 +0000)]
ext/ldap: Allow default host from ldap.conf to work.
This fixes an regression introduced in
e7af0fe1eb89e40671e86a588aa1b78607b85461 . Previously, calling
ldap_connect() with no parameters would pass NULL to ldap_init(),
which causes it to use the default host specified in
/etc/ldap/ldap.conf (on Ubuntu).
When the code changed to use ldap_initialize(), it initialized a uri,
even if there were no parameters passed to ldap_connect(). Because of
this, there's no way to pass a NULL into ldap_initialize(), making it
impossible to use the default uri from ldap.conf.
This commit bypasses the uri creation when there is no host argument,
passing on a NULL to ldap_initialize() which restores the old PHP 5.5
behavior.
jhdxr [Wed, 24 May 2017 16:00:48 +0000 (18:00 +0200)]
Fixed bug #74478