From 8ac1db0e1bb48c49c49167b25041294f0f5477b9 Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 1 Feb 2011 22:12:18 +0000
Subject: [PATCH] Improve HTTP specification compliance

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1066244 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/connector/Request.java | 7 ++++++-
 webapps/docs/changelog.xml                      | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java
index e2c2399b5..231219499 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -3005,7 +3005,12 @@ public class Request
             int semi = entry.indexOf(";q=");
             if (semi >= 0) {
                 try {
-                    quality = Double.parseDouble(entry.substring(semi + 3));
+                    String strQuality = entry.substring(semi + 3);
+                    if (strQuality.length() <= 5) {
+                        quality = Double.parseDouble(strQuality);
+                    } else {
+                        quality = 0.0;
+                    }
                 } catch (NumberFormatException e) {
                     quality = 0.0;
                 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5b7f1c9d5..fd6d004f7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,10 @@
         to <code>false</code> in the Host where a web application is deployed.
         (markt)
       </fix>
+      <fix>
+        Improve HTTP specification compliance in support of
+        <code>Accept-Language</code> header. (kkolinko)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">
-- 
2.11.0