]>
granicus.if.org Git - php/log
Pedro Magalhães [Sat, 6 Oct 2018 14:58:32 +0000 (15:58 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Remove unstable dns tests
Pedro Magalhães [Fri, 5 Oct 2018 15:24:55 +0000 (16:24 +0100)]
Remove unstable dns tests
Pedro Magalhães [Fri, 5 Oct 2018 00:09:39 +0000 (01:09 +0100)]
Fix #76888 - Remove unstable test
Anatol Belski [Fri, 5 Oct 2018 20:59:55 +0000 (22:59 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 5 Oct 2018 20:57:45 +0000 (22:57 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Add test for bug #76942
Anatol Belski [Fri, 5 Oct 2018 20:57:27 +0000 (22:57 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 5 Oct 2018 20:51:58 +0000 (22:51 +0200)]
Add test for bug #76942
Anatol Belski [Fri, 5 Oct 2018 20:52:53 +0000 (22:52 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Add test for bug #76942
Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
Anatol Belski [Fri, 5 Oct 2018 20:51:58 +0000 (22:51 +0200)]
Add test for bug #76942
Anatol Belski [Fri, 5 Oct 2018 20:50:34 +0000 (22:50 +0200)]
Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
ref bug #74484
Nikita Popov [Fri, 5 Oct 2018 16:41:16 +0000 (18:41 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Manuel Mausz [Thu, 4 Oct 2018 16:40:26 +0000 (18:40 +0200)]
Fix #76972: FTP data truncation due to forceful ssl socket shutdown
Do a correct bidirectional shutdown instead
Anatol Belski [Wed, 3 Oct 2018 16:49:52 +0000 (18:49 +0200)]
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:49:13 +0000 (18:49 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:48:40 +0000 (18:48 +0200)]
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 12:34:08 +0000 (14:34 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Avoid code duplication and don't miss env restore
Anatol Belski [Wed, 3 Oct 2018 12:32:52 +0000 (14:32 +0200)]
Avoid code duplication and don't miss env restore
Remi Collet [Wed, 3 Oct 2018 10:59:01 +0000 (12:59 +0200)]
bump zip extension version
Anatol Belski [Wed, 3 Oct 2018 10:13:22 +0000 (12:13 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
Anatol Belski [Wed, 3 Oct 2018 10:11:43 +0000 (12:11 +0200)]
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
Nikita Popov [Wed, 3 Oct 2018 08:50:16 +0000 (10:50 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Wed, 3 Oct 2018 08:48:42 +0000 (10:48 +0200)]
Reflection: Copy invoke function also in the variadic case
It doesn't matter how the parameters are provided, we always have
to copy the trampoline invoke function.
Nikita Popov [Tue, 2 Oct 2018 16:19:53 +0000 (18:19 +0200)]
Fixed bug #66430
Nikita Popov [Tue, 2 Oct 2018 15:47:07 +0000 (17:47 +0200)]
Fixed bug #76936
Nikita Popov [Sun, 30 Sep 2018 18:07:44 +0000 (20:07 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Sun, 30 Sep 2018 18:05:30 +0000 (20:05 +0200)]
Fixed bug #75479
Wrap the zend_signal_init() call, so the hook arguments line up.
James Titcumb [Sat, 29 Sep 2018 17:14:53 +0000 (19:14 +0200)]
Fix reflection arguments for sodium_memzero function
Nikita Popov [Fri, 28 Sep 2018 17:16:03 +0000 (19:16 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 28 Sep 2018 17:14:47 +0000 (19:14 +0200)]
Fixed bug #76946
Sara Golemon [Fri, 28 Sep 2018 15:32:41 +0000 (11:32 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Bump versions for 7.1.24-dev
Sara Golemon [Fri, 28 Sep 2018 15:31:22 +0000 (11:31 -0400)]
Bump versions for 7.1.24-dev
Nikita Popov [Fri, 28 Sep 2018 11:41:06 +0000 (13:41 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 28 Sep 2018 11:39:43 +0000 (13:39 +0200)]
Fix test for release builds
Nikita Popov [Fri, 28 Sep 2018 10:57:45 +0000 (12:57 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 28 Sep 2018 10:56:47 +0000 (12:56 +0200)]
Fixed bug #76846
Sara Golemon [Tue, 25 Sep 2018 20:37:41 +0000 (16:37 -0400)]
Bump version
Sara Golemon [Tue, 25 Sep 2018 16:09:38 +0000 (12:09 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76918 Repeated parameter name in arg info
Sara Golemon [Tue, 25 Sep 2018 15:18:24 +0000 (11:18 -0400)]
Fixed bug #76918 Repeated parameter name in arg info
Christopher Jones [Mon, 24 Sep 2018 10:53:11 +0000 (20:53 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 10:52:58 +0000 (20:52 +1000)]
Terminate smart string correctly
This is related to Zend VM regression bug #75881. The regression was fixed in the VM, so there is no user visible change from the termination correction.
Christopher Jones [Mon, 24 Sep 2018 10:06:05 +0000 (20:06 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 10:05:54 +0000 (20:05 +1000)]
Make usable for PECL OCI8 release for PHP 7.x
Christopher Jones [Mon, 24 Sep 2018 07:06:59 +0000 (17:06 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 07:06:29 +0000 (17:06 +1000)]
Backport master branch comment typo fix
Christopher Jones [Mon, 24 Sep 2018 07:01:20 +0000 (17:01 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 07:01:13 +0000 (17:01 +1000)]
Make tests portable across PHP 7.x versions
Christopher Jones [Mon, 24 Sep 2018 06:52:26 +0000 (16:52 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 06:52:17 +0000 (16:52 +1000)]
Remove $id from phpinfo as already done in PHP-7.3
Christopher Jones [Mon, 24 Sep 2018 06:38:47 +0000 (16:38 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 06:38:39 +0000 (16:38 +1000)]
And strip trailing tabs too...
Christopher Jones [Mon, 24 Sep 2018 06:00:04 +0000 (16:00 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 05:59:52 +0000 (15:59 +1000)]
Sync EXPECT usage with PHP-7.3
Christopher Jones [Mon, 24 Sep 2018 03:27:35 +0000 (13:27 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 03:27:27 +0000 (13:27 +1000)]
Remove trailing whitespace to help keep branches in sync
Christopher Jones [Sun, 23 Sep 2018 23:56:53 +0000 (09:56 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Sun, 23 Sep 2018 23:37:46 +0000 (09:37 +1000)]
Remove trailing whitespace to help keep branches in sycn
Christoph M. Becker [Sat, 22 Sep 2018 13:30:08 +0000 (15:30 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #66828: iconv_mime_encode Q-encoding longer than it should be
Christoph M. Becker [Sat, 22 Sep 2018 13:20:20 +0000 (15:20 +0200)]
Fix #66828: iconv_mime_encode Q-encoding longer than it should be
Before the fix for bug 48289 has been applied, the algorithm to
construct a Q-encoded-word has been optimistic, i.e. try to encode as
many bytes that *may* fit in the remaining space, calculate the actual
length of the Q-encoded word, and if it's too long, try again with a
reduced size. However, the fix for the mentioned bug replaced this by
a pessimistic algorithm, which always terminates[1] the for loop[2]
during the first iteration (which renders the following 3 lines as dead
code), and as such easily produces unnecessarily short encoded-words.
Instead the proper fix for the bug would have been to make sure that
`out_size` is always decremented, if the space isn't sufficient for the
encoded-word.
[1] <https://github.com/php/php-src/blob/php-7.3.0beta3/ext/iconv/iconv.c#L1421>
[2] <https://github.com/php/php-src/blob/php-7.3.0beta3/ext/iconv/iconv.c#L1360>
Nikita Popov [Wed, 19 Sep 2018 10:31:46 +0000 (12:31 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Mon, 17 Sep 2018 14:36:05 +0000 (16:36 +0200)]
Fix getColumnMeta() test
Newer MySQL versions are stricter about invalid values. Three issues
are fixed:
* Don't use negative values with ZEROFILL. ZEROFILL implies UNSIGNED.
* Use a legal TIMESTAMP value. TIMESTAMP does not accept a Unix timestamp.
* Specify BIGINT values as strings, to avoid overflows.
This is a cherry-pick of
d2dc0a32911c0e08986da799ce11e18c3fa5ca57 from master.
Nikita Popov [Wed, 19 Sep 2018 09:31:42 +0000 (11:31 +0200)]
Fix intermittent failures in mysqli_stmt_bind_result_format.phpt
There were two distinct issues here:
* $trend was compared against 'NULL' using !=, which does not work
as intended in the case where $trend==0.0.
* current_targets was declared as double(17,0), which means that
the fractional part was rounded, so that the same comparison in
SQL (rounded) and in PHP (not rounded) did not necessarily
match.
Please don't write mt_rand based tests, it takes ages to debug this
crap...
Nikita Popov [Wed, 19 Sep 2018 07:38:17 +0000 (09:38 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Wed, 19 Sep 2018 07:37:04 +0000 (09:37 +0200)]
Fixed bug #76901
get_method() may modify the object pointer passed to it if method
forwarding is used. In this case we do not want to modify the
passed zval, so make sure that we copy the object into a temporary
first.
Nikita Popov [Tue, 18 Sep 2018 18:50:27 +0000 (20:50 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Manabu Matsui [Wed, 22 Nov 2017 02:07:15 +0000 (11:07 +0900)]
Fix bug #75533: array_reduce is slow when $carry is large array
Anatol Belski [Tue, 18 Sep 2018 08:45:18 +0000 (10:45 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Add spectre switch for suitable vc14 versions
Anatol Belski [Tue, 18 Sep 2018 08:43:52 +0000 (10:43 +0200)]
Add spectre switch for suitable vc14 versions
Pierrick Charron [Tue, 18 Sep 2018 00:30:18 +0000 (20:30 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
Pierrick Charron [Tue, 18 Sep 2018 00:28:44 +0000 (20:28 -0400)]
Fix 76480: Use curl_multi_wait() so that timeouts are respected
Thomas Petazzoni [Thu, 5 Apr 2018 20:50:00 +0000 (22:50 +0200)]
Fix #76886: Can't build xmlrpc with expat
We fix it by including "php.h" in the HAVE_LIBEXPAT case.
Dmitry Stogov [Fri, 14 Sep 2018 07:28:31 +0000 (10:28 +0300)]
Fixed bug #76800 (foreach inconsistent if array modified during loop)
Anatol Belski [Thu, 13 Sep 2018 17:26:49 +0000 (19:26 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync version for vc++ 15.9
Anatol Belski [Thu, 13 Sep 2018 17:25:23 +0000 (19:25 +0200)]
Sync version for vc++ 15.9
Anatol Belski [Wed, 12 Sep 2018 17:59:20 +0000 (19:59 +0200)]
Backport changes for OpenSSL 1.1.1 CI integration
Add debug message for failing test parts
(cherry picked from commit
a45169a6ba54b13484d70cb474679c96347f779b )
Show all unmatched errors when test failed
(cherry picked from commit
70159652541c62b5f3bbb26da76b7e56987b2544 )
More possibly colliding libs to remove from the test image
(cherry picked from commit
3008ad1a49210e4604522a987cbdd27a5a0a2c42 )
Remove colliding file from CI image
(cherry picked from commit
6220d21c3420ff0d7366d410920ba5279fba3893 )
Fix typo
(cherry picked from commit
24517d82cf8dc708d08bc77435ad418de4bdff4e )
Anatol Belski [Wed, 12 Sep 2018 14:24:38 +0000 (16:24 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Improve error code matching
Anatol Belski [Wed, 12 Sep 2018 14:22:22 +0000 (16:22 +0200)]
Improve error code matching
Anatol Belski [Wed, 12 Sep 2018 10:11:07 +0000 (12:11 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update binary SDK version for AppVeyor
Anatol Belski [Wed, 12 Sep 2018 10:09:32 +0000 (12:09 +0200)]
Update binary SDK version for AppVeyor
Ferenc Kovacs [Tue, 11 Sep 2018 22:04:40 +0000 (00:04 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Ferenc Kovacs [Tue, 11 Sep 2018 22:02:18 +0000 (00:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Tue, 11 Sep 2018 22:00:46 +0000 (00:00 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Tue, 11 Sep 2018 21:58:17 +0000 (23:58 +0200)]
5.6.39 will be the next
Anatol Belski [Tue, 11 Sep 2018 05:01:18 +0000 (07:01 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
7.0.33 next
Anatol Belski [Tue, 11 Sep 2018 05:00:48 +0000 (07:00 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
7.0.33 next
Anatol Belski [Tue, 11 Sep 2018 05:00:15 +0000 (07:00 +0200)]
7.0.33 next
Anatol Belski [Mon, 10 Sep 2018 14:58:02 +0000 (16:58 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync NEWS [ci skip]
Anatol Belski [Mon, 10 Sep 2018 14:57:24 +0000 (16:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Sync NEWS [ci skip]
Anatol Belski [Mon, 10 Sep 2018 14:56:37 +0000 (16:56 +0200)]
Sync NEWS [ci skip]
Remi Collet [Mon, 10 Sep 2018 13:30:51 +0000 (15:30 +0200)]
add NEWS for 76582
Stanislav Malyshev [Sun, 9 Sep 2018 19:29:29 +0000 (12:29 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Fix for bug #76582
Stanislav Malyshev [Sun, 9 Sep 2018 19:29:23 +0000 (12:29 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Update NEWS
Fix for bug #76582
Stanislav Malyshev [Sun, 9 Sep 2018 19:27:44 +0000 (12:27 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Update NEWS
Fix for bug #76582
Stanislav Malyshev [Sun, 9 Sep 2018 19:19:38 +0000 (12:19 -0700)]
Update NEWS
Stanislav Malyshev [Sun, 29 Jul 2018 05:16:29 +0000 (22:16 -0700)]
Fix for bug #76582
The brigade seems to end up in a messed up state if something fails
in shutdown, so we clean it up.
Jakub Zelenka [Sun, 9 Sep 2018 17:58:23 +0000 (18:58 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Sun, 9 Sep 2018 17:53:37 +0000 (18:53 +0100)]
Fix ssl stream reneg limit test to print only after first renegotiation
It has been reported that in some setup the test does multiple
renegotiations which is allowed.
Christoph M. Becker [Sat, 8 Sep 2018 17:08:59 +0000 (19:08 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
Christoph M. Becker [Sat, 8 Sep 2018 16:27:57 +0000 (18:27 +0200)]
Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
Whenever we return with `PSFS_PASS_ON`, we need to update
`bytes_consumed` to not mislead the caller. Instead of fixing the
respective `if` clauses, we eschew the early bail-outs to simplify the
code a bit.
Nikita Popov [Fri, 7 Sep 2018 12:02:03 +0000 (14:02 +0200)]
Fixed bug #76796
Anatol Belski [Wed, 5 Sep 2018 19:29:53 +0000 (21:29 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync with recent changes to default libcurl build