Nikita Popov
9f3ea20320
Merge branch 'PHP-7.2' into PHP-7.3
2018-10-03 10:50:27 +02:00
Nikita Popov
54aa76167b
Merge branch 'PHP-7.1' into PHP-7.2
2018-10-03 10:50:16 +02:00
Nikita Popov
945f315506
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.
2018-10-03 10:48:42 +02:00
Nikita Popov
a42801abe3
Merge branch 'PHP-7.2' into PHP-7.3
2018-10-02 18:20:25 +02:00
Nikita Popov
f0647edd88
Fixed bug #66430
2018-10-02 18:19:53 +02:00
Nikita Popov
b8392803f9
Merge branch 'PHP-7.2' into PHP-7.3
2018-10-02 17:48:56 +02:00
Nikita Popov
d2477b284b
Fixed bug #76936
2018-10-02 17:47:07 +02:00
Nikita Popov
26f82a7706
Fixed bug #76958
2018-10-02 16:13:51 +02:00
Nikita Popov
9cfd8f43c2
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...
2018-10-02 16:07:22 +02:00
Nikita Popov
b617a5b2ea
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-29 21:20:01 +02:00
James Titcumb
950c338f80
Fix reflection arguments for sodium_memzero function
2018-09-29 21:19:42 +02:00
Sara Golemon
913c20e61f
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed bug #76918 Repeated parameter name in arg info
2018-09-25 12:10:21 -04:00
Sara Golemon
4baf4964ad
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #76918 Repeated parameter name in arg info
2018-09-25 12:09:38 -04:00
Sara Golemon
b5d0eb44c0
Fixed bug #76918 Repeated parameter name in arg info
2018-09-25 11:18:24 -04:00
Christopher Jones
1d67577f4d
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 20:53:31 +10:00
Christopher Jones
682d0f8325
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 20:53:11 +10:00
Christopher Jones
9e56a3373e
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.
2018-09-24 20:52:58 +10:00
Christopher Jones
e6fae9e6f9
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 20:14:05 +10:00
Christopher Jones
4ba1fc0a11
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 20:06:05 +10:00
Christopher Jones
91954c24da
Make usable for PECL OCI8 release for PHP 7.x
2018-09-24 20:05:54 +10:00
Christopher Jones
3413e7d1d8
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 17:07:06 +10:00
Christopher Jones
28b89afca1
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 17:06:59 +10:00
Christopher Jones
57eb25b393
Backport master branch comment typo fix
2018-09-24 17:06:29 +10:00
Christopher Jones
28ecd4e1c7
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 17:02:36 +10:00
Christopher Jones
d7b060e995
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 17:01:20 +10:00
Christopher Jones
3d497f884f
Make tests portable across PHP 7.x versions
2018-09-24 17:01:13 +10:00
Christopher Jones
a370e7d0ad
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 16:52:26 +10:00
Christopher Jones
338802b543
Remove $id from phpinfo as already done in PHP-7.3
2018-09-24 16:52:17 +10:00
Christopher Jones
d7b87cd995
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 16:41:35 +10:00
Christopher Jones
fc296a27db
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 16:38:47 +10:00
Christopher Jones
37652336c7
And strip trailing tabs too...
2018-09-24 16:38:39 +10:00
Christopher Jones
aae4ccb030
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 16:02:19 +10:00
Christopher Jones
d2b04c1749
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 16:00:04 +10:00
Christopher Jones
bdd67d8175
Sync EXPECT usage with PHP-7.3
2018-09-24 15:59:52 +10:00
Christopher Jones
45ab3d3ad3
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 13:33:54 +10:00
Christopher Jones
f396d297aa
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 13:27:35 +10:00
Christopher Jones
a2c0f8722b
Remove trailing whitespace to help keep branches in sync
2018-09-24 13:27:27 +10:00
Christopher Jones
826702417d
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-24 09:57:20 +10:00
Christopher Jones
f68662f63f
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-24 09:56:53 +10:00
Christopher Jones
eceb34073b
Remove trailing whitespace to help keep branches in sycn
2018-09-24 09:37:46 +10:00
Christoph M. Becker
150e2b8c8c
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #66828 : iconv_mime_encode Q-encoding longer than it should be
2018-09-22 15:56:49 +02:00
Christoph M. Becker
7c2cc9aa56
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #66828 : iconv_mime_encode Q-encoding longer than it should be
2018-09-22 15:31:02 +02:00
Christoph M. Becker
9cbe1283f7
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 >
2018-09-22 15:20:20 +02:00
Anatol Belski
9f3aac9e39
Fix test and add skip section
2018-09-22 02:10:43 +02:00
Anatol Belski
9c58ab37c7
Add test for bug #76909
2018-09-21 15:57:00 +02:00
Anatol Belski
7a02ecb7fe
Fixed bug #76909 preg_match difference between 7.3 and < 7.3
...
Applied upstream patch, see https://bugs.exim.org/show_bug.cgi?id=2321
2018-09-21 15:55:03 +02:00
Anatol Belski
91b2b6c65d
Upgrade PCRE2 to 10.32
...
(cherry picked from commit d918e0776b
2018-09-21 15:54:14 +02:00
Dmitry Stogov
b8ffa3707c
Fixed bug #76711 (OPcache enabled triggers false-positive "Illegal string offset")
2018-09-20 12:33:46 +03:00
Nikita Popov
f5729ec532
Merge branch 'PHP-7.2' into PHP-7.3
2018-09-19 12:31:55 +02:00
Nikita Popov
c26902911f
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-19 12:31:46 +02:00
