JETTY-376 allow anything but CRLF in reason string

jetty-project · Sep 4, 2007 · 0d2592e · 0d2592e
1 parent 72d4182
commit 0d2592e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -22,6 +22,7 @@ jetty-SNAPSHOT
  + Cached user agents strings in the /org/mortbay/jetty/useragents resource
  + Make default time format for RequestLog match NCSA default
  + JETTY-311 avoid json keywords
+ + JETTY-376 allow anything but CRLF in reason string
  + JETTY-398 Allow same WADI Dispatcher to be used across multiple web-app contexts
  + JETTY-400 consume CGI stderr
  + JETTY-402 keep HashUserRealm in sync with file

diff --git a/modules/jetty/src/main/java/org/mortbay/jetty/AbstractGenerator.java b/modules/jetty/src/main/java/org/mortbay/jetty/AbstractGenerator.java
@@ -361,8 +361,11 @@ public void setResponse(int status, String reason)
             for (int i=0;i<len;i++)
             {
                 char ch = reason.charAt(i);
-                if (ch==' ' || Character.isJavaIdentifierPart(ch))
+                if (ch!='\r'&&ch!='\n')
                     _reason.put((byte)ch);
+                else
+
+                    _reason.put((byte)' ');
             }
         }
     }

diff --git a/modules/jetty/src/test/java/org/mortbay/jetty/HttpGeneratorTest.java b/modules/jetty/src/test/java/org/mortbay/jetty/HttpGeneratorTest.java
@@ -78,7 +78,7 @@ public void testHTTP()
                         endp.reset();
                         fields.clear();
 
-                        tr[r].build(v,hb,null,connect[c],null,chunks, fields);
+                        tr[r].build(v,hb,"OK\r\nTest",connect[c],null,chunks, fields);
                         String response=endp.getOut().toString();
                         // System.out.println("RESPONSE: "+t+"\n"+response+(hb.isPersistent()?"...\n":"---\n"));
 
@@ -109,6 +109,9 @@ public void testHTTP()
                         else
                             assertTrue(t,hb.isPersistent() ||  c==2 || c==3);
 
+                        if (v>9)
+                            assertEquals("OK  Test",f2);
+
                         assertTrue(t,tr[r].values[1]==null || content.length()==Integer.parseInt(tr[r].values[1]));
                     }
                 }
@@ -199,7 +202,6 @@ public String toString()
       /* 7 */  new TR(200,"text/html",""+CONTENT.length(),CONTENT),
     };
 
-
     String content;
     String f0;
     String f1;