]>
granicus.if.org Git - php/log
Nikita Popov [Sun, 25 Jun 2017 17:48:54 +0000 (19:48 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sun, 25 Jun 2017 17:48:17 +0000 (19:48 +0200)]
Fixed bug #73900
Jakub Zelenka [Sun, 25 Jun 2017 17:08:50 +0000 (18:08 +0100)]
Add OPENSSL_DONT_ZERO_PAD_KEY constant to prevent key padding
It fixes bug #71917 (openssl_open() returns junk on envelope < 16 bytes)
and bug #72362 (OpenSSL Blowfish encryption is incorrect for short
keys).
Nikita Popov [Sun, 25 Jun 2017 13:30:29 +0000 (15:30 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
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
Anatol Belski [Fri, 23 Jun 2017 23:28:58 +0000 (01:28 +0200)]
[ci skip] update NEWS
Anatol Belski [Fri, 23 Jun 2017 22:18:57 +0000 (00:18 +0200)]
Fix bug #74798 pkcs7_en/decrypt does not work if \x0a is used in content
The patch for bug #74720 was incomplete.
Nikita Popov [Fri, 23 Jun 2017 15:32:45 +0000 (17:32 +0200)]
Fixed bug #74623
Nikita Popov [Fri, 23 Jun 2017 15:07:44 +0000 (17:07 +0200)]
Make inference robust against infinite loop
Right now, if narrowing occurs on non-debug builds, inference can
easily go into an infinite loop. Prevent this, and add a pointer
that this should be reported as a bug.
Nikita Popov [Fri, 23 Jun 2017 11:31:39 +0000 (13:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
ideal [Wed, 21 Jun 2017 05:16:05 +0000 (13:16 +0800)]
Fix error if compiled without -fpermissive flag.
Joe Watkins [Fri, 23 Jun 2017 06:53:12 +0000 (07:53 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix method "eof"
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()
Joe Watkins [Fri, 23 Jun 2017 06:51:46 +0000 (07:51 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Remove superfluous branch
Thomas Punt [Wed, 21 Jun 2017 20:47:22 +0000 (21:47 +0100)]
Remove superfluous branch
Joe Watkins [Thu, 22 Jun 2017 13:01:30 +0000 (14:01 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix configure error
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.
Joe Watkins [Thu, 22 Jun 2017 10:57:22 +0000 (11:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix bug #73471 PHP freezes with AppendIterator
jhdxr [Sun, 30 Apr 2017 05:33:53 +0000 (13:33 +0800)]
fix bug #73471 PHP freezes with AppendIterator
Joe Watkins [Thu, 22 Jun 2017 10:52:20 +0000 (11:52 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix bug #74780 parse_url() borken when query string contains colon
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 06:16:20 +0000 (16:16 +1000)]
Update NEWS
Christopher Jones [Wed, 21 Jun 2017 05:55:54 +0000 (15:55 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
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: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:04:03 +0000 (15:04 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1
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:43 +0000 (14:29 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1
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
Joe Watkins [Tue, 20 Jun 2017 16:34:00 +0000 (17:34 +0100)]
bump versions
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.
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:06:27 +0000 (14:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
move next
Anatol Belski [Tue, 20 Jun 2017 12:05:50 +0000 (14:05 +0200)]
move next
Christopher Jones [Tue, 20 Jun 2017 06:01:37 +0000 (16:01 +1000)]
Update NEWS
Christopher Jones [Tue, 20 Jun 2017 06:00:55 +0000 (16:00 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1
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:55:27 +0000 (14:55 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Bump OCI8 version
Christopher Jones [Tue, 20 Jun 2017 04:54:45 +0000 (14:54 +1000)]
Bump OCI8 version
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
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:52 +0000 (14:37 +1000)]
Update NEWS
Christopher Jones [Tue, 20 Jun 2017 04:37:16 +0000 (14:37 +1000)]
Update NEWS
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
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:24:07 +0000 (14:24 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
add test for bug #60994
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
Jakub Zelenka [Sun, 18 Jun 2017 18:08:51 +0000 (19:08 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
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:28:54 +0000 (18:28 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
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:58:51 +0000 (01:58 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Next round on AppVeyor reliability.
Anatol Belski [Fri, 16 Jun 2017 23:57:47 +0000 (01:57 +0200)]
Next round on AppVeyor reliability.
Jakub Zelenka [Fri, 16 Jun 2017 16:14:23 +0000 (17:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
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: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)
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:24 +0000 (08:50 +0200)]
NEWS
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()
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:15:19 +0000 (08:15 +0200)]
NEWS
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
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:21:45 +0000 (12:21 +0800)]
Forgotten NEWs update
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
Xinchen Hui [Tue, 13 Jun 2017 04:20:42 +0000 (12:20 +0800)]
Forgotten NEWs update
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
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
Anatol Belski [Fri, 9 Jun 2017 21:47:15 +0000 (23:47 +0200)]
group the change for bug #74720
Manuel Mausz [Fri, 9 Jun 2017 21:28:19 +0000 (23:28 +0200)]
Add simple cli test for PATH/HOST ini sections
Anatol Belski [Fri, 9 Jun 2017 15:40:45 +0000 (17:40 +0200)]
update NEWS
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
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
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: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
Anatol Belski [Thu, 8 Jun 2017 15:14:52 +0000 (17:14 +0200)]
enforce exit status propagation and up the sdk version
Remi Collet [Tue, 6 Jun 2017 15:20:33 +0000 (17:20 +0200)]
relax this test again (still encounter erratic failure)
Jakub Zelenka [Sun, 4 Jun 2017 17:11:49 +0000 (18:11 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
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:59 +0000 (15:08 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 3 Jun 2017 13:08:42 +0000 (15:08 +0200)]
Fix leak in WDDX serialization
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.
Nikita Popov [Fri, 2 Jun 2017 22:42:18 +0000 (00:42 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
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.
Nikita Popov [Fri, 2 Jun 2017 22:05:35 +0000 (00:05 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
libnex [Mon, 29 May 2017 13:13:52 +0000 (13:13 +0000)]
Fixed bug #73473: Stack Buffer Overflow in msgfmt_parse_message
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).