Author: kkolinko Date: Fri Aug 31 13:58:15 2012 New Revision: 1379451 URL: http://svn.apache.org/viewvc?rev=1379451&view=rev Log: Merged revision 1378322 from tomcat/trunk: Correct Javadoc for code added in r423453 (s/after trailer mark/before trailer mark/, and do not say 'trailer' as in the spec the term "trailer" has other meaning)
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1378322 Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1379451&r1=1379450&r2=1379451&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java Fri Aug 31 13:58:15 2012 @@ -281,12 +281,14 @@ public class ChunkedInputFilter implemen /** * Parse the header of a chunk. - * A chunk header can look like - * A10CRLF + * A chunk header can look like one of the following:<br /> + * A10CRLF<br /> * F23;chunk-extension to be ignoredCRLF - * The letters before CRLF but after the trailer mark, must be valid hex digits, - * we should not parse F23IAMGONNAMESSTHISUP34CRLF as a valid header - * according to spec + * + * <p> + * The letters before CRLF or ';' (whatever comes first) must be valid hex + * digits. We should not parse F23IAMGONNAMESSTHISUP34CRLF as a valid + * header according to the spec. */ protected boolean parseChunkHeader() throws IOException { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org