X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=tests%2Fnegotiation_001.phpt;h=3c2a6d0b2e9c8d4698be647a09d0a409eda5499b;hp=88e6ec45b164986e3cd5e38fee515150fbaefdb3;hb=ec0bb29f312b0f825a44c059fa6a8e2d1cd708bb;hpb=5efb94c93bc4c1d4873706958962acc4313477f3

diff --git a/tests/negotiation_001.phpt b/tests/negotiation_001.phpt
index 88e6ec4..3c2a6d0 100644
--- a/tests/negotiation_001.phpt
+++ b/tests/negotiation_001.phpt
@@ -3,8 +3,10 @@ negotiation
 --SKIPIF--
 <?php
 include 'skip.inc';
+checkmin("5.2.5");
 ?>
 --ENV--
+HTTP_ACCEPT=application/xml, application/xhtml+xml, text/html ; q = .8
 HTTP_ACCEPT_LANGUAGE=de-AT,de-DE;q=0.8,en-GB;q=0.3,en-US;q=0.2
 HTTP_ACCEPT_CHARSET=ISO-8859-1,utf-8;q=0.7,*;q=0.7
 --FILE--
@@ -16,23 +18,47 @@ $langs = array(
 $csets = array(
 	array('utf-8', 'iso-8859-1'),
 );
+$ctype = array(
+	array('foo/bar', 'application/xhtml+xml', 'text/html')
+);
 var_dump(http_negotiate_language($langs[0]));
-print_r(http_negotiate_language($langs[0], true));
+var_dump(http_negotiate_language($langs[0], $lresult));
 var_dump(http_negotiate_charset($csets[0]));
-print_r(http_negotiate_charset($csets[0], true));
+var_dump(http_negotiate_charset($csets[0], $cresult));
+var_dump(http_negotiate_content_type($ctype[0]));
+var_dump(http_negotiate_content_type($ctype[0], $tresult));
+var_dump(http_negotiate_language(array("unknown")));
+var_dump(http_negotiate_charset(array("unknown")));
+var_dump(http_negotiate_content_type(array("unknown")));
+print_r($lresult);
+print_r($cresult);
+print_r($tresult);
 echo "Done\n";
+?>
 --EXPECTF--
-%sTEST
+%aTEST
+string(2) "de"
 string(2) "de"
+string(10) "iso-8859-1"
+string(10) "iso-8859-1"
+string(21) "application/xhtml+xml"
+string(21) "application/xhtml+xml"
+string(7) "unknown"
+string(7) "unknown"
+string(7) "unknown"
 Array
 (
-    [de] => 500
-    [en] => 0.15
+    [de] => 900
+    [en] => 0.27
 )
-string(10) "iso-8859-1"
 Array
 (
     [iso-8859-1] => 1000
     [utf-8] => 0.7
 )
+Array
+(
+    [application/xhtml+xml] => 999
+    [text/html] => 0.8
+)
 Done