helly Fri Dec 23 20:03:31 2005 EDT
Added files:
/php-src/ext/xml/tests bug32001b.phpt
Modified files:
/php-src/ext/xml/tests bug32001.phpt
Log:
- Fix test by splitting it
http://cvs.php.net/viewcvs.cgi/php-src/ext/xml/tests/bug32001.phpt?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/xml/tests/bug32001.phpt
diff -u php-src/ext/xml/tests/bug32001.phpt:1.9
php-src/ext/xml/tests/bug32001.phpt:1.10
--- php-src/ext/xml/tests/bug32001.phpt:1.9 Wed Dec 21 10:50:10 2005
+++ php-src/ext/xml/tests/bug32001.phpt Fri Dec 23 20:03:31 2005
@@ -1,11 +1,9 @@
--TEST--
-Bug #32001 (xml_parse*() goes into infinite loop when autodetection in effect)
+Bug #32001 (xml_parse*() goes into infinite loop when autodetection in
effect), using UTF-*
--SKIPIF--
<?php
require_once("skipif.inc");
- if (!extension_loaded('iconv')) {
- die ("skip iconv extension not available\n");
- }
+if (!extension_loaded('iconv')) die ("skip iconv extension not available");
?>
--FILE--
<?php
@@ -150,12 +148,6 @@
new testcase("UTF-16LE", 1, 0, 0),
new testcase("UTF-16LE", 1, 1, 0),
new testcase("UTF-16LE", 1, 1, 1),
- new testcase("EUC-JP" , 0),
- new testcase("EUC-JP" , 1),
- new testcase("Shift_JIS", 0),
- new testcase("Shift_JIS", 1),
- new testcase("GB2312", 0),
- new testcase("GB2312", 1),
);
if (XML_SAX_IMPL == 'libxml') {
@@ -414,75 +406,3 @@
[2]=>
string(42) "e38386e382b9e383883ae38386e382b9e3838833: "
}
-Encoding: EUC-JP
-XML Prologue: present
-Chunk size: all data at once
-BOM: not prepended
-array(3) {
- [0]=>
- string(128) "e38386e382b9e383883ae38386e382b9e3838831:
687474703a2f2f7777772e6578616d706c652e636f6d2fe38386e382b9e383882f,
e38386e382b9e38388"
- [1]=>
- string(60) "e38386e382b9e383883ae38386e382b9e3838832: e38386e382b9e38388"
- [2]=>
- string(42) "e38386e382b9e383883ae38386e382b9e3838833: "
-}
-Encoding: EUC-JP
-XML Prologue: present
-Chunk size: 1 byte(s)
-BOM: not prepended
-array(3) {
- [0]=>
- string(128) "e38386e382b9e383883ae38386e382b9e3838831:
687474703a2f2f7777772e6578616d706c652e636f6d2fe38386e382b9e383882f,
e38386e382b9e38388"
- [1]=>
- string(60) "e38386e382b9e383883ae38386e382b9e3838832: e38386e382b9e38388"
- [2]=>
- string(42) "e38386e382b9e383883ae38386e382b9e3838833: "
-}
-Encoding: Shift_JIS
-XML Prologue: present
-Chunk size: all data at once
-BOM: not prepended
-array(3) {
- [0]=>
- string(128) "e38386e382b9e383883ae38386e382b9e3838831:
687474703a2f2f7777772e6578616d706c652e636f6d2fe38386e382b9e383882f,
e38386e382b9e38388"
- [1]=>
- string(60) "e38386e382b9e383883ae38386e382b9e3838832: e38386e382b9e38388"
- [2]=>
- string(42) "e38386e382b9e383883ae38386e382b9e3838833: "
-}
-Encoding: Shift_JIS
-XML Prologue: present
-Chunk size: 1 byte(s)
-BOM: not prepended
-array(3) {
- [0]=>
- string(128) "e38386e382b9e383883ae38386e382b9e3838831:
687474703a2f2f7777772e6578616d706c652e636f6d2fe38386e382b9e383882f,
e38386e382b9e38388"
- [1]=>
- string(60) "e38386e382b9e383883ae38386e382b9e3838832: e38386e382b9e38388"
- [2]=>
- string(42) "e38386e382b9e383883ae38386e382b9e3838833: "
-}
-Encoding: GB2312
-XML Prologue: present
-Chunk size: all data at once
-BOM: not prepended
-array(3) {
- [0]=>
- string(128) "e38386e382b9e383883ae38386e382b9e3838831:
687474703a2f2f7777772e6578616d706c652e636f6d2fe38386e382b9e383882f,
e38386e382b9e38388"
- [1]=>
- string(60) "e38386e382b9e383883ae38386e382b9e3838832: e38386e382b9e38388"
- [2]=>
- string(42) "e38386e382b9e383883ae38386e382b9e3838833: "
-}
-Encoding: GB2312
-XML Prologue: present
-Chunk size: 1 byte(s)
-BOM: not prepended
-array(3) {
- [0]=>
- string(128) "e38386e382b9e383883ae38386e382b9e3838831:
687474703a2f2f7777772e6578616d706c652e636f6d2fe38386e382b9e383882f,
e38386e382b9e38388"
- [1]=>
- string(60) "e38386e382b9e383883ae38386e382b9e3838832: e38386e382b9e38388"
- [2]=>
- string(42) "e38386e382b9e383883ae38386e382b9e3838833: "
-}
http://cvs.php.net/viewcvs.cgi/php-src/ext/xml/tests/bug32001b.phpt?view=markup&rev=1.1
Index: php-src/ext/xml/tests/bug32001b.phpt
+++ php-src/ext/xml/tests/bug32001b.phpt
--TEST--
Bug #32001 (xml_parse*() goes into infinite loop when autodetection in effect),
using EUC-JP, Shift_JIS, GB2312
--SKIPIF--
<?php
require_once("skipif.inc");
if (!extension_loaded('iconv')) die ("skip iconv extension not available");
foreach(array('EUC-JP', 'Shift_JISP', 'GB2312') as $encoding) {
if (@xml_parser_create($encoding) === false) die("skip libxml2 does not
support $encoding encoding");
}
?>
--FILE--
<?php
class testcase {
private $encoding;
private $bom;
private $prologue;
private $tags;
private $chunk_size;
function testcase($enc, $chunk_size = 0, $bom = 0, $omit_prologue = 0) {
$this->encoding = $enc;
$this->chunk_size = $chunk_size;
$this->bom = $bom;
$this->prologue = !$omit_prologue;
$this->tags = array();
}
function start_element($parser, $name, $attrs) {
$attrs = array_map('bin2hex', $attrs);
$this->tags[] = bin2hex($name).": ".implode(', ', $attrs);
}
function end_element($parser, $name) {
}
function run() {
$data = '';
if ($this->prologue) {
$canonical_name = preg_replace('/BE|LE/i', '',
$this->encoding);
$data .= "<?xml version=\"1.0\"
encoding=\"$canonical_name\" ?>\n";
}
$data .= <<<HERE
<ãã¹ã:ãã¹ã1 xmlns:ãã¹ã="http://www.example.com/ãã¹ã/";
ãã¹ã="ãã¹ã">
<ãã¹ã:ãã¹ã2 ãã¹ã="ãã¹ã">
<ãã¹ã:ãã¹ã3>
test!
</ãã¹ã:ãã¹ã3>
</ãã¹ã:ãã¹ã2>
</ãã¹ã:ãã¹ã1>
HERE;
$data = iconv("UTF-8", $this->encoding, $data);
$parser = xml_parser_create(NULL);
xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
xml_set_element_handler($parser, "start_element",
"end_element");
xml_set_object($parser, $this);
if ($this->chunk_size == 0) {
$success = @xml_parse($parser, $data, true);
} else {
for ($offset = 0; $offset < strlen($data);
$offset += $this->chunk_size) {
$success = @xml_parse($parser, substr($data,
$offset, $this->chunk_size), false);
if (!$success) {
break;
}
}
if ($success) {
$success = @xml_parse($parser, "", true);
}
}
echo "Encoding: $this->encoding\n";
echo "XML Prologue: ".($this->prologue ? 'present': 'not
present'), "\n";
echo "Chunk size: ".($this->chunk_size ? "$this->chunk_size
byte(s)\n": "all data at once\n");
echo "BOM: ".($this->bom ? 'prepended': 'not prepended'), "\n";
if ($success) {
var_dump($this->tags);
} else {
echo "[Error] ",
xml_error_string(xml_get_error_code($parser)), "\n";
}
}
}
$suite = array(
new testcase("EUC-JP" , 0),
new testcase("EUC-JP" , 1),
new testcase("Shift_JIS", 0),
new testcase("Shift_JIS", 1),
new testcase("GB2312", 0),
new testcase("GB2312", 1),
);
if (XML_SAX_IMPL == 'libxml') {
$php = getenv('TEST_PHP_EXECUTABLE');
preg_match("/^libxml2 Version.*\$/im", `$php -i`, $match);
echo $match[0], "\n";
} else {
echo "libxml2 Version => NONE\n";
}
foreach ($suite as $testcase) {
$testcase->run();
}
// vim600: sts=4 sw=4 ts=4 encoding=UTF-8
?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
libxml2 Version => %s
Encoding: EUC-JP
XML Prologue: present
Chunk size: all data at once
BOM: not prepended
array(3) {
[0]=>
string(128) "e38386e382b9e383883ae38386e382b9e3838831:
687474703a2f2f7777772e6578616d706c652e636f6d2fe38386e382b9e383882f,
e38386e382b9e38388"
[1]=>
string(60) "e38386e382b9e383883ae38386e382b9e3838832: e38386e382b9e38388"
[2]=>
string(42) "e38386e382b9e383883ae38386e382b9e3838833: "
}
Encoding: EUC-JP
XML Prologue: present
Chunk size: 1 byte(s)
BOM: not prepended
array(3) {
[0]=>
string(128) "e38386e382b9e383883ae38386e382b9e3838831:
687474703a2f2f7777772e6578616d706c652e636f6d2fe38386e382b9e383882f,
e38386e382b9e38388"
[1]=>
string(60) "e38386e382b9e383883ae38386e382b9e3838832: e38386e382b9e38388"
[2]=>
string(42) "e38386e382b9e383883ae38386e382b9e3838833: "
}
Encoding: Shift_JIS
XML Prologue: present
Chunk size: all data at once
BOM: not prepended
array(3) {
[0]=>
string(128) "e38386e382b9e383883ae38386e382b9e3838831:
687474703a2f2f7777772e6578616d706c652e636f6d2fe38386e382b9e383882f,
e38386e382b9e38388"
[1]=>
string(60) "e38386e382b9e383883ae38386e382b9e3838832: e38386e382b9e38388"
[2]=>
string(42) "e38386e382b9e383883ae38386e382b9e3838833: "
}
Encoding: Shift_JIS
XML Prologue: present
Chunk size: 1 byte(s)
BOM: not prepended
array(3) {
[0]=>
string(128) "e38386e382b9e383883ae38386e382b9e3838831:
687474703a2f2f7777772e6578616d706c652e636f6d2fe38386e382b9e383882f,
e38386e382b9e38388"
[1]=>
string(60) "e38386e382b9e383883ae38386e382b9e3838832: e38386e382b9e38388"
[2]=>
string(42) "e38386e382b9e383883ae38386e382b9e3838833: "
}
Encoding: GB2312
XML Prologue: present
Chunk size: all data at once
BOM: not prepended
array(3) {
[0]=>
string(128) "e38386e382b9e383883ae38386e382b9e3838831:
687474703a2f2f7777772e6578616d706c652e636f6d2fe38386e382b9e383882f,
e38386e382b9e38388"
[1]=>
string(60) "e38386e382b9e383883ae38386e382b9e3838832: e38386e382b9e38388"
[2]=>
string(42) "e38386e382b9e383883ae38386e382b9e3838833: "
}
Encoding: GB2312
XML Prologue: present
Chunk size: 1 byte(s)
BOM: not prepended
array(3) {
[0]=>
string(128) "e38386e382b9e383883ae38386e382b9e3838831:
687474703a2f2f7777772e6578616d706c652e636f6d2fe38386e382b9e383882f,
e38386e382b9e38388"
[1]=>
string(60) "e38386e382b9e383883ae38386e382b9e3838832: e38386e382b9e38388"
[2]=>
string(42) "e38386e382b9e383883ae38386e382b9e3838833: "
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
