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

diff --git a/tests/negotiation_001.phpt b/tests/negotiation_001.phpt
index 88e6ec4..df42ff6 100644
--- a/tests/negotiation_001.phpt
+++ b/tests/negotiation_001.phpt
@@ -4,35 +4,52 @@ negotiation
 <?php
 include 'skip.inc';
 ?>
---ENV--
-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--
 <?php
 echo "-TEST\n";
+$_SERVER['HTTP_ACCEPT'] = 'application/xml, application/xhtml+xml, text/html ; q = .8';
+$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'de-AT,de-DE;q=0.8,en-GB;q=0.3,en-US;q=0.2';
+$_SERVER['HTTP_ACCEPT_CHARSET'] = 'ISO-8859-1,utf-8;q=0.7,*;q=0.7';
 $langs = array(
 	array('de', 'en', 'es'),
 );
 $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));
+print_r($lresult);
+print_r($cresult);
+print_r($tresult);
 echo "Done\n";
 --EXPECTF--
 %sTEST
 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"
 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