← Back to branch summary

~james-page/ubuntu/natty/tomcat6/fix-662588

« back to all changes in this revision

Viewing changes to java/org/apache/coyote/http11/InternalAprInputBuffer.java

  • Committer: Bazaar Package Importer
  • Author(s): Mathias Gug, Iulian Udrea
  • Date: 2009-06-09 12:35:19 UTC
  • mfrom: (1.2.1 upstream) (2.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20090609123519-7owjbso5ttnka6ur
Tags: 6.0.20-1ubuntu1
https://launchpad.net/bugs/385262
[ Iulian Udrea ]
* Merge from debian unstable (LP: #385262), remaining changes:
  - debian/control, debian/rules: Use default-jdk to build
  - debian/control: Run using default-jre-headless by default

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/coyote/http11/InternalAprInputBuffer.java
403
403
                    throw new EOFException(sm.getString("iib.eof.error"));
404
404
            }
405
405
 
 
406
            // Spec says no CR or LF in method name
 
407
            if (buf[pos] == Constants.CR || buf[pos] == Constants.LF) {
 
408
                throw new IllegalArgumentException(
 
409
                        sm.getString("iib.invalidmethod"));
 
410
            }
406
411
            // Spec says single SP but it also says be tolerant of HT
407
412
            if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
408
413
                space = true;
751
756
        if (parsingHeader) {
752
757
 
753
758
            if (lastValid == buf.length) {
754
 
                throw new IOException
 
759
                throw new IllegalArgumentException
755
760
                    (sm.getString("iib.requestheadertoolarge.error"));
756
761
            }
757
762