diff options
| author | Anatol Belski <ab@php.net> | 2017-03-27 19:42:24 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-03-27 19:42:24 +0200 |
| commit | 6508320936ab5e9694b7d282a57462179a0fb1bc (patch) | |
| tree | b86f01633379125cf7ae583b9b6c5a96d3876231 | |
| parent | e9e860a05be187862a0213f8c6c58aff2293bb22 (diff) | |
| parent | ee8b5de5a0d12b7ee19676e553ba87cc4c324662 (diff) | |
| download | php-git-6508320936ab5e9694b7d282a57462179a0fb1bc.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
deps updated, cherry-pick 88642decf9ab59d206db515990886b0761bfa835
add test for bug #74230
| -rw-r--r-- | ext/curl/tests/check_win_config.phpt | 2 | ||||
| -rw-r--r-- | ext/intl/tests/bug74230.phpt | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/ext/curl/tests/check_win_config.phpt b/ext/curl/tests/check_win_config.phpt index fc1c66609a..98f3e92f91 100644 --- a/ext/curl/tests/check_win_config.phpt +++ b/ext/curl/tests/check_win_config.phpt @@ -40,7 +40,7 @@ SPNEGO => Yes SSL => Yes
SSPI => Yes
TLS-SRP => No
-HTTP2 => No
+HTTP2 => Yes
GSSAPI => No
KERBEROS5 => Yes
UNIX_SOCKETS => No
diff --git a/ext/intl/tests/bug74230.phpt b/ext/intl/tests/bug74230.phpt new file mode 100644 index 0000000000..70ef6ae39a --- /dev/null +++ b/ext/intl/tests/bug74230.phpt @@ -0,0 +1,22 @@ +--TEST-- +Bug #74230 iconv fails to fail on surrogates +--SKIPIF-- +<?php if(!extension_loaded('iconv')) print 'skip'; ?> +--FILE-- +<?php + +$high = "\xED\xa1\x92"; // codepoint D852 +$low = "\xED\xBD\xA2"; // codepoint DF62 +$pair = $high.$low; +var_dump( + @\iconv('UTF-8', 'UTF-8', $high) === false, + @\iconv('UTF-8', 'UTF-8', $low) === false, + @\iconv('UTF-8', 'UTF-8', $pair) === false +); + +?> +--EXPECT-- +bool(true) +bool(true) +bool(true) + |