cvs: pear /HTTP HTTP.php
| From: | Martin Jansen | Date: | Mon, 11 Feb 2002 13:14:55 +0000 |
| Subject: | cvs: pear /HTTP HTTP.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-2388@lists.php.net to get a copy of this message | ||
mj Mon Feb 11 08:14:55 2002 EDT
Modified files:
/pear/HTTP HTTP.php
Log:
* Yet another "same package in two repositories" merge.
Index: pear/HTTP/HTTP.php
diff -u pear/HTTP/HTTP.php:1.6 pear/HTTP/HTTP.php:1.7
--- pear/HTTP/HTTP.php:1.6 Tue Dec 11 14:45:47 2001
+++ pear/HTTP/HTTP.php Mon Feb 11 08:14:55 2002
@@ -17,7 +17,7 @@
// | |
// +----------------------------------------------------------------------+
//
-// $Id: HTTP.php,v 1.6 2001/12/11 19:45:47 sebastian Exp $
+// $Id: HTTP.php,v 1.7 2002/02/11 13:14:55 mj Exp $
//
/**
@@ -26,7 +26,7 @@
* Provides functions needed for HTTP-Connections
*
* @access public
-* @version $Revision: 1.6 $
+* @version $Revision: 1.7 $
* @package HTTP
*/
class HTTP
@@ -53,30 +53,30 @@
* Negotiate language with the user's browser through the
* Accept-Language HTTP header or the user's host address.
* Language codes are generally in the form "ll" for a language
- * spoken in only one country, or "ll_CC" for a language spoken in
- * a particular country. For example, U.S. English is "en_US",
- * while British English is "en_UK". Portugese as spoken in
- * Portugal is "pt_PT", while Brazilian Portugese is "pt_BR".
+ * spoken in only one country, or "ll-CC" for a language spoken in
+ * a particular country. For example, U.S. English is "en-US",
+ * while British English is "en-UK". Portugese as spoken in
+ * Portugal is "pt-PT", while Brazilian Portugese is "pt-BR".
* Two-letter country codes can be found in the ISO 3166 standard.
*
* Quantities in the Accept-Language: header are supported, for
* example:
*
- * Accept-Language: en_UK;q=0.7, en_US;q=0.6, no;q=1.0, dk;q=0.8
+ * Accept-Language: en-UK;q=0.7, en-US;q=0.6, no;q=1.0, dk;q=0.8
*
* @param array $supported an associative array indexed by language
* codes (country codes) supported by the application. Values
* must evaluate to true.
*
* @param string $default the default language to use if none is found
- * during negotiation, defaults to "en_US" for U.S. English
+ * during negotiation, defaults to "en-US" for U.S. English
*
* @return array contains all possible languages
*
* @author Stig Bakken <ssb@fast.no>
* @access public
*/
- function negotiateLanguage(&$supported, $default = 'en_US')
+ function negotiateLanguage(&$supported, $default = 'en-US')
{
global $HTTP_SERVER_VARS;