]>
granicus.if.org Git - php/log
Christoph M. Becker [Sat, 6 Oct 2018 09:05:41 +0000 (11:05 +0200)]
Fix #76975: preg_match difference between 7.3 and < 7.3 - II
[ci skip]
Anatol Belski [Fri, 5 Oct 2018 21:01:03 +0000 (23:01 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 5 Oct 2018 21:00:24 +0000 (23:00 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
Add test for bug #76942
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:53:11 +0000 (22:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add test for bug #76942
Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
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
twosee [Mon, 1 Oct 2018 11:22:25 +0000 (19:22 +0800)]
Optimize MySQL statement execute without parameters
Nikita Popov [Fri, 5 Oct 2018 16:41:42 +0000 (18:41 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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
Remi Collet [Thu, 4 Oct 2018 09:45:35 +0000 (11:45 +0200)]
Allow to disable pcre.jit when system library is used
as it is for now broken on some arch (s390x...)
Pierrick Charron [Thu, 4 Oct 2018 01:18:47 +0000 (21:18 -0400)]
Update NEWS [ci skip]
Pierrick Charron [Wed, 3 Oct 2018 23:43:59 +0000 (19:43 -0400)]
Add constants from curl 7.50 to 7.55
Christoph M. Becker [Wed, 3 Oct 2018 22:30:10 +0000 (00:30 +0200)]
libzip has been unbundled in master only
Cf. <https://github.com/php/php-src/pull/3532>.
Anatol Belski [Wed, 3 Oct 2018 16:54:08 +0000 (18:54 +0200)]
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:51:48 +0000 (18:51 +0200)]
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:50:24 +0000 (18:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS [ci skip]
Update NEWS [ci skip]
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:35:38 +0000 (14:35 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Avoid code duplication and don't miss env restore
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:31 +0000 (12:59 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
bump zip extension version
Remi Collet [Wed, 3 Oct 2018 10:59:01 +0000 (12:59 +0200)]
bump zip extension version
Anatol Belski [Wed, 3 Oct 2018 10:15:15 +0000 (12:15 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
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:27 +0000 (10:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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.
Anatol Belski [Tue, 2 Oct 2018 22:15:43 +0000 (00:15 +0200)]
Fixed bug #76947 file_put_contents() blocks the directory of the file (__DIR__)
The condition was wrong. The target buffer size only matters, when some
output is going to be copied into it.
Nikita Popov [Tue, 2 Oct 2018 16:20:15 +0000 (18:20 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 2 Oct 2018 16:19:53 +0000 (18:19 +0200)]
Fixed bug #66430
Nikita Popov [Tue, 2 Oct 2018 15:48:56 +0000 (17:48 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 2 Oct 2018 15:47:07 +0000 (17:47 +0200)]
Fixed bug #76936
Nikita Popov [Tue, 2 Oct 2018 14:13:51 +0000 (16:13 +0200)]
Fixed bug #76958
Nikita Popov [Tue, 2 Oct 2018 14:07:22 +0000 (16:07 +0200)]
Don't fall back to vtbl_pass if no matching vtbl found
If we don't know how to convert between two encodings, make sure
we error instead of ignoring the issue.
Explicitly use vtbl_pass if we are round-tripping wchar->wchar or
8bit->8bit. Fingers crossed that nothing else relies on the
vtbl_pass fallback...
Nikita Popov [Sun, 30 Sep 2018 18:07:58 +0000 (20:07 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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.
Nikita Popov [Sat, 29 Sep 2018 19:20:01 +0000 (21:20 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
James Titcumb [Sat, 29 Sep 2018 17:14:53 +0000 (19:14 +0200)]
Fix reflection arguments for sodium_memzero function
Nikita Popov [Sat, 29 Sep 2018 12:15:58 +0000 (14:15 +0200)]
Fixed bug #72635
This seems to be a simple oversight, where we did not enable
exceptions. Other constexpr conditions already throw, so there is
no particular reason to stick to a fatal error here.
Nikita Popov [Fri, 28 Sep 2018 17:17:43 +0000 (19:17 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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:56 +0000 (11:32 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Bump versions for 7.1.24-dev
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:29 +0000 (13:41 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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:58:46 +0000 (12:58 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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:43:40 +0000 (16:43 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Bump version
Sara Golemon [Tue, 25 Sep 2018 20:37:41 +0000 (16:37 -0400)]
Bump version
Sara Golemon [Tue, 25 Sep 2018 16:10:21 +0000 (12:10 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #76918 Repeated parameter name in arg info
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
Christoph M. Becker [Tue, 25 Sep 2018 09:29:01 +0000 (11:29 +0200)]
Update NEWS wrt. php-7.3.0RC2 tagging
Christopher Jones [Mon, 24 Sep 2018 10:53:31 +0000 (20:53 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
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:14:05 +0000 (20:14 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
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:07:06 +0000 (17:07 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
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:02:36 +0000 (17:02 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
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:33 +0000 (16:52 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
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:41:35 +0000 (16:41 +1000)]
Merge branch 'PHP-7.2' into 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:02:19 +0000 (16:02 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
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:33:54 +0000 (13:33 +1000)]
Merge branch 'PHP-7.2' into 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:57:20 +0000 (09:57 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
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
Anatol Belski [Sun, 23 Sep 2018 09:42:07 +0000 (11:42 +0200)]
[ci skip] Update NEWS
Christoph M. Becker [Sat, 22 Sep 2018 13:43:06 +0000 (15:43 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #66828: iconv_mime_encode Q-encoding longer than it should be
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>
Anatol Belski [Sat, 22 Sep 2018 00:10:43 +0000 (02:10 +0200)]
Fix test and add skip section
Anatol Belski [Fri, 21 Sep 2018 13:57:00 +0000 (15:57 +0200)]
Add test for bug #76909