diff options
| author | Anatol Belski <ab@php.net> | 2014-12-13 19:43:45 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-13 19:43:45 +0100 |
| commit | bb66f385d09e7e55390e9f57fcbca08f6b43ff91 (patch) | |
| tree | 54defb44e55c1ebc0afa15aa60758d87a4b9ce3b /ext/iconv | |
| parent | dfb18b1188492efa48ade07029172c5535f65f93 (diff) | |
| parent | 0ea0b591d79ae0ee18d33533a5c701330836ff6b (diff) | |
| download | php-git-bb66f385d09e7e55390e9f57fcbca08f6b43ff91.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (37 commits)
NEWS
NEWS
Fix bug #68601 buffer read overflow in gd_gif_in.c
Fixed compilation warnings
Removed unnecessary checks
pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary
Merged PR #911.
Removed ZEND_ACC_FINAL_CLASS which is unnecessary. This also fixed some currently defined classes as final which were just not being considered as such before.
Updated NEWS
Updated NEWS
Updated NEWS
Fix bug #68532: convert.base64-encode omits padding bytes
Updated NEWS
Updated NEWS
Updated NEWS
Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)
Updated NEWS
Updated NEWS
Fix MySQLi tests
Fixed gd test
...
Diffstat (limited to 'ext/iconv')
4 files changed, 15 insertions, 38 deletions
diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt index 5ceb801bed..4c771dbb23 100644 --- a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt +++ b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt @@ -2,6 +2,7 @@ Test iconv_mime_encode() function : usage variations - Pass different data types to mode arg --SKIPIF-- <?php +PHP_INT_SIZE == 4 or die('skip'); extension_loaded('iconv') or die('skip'); function_exists('iconv_mime_decode_headers') or die("skip iconv_mime_decode_headers() is not available in this build"); ?> @@ -234,23 +235,9 @@ array(5) { } -- Iteration 7 -- -array(5) { - ["Subject"]=> - string(13) "A Sample Test" - ["To"]=> - string(19) "example@example.com" - ["Date"]=> - string(30) "Thu, 1 Jan 1970 00:00:00 +0000" - ["Message-Id"]=> - string(21) "<example@example.com>" - ["Received"]=> - array(2) { - [0]=> - string(204) "from localhost (localhost [127.0.0.1]) by localhost with SMTP id example for <example@example.com>; Thu, 1 Jan 1970 00:00:00 +0000 (UTC) (envelope-from example-return-0000-example=example.com@example.com)" - [1]=> - string(57) "(qmail 0 invoked by uid 65534); 1 Thu 2003 00:00:00 +0000" - } -} + +Warning: iconv_mime_decode_headers() expects parameter 2 to be long, double given in %s on line %d +bool(false) -- Iteration 8 -- array(5) { @@ -476,4 +463,4 @@ array(5) { Warning: iconv_mime_decode_headers() expects parameter 2 to be long, resource given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt index c4a9cc434a..0f604c4f2f 100644 --- a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt +++ b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt @@ -2,6 +2,7 @@ Test iconv_mime_encode() function : usage variations - Pass different data types to charset arg --SKIPIF-- <?php +PHP_INT_SIZE == 4 or die('skip'); extension_loaded('iconv') or die('skip'); function_exists('iconv_mime_decode_headers') or die("skip iconv_mime_decode_headers() is not available in this build"); ?> @@ -237,23 +238,9 @@ array(5) { } -- Iteration 7 -- -array(5) { - ["Subject"]=> - string(13) "A Sample Test" - ["To"]=> - string(19) "example@example.com" - ["Date"]=> - string(30) "Thu, 1 Jan 1970 00:00:00 +0000" - ["Message-Id"]=> - string(21) "<example@example.com>" - ["Received"]=> - array(2) { - [0]=> - string(204) "from localhost (localhost [127.0.0.1]) by localhost with SMTP id example for <example@example.com>; Thu, 1 Jan 1970 00:00:00 +0000 (UTC) (envelope-from example-return-0000-example=example.com@example.com)" - [1]=> - string(57) "(qmail 0 invoked by uid 65534); 1 Thu 2003 00:00:00 +0000" - } -} + +Warning: iconv_mime_decode_headers() expects parameter 2 to be long, double given in %s on line %d +bool(false) -- Iteration 8 -- array(5) { @@ -479,4 +466,4 @@ array(5) { Warning: iconv_mime_decode_headers() expects parameter 2 to be long, resource given in %s on line %d bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_mime_decode_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_variation2.phpt index 1d828227ae..a779ecc436 100644 --- a/ext/iconv/tests/iconv_mime_decode_variation2.phpt +++ b/ext/iconv/tests/iconv_mime_decode_variation2.phpt @@ -2,6 +2,7 @@ Test iconv_mime_decode() function : usage variations - Pass different data types to mode arg --SKIPIF-- <?php +PHP_INT_SIZE == 4 or die('skip'); extension_loaded('iconv') or die('skip'); function_exists('iconv_mime_decode') or die("skip iconv_mime_decode() is not available in this build"); ?> @@ -126,7 +127,9 @@ string(52) "5375626a6563743a205072c3bc66756e67205072c3bc66756e67" string(52) "5375626a6563743a205072c3bc66756e67205072c3bc66756e67" -- Iteration 7 -- -string(52) "5375626a6563743a205072c3bc66756e67205072c3bc66756e67" + +Warning: iconv_mime_decode() expects parameter 2 to be long, double given in %s on line %d +string(0) "" -- Iteration 8 -- string(52) "5375626a6563743a205072c3bc66756e67205072c3bc66756e67" diff --git a/ext/iconv/tests/iconv_strpos_variation3.phpt b/ext/iconv/tests/iconv_strpos_variation3.phpt index 3c333bfa57..221b3a733f 100644 --- a/ext/iconv/tests/iconv_strpos_variation3.phpt +++ b/ext/iconv/tests/iconv_strpos_variation3.phpt @@ -131,7 +131,7 @@ bool(false) -- Iteration 7 -- -Warning: iconv_strpos(): Offset not contained in string. in %s on line %d +Warning: iconv_strpos() expects parameter 3 to be long, double given in %s on line %d bool(false) -- Iteration 8 -- |