php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6'

Browse Source 
* PHP-5.6:
  fix dir separator in test
  fork test for windows
  update for LiteSpeed
  update for LiteSpeed
This commit is contained in:
Anatol Belski
2014-11-24 16:27:43 +01:00
parent 99818a576f 3578e5b250
commit 7582b57c87
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/exif/tests/bug68113.phpt
+3 -3
View File
@@ -10,8 +10,8 @@ var_dump(exif_thumbnail(__DIR__."/bug68113.jpg"));
?>
Done
--EXPECTF--
Warning: exif_thumbnail(bug68113.jpg): File structure corrupted in %s/bug68113.php on line 2
Warning: exif_thumbnail(bug68113.jpg): File structure corrupted in %s%ebug68113.php on line 2
Warning: exif_thumbnail(bug68113.jpg): Invalid JPEG file in %s/bug68113.php on line 2
Warning: exif_thumbnail(bug68113.jpg): Invalid JPEG file in %s%ebug68113.php on line 2
bool(false)
Done
Done
ext/iconv/tests/iconv_basic_001-win32.phpt
+19
View File
@@ -0,0 +1,19 @@
--TEST--
Test the basics to function iconv.
--CREDITS--
Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
--SKIPIF--
<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
<?php if(substr(PHP_OS, 0, 3) != 'WIN' ) {die('skip windows only test');} ?>
--FILE--
<?php
$in_charset = 'UTF-8';
$out_charset = 'ASCII//TRANSLIT';
$string_to_translate = 'Žluťoučký kůň\n';
$string_out = iconv($in_charset, $out_charset, $string_to_translate);
var_dump($string_out);
?>
--EXPECT--
string(16) "Zlutouck'y kun\n"
ext/iconv/tests/iconv_basic_001.phpt
+2 -1
View File
@@ -4,6 +4,7 @@ Test the basics to function iconv.
Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
--SKIPIF--
<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
<?php if(substr(PHP_OS, 0, 3) == 'WIN' ) {die('skip not for windows');} ?>
--FILE--
<?php
$in_charset = 'UTF-8';
@@ -15,4 +16,4 @@ $string_out = iconv($in_charset, $out_charset, $string_to_translate);
var_dump($string_out);
?>
--EXPECT--
string(15) "Zlutoucky kun\n"
string(15) "Zlutoucky kun\n"