synch from 6.0

http://svn.apache.org/viewvc?view=rev&rev=543307
http://svn.apache.org/viewvc?view=rev&rev=553410

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@558127 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java b/java/org/apache/catalina/valves/ErrorReportValve.java
index e12d1e2..4b140d7 100644 (file)
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -104,7 +104,7 @@ public class ErrorReportValve
         Throwable throwable =
             (Throwable) request.getAttribute(Globals.EXCEPTION_ATTR);
 
-        if (response.isAppCommitted()) {
+        if (response.isCommitted()) {
             return;
         }
 

diff --git a/java/org/apache/tomcat/util/http/ServerCookie.java b/java/org/apache/tomcat/util/http/ServerCookie.java
index 26188bc..1c19a3a 100644 (file)
--- a/java/org/apache/tomcat/util/http/ServerCookie.java
+++ b/java/org/apache/tomcat/util/http/ServerCookie.java
@@ -130,6 +130,7 @@ public class ServerCookie implements Serializable {
     //
     // private static final String tspecials = "()<>@,;:\\\"/[]?={} \t";
     private static final String tspecials = ",; ";
+    private static final String tspecials2 = ",; \"";
 
     /*
      * Tests a string and returns true if the string counts as a
@@ -154,6 +155,19 @@ public class ServerCookie implements Serializable {
        return true;
     }
 
+    public static boolean isToken2(String value) {
+       if( value==null) return true;
+       int len = value.length();
+
+       for (int i = 0; i < len; i++) {
+           char c = value.charAt(i);
+
+           if (c < 0x20 || c >= 0x7f || tspecials2.indexOf(c) != -1)
+               return false;
+       }
+       return true;
+    }
+
     public static boolean checkName( String name ) {
        if (!isToken(name)
                || name.equalsIgnoreCase("Comment")     // rfc2019
@@ -213,7 +227,7 @@ public class ServerCookie implements Serializable {
         // this part is the same for all cookies
        buf.append( name );
         buf.append("=");
-        maybeQuote(version, buf, value);
+        maybeQuote2(version, buf, value);
 
        // XXX Netscape cookie: "; "
        // add version 1 specific information
@@ -283,6 +297,17 @@ public class ServerCookie implements Serializable {
             buf.append('"');
         }
     }
+    public static void maybeQuote2 (int version, StringBuffer buf,
+            String value) {
+        // special case - a \n or \r  shouldn't happen in any case
+        if (isToken2(value)) {
+            buf.append(value);
+        } else {
+            buf.append('"');
+            buf.append(escapeDoubleQuotes(value));
+            buf.append('"');
+        }
+    }
 
     // log
     static final int dbg=1;
@@ -306,12 +331,14 @@ public class ServerCookie implements Serializable {
         }
 
         StringBuffer b = new StringBuffer();
+        char p = s.charAt(0);
         for (int i = 0; i < s.length(); i++) {
             char c = s.charAt(i);
-            if (c == '"')
+            if (c == '"' && p != '\\')
                 b.append('\\').append('"');
             else
                 b.append(c);
+            p = c;
         }
 
         return b.toString();