remm 02/04/04 09:46:09
Modified: catalina/src/share/org/apache/catalina/connector/http Tag:
tomcat_40_branch HttpProcessor.java
catalina/src/share/org/apache/catalina/connector/http10 Tag:
tomcat_40_branch HttpProcessor.java
Log:
- Port language variant support to the old HTTP connectors.
- Patch submitted by Ryan Lubke.
Revision Changes Path
No revision
No revision
1.36.2.5 +15 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java
Index: HttpProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
retrieving revision 1.36.2.4
retrieving revision 1.36.2.5
diff -u -r1.36.2.4 -r1.36.2.5
--- HttpProcessor.java 28 Feb 2002 04:24:21 -0000 1.36.2.4
+++ HttpProcessor.java 4 Apr 2002 17:46:08 -0000 1.36.2.5
@@ -1,6 +1,6 @@
-/* * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
1.36.2.4 2002/02/28 04:24:21 remm Exp $
- * $Revision: 1.36.2.4 $
- * $Date: 2002/02/28 04:24:21 $
+/* * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
1.36.2.5 2002/04/04 17:46:08 remm Exp $
+ * $Revision: 1.36.2.5 $
+ * $Date: 2002/04/04 17:46:08 $
*
* ====================================================================
*
@@ -106,7 +106,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.36.2.4 $ $Date: 2002/02/28 04:24:21 $
+ * @version $Revision: 1.36.2.5 $ $Date: 2002/04/04 17:46:08 $
*/
final class HttpProcessor
@@ -486,17 +486,27 @@
// Extract the language and country for this entry
String language = null;
String country = null;
+ String variant = null;
int dash = entry.indexOf('-');
if (dash < 0) {
language = entry;
country = "";
+ variant = "";
} else {
language = entry.substring(0, dash);
country = entry.substring(dash + 1);
+ int vDash = country.indexOf('-');
+ if (vDash > 0) {
+ String cTemp = country.substring(0, vDash);
+ variant = country.substring(vDash + 1);
+ country = cTemp;
+ } else {
+ variant = "";
+ }
}
// Add a new Locale to the list of Locales for this quality level
- Locale locale = new Locale(language, country);
+ Locale locale = new Locale(language, country, variant);
Double key = new Double(-quality); // Reverse the order
ArrayList values = (ArrayList) locales.get(key);
if (values == null) {
No revision
No revision
1.4.2.2 +12 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java
Index: HttpProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- HttpProcessor.java 9 Dec 2001 22:01:34 -0000 1.4.2.1
+++ HttpProcessor.java 4 Apr 2002 17:46:09 -0000 1.4.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java,v
1.4.2.1 2001/12/09 22:01:34 remm Exp $
- * $Revision: 1.4.2.1 $
- * $Date: 2001/12/09 22:01:34 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java,v
1.4.2.2 2002/04/04 17:46:09 remm Exp $
+ * $Revision: 1.4.2.2 $
+ * $Date: 2002/04/04 17:46:09 $
*
* ====================================================================
*
@@ -104,7 +104,7 @@
* the request. When the processor is completed, it will recycle itself.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4.2.1 $ $Date: 2001/12/09 22:01:34 $
+ * @version $Revision: 1.4.2.2 $ $Date: 2002/04/04 17:46:09 $
*/
final class HttpProcessor
@@ -451,12 +451,19 @@
while (le.hasMoreElements()) {
String language = (String)le.nextElement();
String country = "";
+ String variant = "";
int countryIndex = language.indexOf('-');
if (countryIndex > -1) {
country = language.substring(countryIndex + 1).trim();
language = language.substring(0, countryIndex).trim();
+ int vDash = country.indexOf("-");
+ if (vDash > 0) {
+ String cTemp = country.substring(0, vDash);
+ variant = country.substring(vDash + 1);
+ country = cTemp;
+ }
}
- request.addLocale(new Locale(language, country));
+ request.addLocale(new Locale(language, country, variant));
}
}
} else if (match.equals("cookie")) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
