commons-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chtom...@apache.org
Subject svn commit: r1013975 [23/26] - in /websites/production/commons/content/proper/commons-fileupload: ./ apidocs/ apidocs/org/apache/commons/fileupload/ apidocs/org/apache/commons/fileupload/class-use/ apidocs/org/apache/commons/fileupload/disk/ apidocs/or...
Date Tue, 13 Jun 2017 12:53:22 GMT
Modified: websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/MultipartStream.html
==============================================================================
--- websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/MultipartStream.html (original)
+++ websites/production/commons/content/proper/commons-fileupload/xref/org/apache/commons/fileupload/MultipartStream.html Tue Jun 13 12:53:17 2017
@@ -238,807 +238,838 @@
 <a class="jxr_linenumber" name="L230" href="#L230">230</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> byte[] boundary;
 <a class="jxr_linenumber" name="L231" href="#L231">231</a> 
 <a class="jxr_linenumber" name="L232" href="#L232">232</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> <em class="jxr_javadoccomment">     * The length of the buffer used for processing the request.</em>
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> <em class="jxr_javadoccomment">     * The table for Knuth-Morris-Pratt search algorithm</em>
 <a class="jxr_linenumber" name="L234" href="#L234">234</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L235" href="#L235">235</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> bufSize;
+<a class="jxr_linenumber" name="L235" href="#L235">235</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong>[] boundaryTable;
 <a class="jxr_linenumber" name="L236" href="#L236">236</a> 
 <a class="jxr_linenumber" name="L237" href="#L237">237</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> <em class="jxr_javadoccomment">     * The buffer used for processing the request.</em>
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> <em class="jxr_javadoccomment">     * The length of the buffer used for processing the request.</em>
 <a class="jxr_linenumber" name="L239" href="#L239">239</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L240" href="#L240">240</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> byte[] buffer;
+<a class="jxr_linenumber" name="L240" href="#L240">240</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> bufSize;
 <a class="jxr_linenumber" name="L241" href="#L241">241</a> 
 <a class="jxr_linenumber" name="L242" href="#L242">242</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> <em class="jxr_javadoccomment">     * The index of first valid character in the buffer.</em>
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> <em class="jxr_javadoccomment">     * &lt;br&gt;</em>
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> <em class="jxr_javadoccomment">     * 0 &lt;= head &lt; bufSize</em>
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L247" href="#L247">247</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> head;
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> 
-<a class="jxr_linenumber" name="L249" href="#L249">249</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> <em class="jxr_javadoccomment">     * The index of last valid character in the buffer + 1.</em>
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> <em class="jxr_javadoccomment">     * &lt;br&gt;</em>
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> <em class="jxr_javadoccomment">     * 0 &lt;= tail &lt;= bufSize</em>
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L254" href="#L254">254</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> tail;
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> 
-<a class="jxr_linenumber" name="L256" href="#L256">256</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L257" href="#L257">257</a> <em class="jxr_javadoccomment">     * The content encoding to use when reading headers.</em>
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> <em class="jxr_javadoccomment">     * The buffer used for processing the request.</em>
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L245" href="#L245">245</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> byte[] buffer;
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> 
+<a class="jxr_linenumber" name="L247" href="#L247">247</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> <em class="jxr_javadoccomment">     * The index of first valid character in the buffer.</em>
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> <em class="jxr_javadoccomment">     * &lt;br&gt;</em>
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> <em class="jxr_javadoccomment">     * 0 &lt;= head &lt; bufSize</em>
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L252" href="#L252">252</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> head;
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> 
+<a class="jxr_linenumber" name="L254" href="#L254">254</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> <em class="jxr_javadoccomment">     * The index of last valid character in the buffer + 1.</em>
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> <em class="jxr_javadoccomment">     * &lt;br&gt;</em>
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> <em class="jxr_javadoccomment">     * 0 &lt;= tail &lt;= bufSize</em>
 <a class="jxr_linenumber" name="L258" href="#L258">258</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L259" href="#L259">259</a>     <strong class="jxr_keyword">private</strong> String headerEncoding;
+<a class="jxr_linenumber" name="L259" href="#L259">259</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> tail;
 <a class="jxr_linenumber" name="L260" href="#L260">260</a> 
 <a class="jxr_linenumber" name="L261" href="#L261">261</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> <em class="jxr_javadoccomment">     * The progress notifier, if any, or null.</em>
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> <em class="jxr_javadoccomment">     * The content encoding to use when reading headers.</em>
 <a class="jxr_linenumber" name="L263" href="#L263">263</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L264" href="#L264">264</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">ProgressNotifier</a> notifier;
+<a class="jxr_linenumber" name="L264" href="#L264">264</a>     <strong class="jxr_keyword">private</strong> String headerEncoding;
 <a class="jxr_linenumber" name="L265" href="#L265">265</a> 
-<a class="jxr_linenumber" name="L266" href="#L266">266</a>     <em class="jxr_comment">// ----------------------------------------------------------- Constructors</em>
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> 
-<a class="jxr_linenumber" name="L268" href="#L268">268</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> <em class="jxr_javadoccomment">     * Creates a new instance.</em>
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> <em class="jxr_javadoccomment">     * @deprecated 1.2.1 Use {@link #MultipartStream(InputStream, byte[], int,</em>
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> <em class="jxr_javadoccomment">     * ProgressNotifier)}</em>
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L274" href="#L274">274</a>     @Deprecated
-<a class="jxr_linenumber" name="L275" href="#L275">275</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MultipartStream</a>() {
-<a class="jxr_linenumber" name="L276" href="#L276">276</a>         <strong class="jxr_keyword">this</strong>(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L277" href="#L277">277</a>     }
-<a class="jxr_linenumber" name="L278" href="#L278">278</a> 
-<a class="jxr_linenumber" name="L279" href="#L279">279</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> <em class="jxr_javadoccomment">     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a custom size buffer</em>
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> <em class="jxr_javadoccomment">     * and no progress notifier.</em>
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> <em class="jxr_javadoccomment">     * &lt;p&gt; Note that the buffer must be at least big enough to contain the</em>
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> <em class="jxr_javadoccomment">     * boundary string, plus 4 characters for CR/LF and double dash, plus at</em>
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> <em class="jxr_javadoccomment">     * least one byte of data.  Too small a buffer size setting will degrade</em>
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> <em class="jxr_javadoccomment">     * performance.</em>
+<a class="jxr_linenumber" name="L266" href="#L266">266</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> <em class="jxr_javadoccomment">     * The progress notifier, if any, or null.</em>
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L269" href="#L269">269</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">ProgressNotifier</a> notifier;
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> 
+<a class="jxr_linenumber" name="L271" href="#L271">271</a>     <em class="jxr_comment">// ----------------------------------------------------------- Constructors</em>
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> 
+<a class="jxr_linenumber" name="L273" href="#L273">273</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> <em class="jxr_javadoccomment">     * Creates a new instance.</em>
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> <em class="jxr_javadoccomment">     * @deprecated 1.2.1 Use {@link #MultipartStream(InputStream, byte[], int,</em>
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> <em class="jxr_javadoccomment">     * ProgressNotifier)}</em>
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L279" href="#L279">279</a>     @Deprecated
+<a class="jxr_linenumber" name="L280" href="#L280">280</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MultipartStream</a>() {
+<a class="jxr_linenumber" name="L281" href="#L281">281</a>         <strong class="jxr_keyword">this</strong>(<strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L282" href="#L282">282</a>     }
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> 
+<a class="jxr_linenumber" name="L284" href="#L284">284</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> <em class="jxr_javadoccomment">     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a custom size buffer</em>
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> <em class="jxr_javadoccomment">     * and no progress notifier.</em>
 <a class="jxr_linenumber" name="L287" href="#L287">287</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> <em class="jxr_javadoccomment">     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.</em>
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> <em class="jxr_javadoccomment">     * @param boundary The token used for dividing the stream into</em>
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> <em class="jxr_javadoccomment">     *                 &lt;code&gt;encapsulations&lt;/code&gt;.</em>
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> <em class="jxr_javadoccomment">     * @param bufSize  The size of the buffer to be used, in bytes.</em>
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> <em class="jxr_javadoccomment">     * &lt;p&gt; Note that the buffer must be at least big enough to contain the</em>
+<a class="jxr_linenumber" name="L289" href="#L289">289</a> <em class="jxr_javadoccomment">     * boundary string, plus 4 characters for CR/LF and double dash, plus at</em>
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> <em class="jxr_javadoccomment">     * least one byte of data.  Too small a buffer size setting will degrade</em>
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> <em class="jxr_javadoccomment">     * performance.</em>
 <a class="jxr_linenumber" name="L292" href="#L292">292</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> <em class="jxr_javadoccomment">     * @deprecated 1.2.1 Use {@link #MultipartStream(InputStream, byte[], int,</em>
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> <em class="jxr_javadoccomment">     * ProgressNotifier)}.</em>
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L296" href="#L296">296</a>     @Deprecated
-<a class="jxr_linenumber" name="L297" href="#L297">297</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MultipartStream</a>(InputStream input, byte[] boundary, <strong class="jxr_keyword">int</strong> bufSize) {
-<a class="jxr_linenumber" name="L298" href="#L298">298</a>         <strong class="jxr_keyword">this</strong>(input, boundary, bufSize, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L299" href="#L299">299</a>     }
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> 
-<a class="jxr_linenumber" name="L301" href="#L301">301</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> <em class="jxr_javadoccomment">     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a custom size buffer.</em>
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> <em class="jxr_javadoccomment">     * &lt;p&gt; Note that the buffer must be at least big enough to contain the</em>
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> <em class="jxr_javadoccomment">     * boundary string, plus 4 characters for CR/LF and double dash, plus at</em>
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> <em class="jxr_javadoccomment">     * least one byte of data.  Too small a buffer size setting will degrade</em>
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> <em class="jxr_javadoccomment">     * performance.</em>
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> <em class="jxr_javadoccomment">     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.</em>
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> <em class="jxr_javadoccomment">     * @param boundary The token used for dividing the stream into</em>
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> <em class="jxr_javadoccomment">     *                 &lt;code&gt;encapsulations&lt;/code&gt;.</em>
+<a class="jxr_linenumber" name="L296" href="#L296">296</a> <em class="jxr_javadoccomment">     * @param bufSize  The size of the buffer to be used, in bytes.</em>
+<a class="jxr_linenumber" name="L297" href="#L297">297</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> <em class="jxr_javadoccomment">     * @deprecated 1.2.1 Use {@link #MultipartStream(InputStream, byte[], int,</em>
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> <em class="jxr_javadoccomment">     * ProgressNotifier)}.</em>
+<a class="jxr_linenumber" name="L300" href="#L300">300</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L301" href="#L301">301</a>     @Deprecated
+<a class="jxr_linenumber" name="L302" href="#L302">302</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MultipartStream</a>(InputStream input, byte[] boundary, <strong class="jxr_keyword">int</strong> bufSize) {
+<a class="jxr_linenumber" name="L303" href="#L303">303</a>         <strong class="jxr_keyword">this</strong>(input, boundary, bufSize, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L304" href="#L304">304</a>     }
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> 
+<a class="jxr_linenumber" name="L306" href="#L306">306</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> <em class="jxr_javadoccomment">     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a custom size buffer.</em>
 <a class="jxr_linenumber" name="L308" href="#L308">308</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L309" href="#L309">309</a> <em class="jxr_javadoccomment">     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.</em>
-<a class="jxr_linenumber" name="L310" href="#L310">310</a> <em class="jxr_javadoccomment">     * @param boundary The token used for dividing the stream into</em>
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> <em class="jxr_javadoccomment">     *                 &lt;code&gt;encapsulations&lt;/code&gt;.</em>
-<a class="jxr_linenumber" name="L312" href="#L312">312</a> <em class="jxr_javadoccomment">     * @param bufSize  The size of the buffer to be used, in bytes.</em>
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> <em class="jxr_javadoccomment">     * @param pNotifier The notifier, which is used for calling the</em>
-<a class="jxr_linenumber" name="L314" href="#L314">314</a> <em class="jxr_javadoccomment">     *                  progress listener, if any.</em>
-<a class="jxr_linenumber" name="L315" href="#L315">315</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L316" href="#L316">316</a> <em class="jxr_javadoccomment">     * @throws IllegalArgumentException If the buffer size is too small</em>
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> <em class="jxr_javadoccomment">     * @since 1.3.1</em>
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L320" href="#L320">320</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MultipartStream</a>(InputStream input,
-<a class="jxr_linenumber" name="L321" href="#L321">321</a>             byte[] boundary,
-<a class="jxr_linenumber" name="L322" href="#L322">322</a>             <strong class="jxr_keyword">int</strong> bufSize,
-<a class="jxr_linenumber" name="L323" href="#L323">323</a>             <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">ProgressNotifier</a> pNotifier) {
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> 
-<a class="jxr_linenumber" name="L325" href="#L325">325</a>         <strong class="jxr_keyword">if</strong> (boundary == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L326" href="#L326">326</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(<span class="jxr_string">"boundary may not be null"</span>);
-<a class="jxr_linenumber" name="L327" href="#L327">327</a>         }
-<a class="jxr_linenumber" name="L328" href="#L328">328</a>         <em class="jxr_comment">// We prepend CR/LF to the boundary to chop trailing CR/LF from</em>
-<a class="jxr_linenumber" name="L329" href="#L329">329</a>         <em class="jxr_comment">// body-data tokens.</em>
-<a class="jxr_linenumber" name="L330" href="#L330">330</a>         <strong class="jxr_keyword">this</strong>.boundaryLength = boundary.length + BOUNDARY_PREFIX.length;
-<a class="jxr_linenumber" name="L331" href="#L331">331</a>         <strong class="jxr_keyword">if</strong> (bufSize &lt; <strong class="jxr_keyword">this</strong>.boundaryLength + 1) {
-<a class="jxr_linenumber" name="L332" href="#L332">332</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(
-<a class="jxr_linenumber" name="L333" href="#L333">333</a>                     <span class="jxr_string">"The buffer size specified for the MultipartStream is too small"</span>);
-<a class="jxr_linenumber" name="L334" href="#L334">334</a>         }
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> 
-<a class="jxr_linenumber" name="L336" href="#L336">336</a>         <strong class="jxr_keyword">this</strong>.input = input;
-<a class="jxr_linenumber" name="L337" href="#L337">337</a>         <strong class="jxr_keyword">this</strong>.bufSize = Math.max(bufSize, boundaryLength*2);
-<a class="jxr_linenumber" name="L338" href="#L338">338</a>         <strong class="jxr_keyword">this</strong>.buffer = <strong class="jxr_keyword">new</strong> byte[<strong class="jxr_keyword">this</strong>.bufSize];
-<a class="jxr_linenumber" name="L339" href="#L339">339</a>         <strong class="jxr_keyword">this</strong>.notifier = pNotifier;
+<a class="jxr_linenumber" name="L309" href="#L309">309</a> <em class="jxr_javadoccomment">     * &lt;p&gt; Note that the buffer must be at least big enough to contain the</em>
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> <em class="jxr_javadoccomment">     * boundary string, plus 4 characters for CR/LF and double dash, plus at</em>
+<a class="jxr_linenumber" name="L311" href="#L311">311</a> <em class="jxr_javadoccomment">     * least one byte of data.  Too small a buffer size setting will degrade</em>
+<a class="jxr_linenumber" name="L312" href="#L312">312</a> <em class="jxr_javadoccomment">     * performance.</em>
+<a class="jxr_linenumber" name="L313" href="#L313">313</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L314" href="#L314">314</a> <em class="jxr_javadoccomment">     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.</em>
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> <em class="jxr_javadoccomment">     * @param boundary The token used for dividing the stream into</em>
+<a class="jxr_linenumber" name="L316" href="#L316">316</a> <em class="jxr_javadoccomment">     *                 &lt;code&gt;encapsulations&lt;/code&gt;.</em>
+<a class="jxr_linenumber" name="L317" href="#L317">317</a> <em class="jxr_javadoccomment">     * @param bufSize  The size of the buffer to be used, in bytes.</em>
+<a class="jxr_linenumber" name="L318" href="#L318">318</a> <em class="jxr_javadoccomment">     * @param pNotifier The notifier, which is used for calling the</em>
+<a class="jxr_linenumber" name="L319" href="#L319">319</a> <em class="jxr_javadoccomment">     *                  progress listener, if any.</em>
+<a class="jxr_linenumber" name="L320" href="#L320">320</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L321" href="#L321">321</a> <em class="jxr_javadoccomment">     * @throws IllegalArgumentException If the buffer size is too small</em>
+<a class="jxr_linenumber" name="L322" href="#L322">322</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> <em class="jxr_javadoccomment">     * @since 1.3.1</em>
+<a class="jxr_linenumber" name="L324" href="#L324">324</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L325" href="#L325">325</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MultipartStream</a>(InputStream input,
+<a class="jxr_linenumber" name="L326" href="#L326">326</a>             byte[] boundary,
+<a class="jxr_linenumber" name="L327" href="#L327">327</a>             <strong class="jxr_keyword">int</strong> bufSize,
+<a class="jxr_linenumber" name="L328" href="#L328">328</a>             <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">ProgressNotifier</a> pNotifier) {
+<a class="jxr_linenumber" name="L329" href="#L329">329</a> 
+<a class="jxr_linenumber" name="L330" href="#L330">330</a>         <strong class="jxr_keyword">if</strong> (boundary == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L331" href="#L331">331</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(<span class="jxr_string">"boundary may not be null"</span>);
+<a class="jxr_linenumber" name="L332" href="#L332">332</a>         }
+<a class="jxr_linenumber" name="L333" href="#L333">333</a>         <em class="jxr_comment">// We prepend CR/LF to the boundary to chop trailing CR/LF from</em>
+<a class="jxr_linenumber" name="L334" href="#L334">334</a>         <em class="jxr_comment">// body-data tokens.</em>
+<a class="jxr_linenumber" name="L335" href="#L335">335</a>         <strong class="jxr_keyword">this</strong>.boundaryLength = boundary.length + BOUNDARY_PREFIX.length;
+<a class="jxr_linenumber" name="L336" href="#L336">336</a>         <strong class="jxr_keyword">if</strong> (bufSize &lt; <strong class="jxr_keyword">this</strong>.boundaryLength + 1) {
+<a class="jxr_linenumber" name="L337" href="#L337">337</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(
+<a class="jxr_linenumber" name="L338" href="#L338">338</a>                     <span class="jxr_string">"The buffer size specified for the MultipartStream is too small"</span>);
+<a class="jxr_linenumber" name="L339" href="#L339">339</a>         }
 <a class="jxr_linenumber" name="L340" href="#L340">340</a> 
-<a class="jxr_linenumber" name="L341" href="#L341">341</a>         <strong class="jxr_keyword">this</strong>.boundary = <strong class="jxr_keyword">new</strong> byte[<strong class="jxr_keyword">this</strong>.boundaryLength];
-<a class="jxr_linenumber" name="L342" href="#L342">342</a>         <strong class="jxr_keyword">this</strong>.keepRegion = <strong class="jxr_keyword">this</strong>.boundary.length;
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> 
-<a class="jxr_linenumber" name="L344" href="#L344">344</a>         System.arraycopy(BOUNDARY_PREFIX, 0, <strong class="jxr_keyword">this</strong>.boundary, 0,
-<a class="jxr_linenumber" name="L345" href="#L345">345</a>                 BOUNDARY_PREFIX.length);
-<a class="jxr_linenumber" name="L346" href="#L346">346</a>         System.arraycopy(boundary, 0, <strong class="jxr_keyword">this</strong>.boundary, BOUNDARY_PREFIX.length,
-<a class="jxr_linenumber" name="L347" href="#L347">347</a>                 boundary.length);
-<a class="jxr_linenumber" name="L348" href="#L348">348</a> 
-<a class="jxr_linenumber" name="L349" href="#L349">349</a>         head = 0;
-<a class="jxr_linenumber" name="L350" href="#L350">350</a>         tail = 0;
-<a class="jxr_linenumber" name="L351" href="#L351">351</a>     }
-<a class="jxr_linenumber" name="L352" href="#L352">352</a> 
-<a class="jxr_linenumber" name="L353" href="#L353">353</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L354" href="#L354">354</a> <em class="jxr_javadoccomment">     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a default size buffer.</em>
-<a class="jxr_linenumber" name="L355" href="#L355">355</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L356" href="#L356">356</a> <em class="jxr_javadoccomment">     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.</em>
-<a class="jxr_linenumber" name="L357" href="#L357">357</a> <em class="jxr_javadoccomment">     * @param boundary The token used for dividing the stream into</em>
-<a class="jxr_linenumber" name="L358" href="#L358">358</a> <em class="jxr_javadoccomment">     *                 &lt;code&gt;encapsulations&lt;/code&gt;.</em>
-<a class="jxr_linenumber" name="L359" href="#L359">359</a> <em class="jxr_javadoccomment">     * @param pNotifier An object for calling the progress listener, if any.</em>
-<a class="jxr_linenumber" name="L360" href="#L360">360</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L362" href="#L362">362</a> <em class="jxr_javadoccomment">     * @see #MultipartStream(InputStream, byte[], int, ProgressNotifier)</em>
-<a class="jxr_linenumber" name="L363" href="#L363">363</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L364" href="#L364">364</a>     <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MultipartStream</a>(InputStream input,
-<a class="jxr_linenumber" name="L365" href="#L365">365</a>             byte[] boundary,
-<a class="jxr_linenumber" name="L366" href="#L366">366</a>             <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">ProgressNotifier</a> pNotifier) {
-<a class="jxr_linenumber" name="L367" href="#L367">367</a>         <strong class="jxr_keyword">this</strong>(input, boundary, DEFAULT_BUFSIZE, pNotifier);
-<a class="jxr_linenumber" name="L368" href="#L368">368</a>     }
-<a class="jxr_linenumber" name="L369" href="#L369">369</a> 
-<a class="jxr_linenumber" name="L370" href="#L370">370</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L371" href="#L371">371</a> <em class="jxr_javadoccomment">     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a default size buffer.</em>
-<a class="jxr_linenumber" name="L372" href="#L372">372</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L373" href="#L373">373</a> <em class="jxr_javadoccomment">     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.</em>
-<a class="jxr_linenumber" name="L374" href="#L374">374</a> <em class="jxr_javadoccomment">     * @param boundary The token used for dividing the stream into</em>
-<a class="jxr_linenumber" name="L375" href="#L375">375</a> <em class="jxr_javadoccomment">     *                 &lt;code&gt;encapsulations&lt;/code&gt;.</em>
-<a class="jxr_linenumber" name="L376" href="#L376">376</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L377" href="#L377">377</a> <em class="jxr_javadoccomment">     * @deprecated 1.2.1 Use {@link #MultipartStream(InputStream, byte[], int,</em>
-<a class="jxr_linenumber" name="L378" href="#L378">378</a> <em class="jxr_javadoccomment">     *  ProgressNotifier)}.</em>
-<a class="jxr_linenumber" name="L379" href="#L379">379</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L380" href="#L380">380</a>     @Deprecated
-<a class="jxr_linenumber" name="L381" href="#L381">381</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MultipartStream</a>(InputStream input,
-<a class="jxr_linenumber" name="L382" href="#L382">382</a>             byte[] boundary) {
-<a class="jxr_linenumber" name="L383" href="#L383">383</a>         <strong class="jxr_keyword">this</strong>(input, boundary, DEFAULT_BUFSIZE, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L384" href="#L384">384</a>     }
-<a class="jxr_linenumber" name="L385" href="#L385">385</a> 
-<a class="jxr_linenumber" name="L386" href="#L386">386</a>     <em class="jxr_comment">// --------------------------------------------------------- Public methods</em>
-<a class="jxr_linenumber" name="L387" href="#L387">387</a> 
-<a class="jxr_linenumber" name="L388" href="#L388">388</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L389" href="#L389">389</a> <em class="jxr_javadoccomment">     * Retrieves the character encoding used when reading the headers of an</em>
-<a class="jxr_linenumber" name="L390" href="#L390">390</a> <em class="jxr_javadoccomment">     * individual part. When not specified, or &lt;code&gt;null&lt;/code&gt;, the platform</em>
-<a class="jxr_linenumber" name="L391" href="#L391">391</a> <em class="jxr_javadoccomment">     * default encoding is used.</em>
-<a class="jxr_linenumber" name="L392" href="#L392">392</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L393" href="#L393">393</a> <em class="jxr_javadoccomment">     * @return The encoding used to read part headers.</em>
-<a class="jxr_linenumber" name="L394" href="#L394">394</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L395" href="#L395">395</a>     <strong class="jxr_keyword">public</strong> String getHeaderEncoding() {
-<a class="jxr_linenumber" name="L396" href="#L396">396</a>         <strong class="jxr_keyword">return</strong> headerEncoding;
-<a class="jxr_linenumber" name="L397" href="#L397">397</a>     }
-<a class="jxr_linenumber" name="L398" href="#L398">398</a> 
-<a class="jxr_linenumber" name="L399" href="#L399">399</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L400" href="#L400">400</a> <em class="jxr_javadoccomment">     * Specifies the character encoding to be used when reading the headers of</em>
-<a class="jxr_linenumber" name="L401" href="#L401">401</a> <em class="jxr_javadoccomment">     * individual parts. When not specified, or &lt;code&gt;null&lt;/code&gt;, the platform</em>
-<a class="jxr_linenumber" name="L402" href="#L402">402</a> <em class="jxr_javadoccomment">     * default encoding is used.</em>
-<a class="jxr_linenumber" name="L403" href="#L403">403</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L404" href="#L404">404</a> <em class="jxr_javadoccomment">     * @param encoding The encoding used to read part headers.</em>
-<a class="jxr_linenumber" name="L405" href="#L405">405</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L406" href="#L406">406</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setHeaderEncoding(String encoding) {
-<a class="jxr_linenumber" name="L407" href="#L407">407</a>         headerEncoding = encoding;
-<a class="jxr_linenumber" name="L408" href="#L408">408</a>     }
-<a class="jxr_linenumber" name="L409" href="#L409">409</a> 
-<a class="jxr_linenumber" name="L410" href="#L410">410</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L411" href="#L411">411</a> <em class="jxr_javadoccomment">     * Reads a byte from the &lt;code&gt;buffer&lt;/code&gt;, and refills it as</em>
-<a class="jxr_linenumber" name="L412" href="#L412">412</a> <em class="jxr_javadoccomment">     * necessary.</em>
-<a class="jxr_linenumber" name="L413" href="#L413">413</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L414" href="#L414">414</a> <em class="jxr_javadoccomment">     * @return The next byte from the input stream.</em>
-<a class="jxr_linenumber" name="L415" href="#L415">415</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L416" href="#L416">416</a> <em class="jxr_javadoccomment">     * @throws IOException if there is no more data available.</em>
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L418" href="#L418">418</a>     <strong class="jxr_keyword">public</strong> byte readByte() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="L419" href="#L419">419</a>         <em class="jxr_comment">// Buffer depleted ?</em>
-<a class="jxr_linenumber" name="L420" href="#L420">420</a>         <strong class="jxr_keyword">if</strong> (head == tail) {
-<a class="jxr_linenumber" name="L421" href="#L421">421</a>             head = 0;
-<a class="jxr_linenumber" name="L422" href="#L422">422</a>             <em class="jxr_comment">// Refill.</em>
-<a class="jxr_linenumber" name="L423" href="#L423">423</a>             tail = input.read(buffer, head, bufSize);
-<a class="jxr_linenumber" name="L424" href="#L424">424</a>             <strong class="jxr_keyword">if</strong> (tail == -1) {
-<a class="jxr_linenumber" name="L425" href="#L425">425</a>                 <em class="jxr_comment">// No more data available.</em>
-<a class="jxr_linenumber" name="L426" href="#L426">426</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IOException(<span class="jxr_string">"No more data is available"</span>);
-<a class="jxr_linenumber" name="L427" href="#L427">427</a>             }
-<a class="jxr_linenumber" name="L428" href="#L428">428</a>             <strong class="jxr_keyword">if</strong> (notifier != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L429" href="#L429">429</a>                 notifier.noteBytesRead(tail);
-<a class="jxr_linenumber" name="L430" href="#L430">430</a>             }
-<a class="jxr_linenumber" name="L431" href="#L431">431</a>         }
-<a class="jxr_linenumber" name="L432" href="#L432">432</a>         <strong class="jxr_keyword">return</strong> buffer[head++];
-<a class="jxr_linenumber" name="L433" href="#L433">433</a>     }
-<a class="jxr_linenumber" name="L434" href="#L434">434</a> 
-<a class="jxr_linenumber" name="L435" href="#L435">435</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L436" href="#L436">436</a> <em class="jxr_javadoccomment">     * Skips a &lt;code&gt;boundary&lt;/code&gt; token, and checks whether more</em>
-<a class="jxr_linenumber" name="L437" href="#L437">437</a> <em class="jxr_javadoccomment">     * &lt;code&gt;encapsulations&lt;/code&gt; are contained in the stream.</em>
-<a class="jxr_linenumber" name="L438" href="#L438">438</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L439" href="#L439">439</a> <em class="jxr_javadoccomment">     * @return &lt;code&gt;true&lt;/code&gt; if there are more encapsulations in</em>
-<a class="jxr_linenumber" name="L440" href="#L440">440</a> <em class="jxr_javadoccomment">     *         this stream; &lt;code&gt;false&lt;/code&gt; otherwise.</em>
-<a class="jxr_linenumber" name="L441" href="#L441">441</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L442" href="#L442">442</a> <em class="jxr_javadoccomment">     * @throws FileUploadIOException if the bytes read from the stream exceeded the size limits</em>
-<a class="jxr_linenumber" name="L443" href="#L443">443</a> <em class="jxr_javadoccomment">     * @throws MalformedStreamException if the stream ends unexpectedly or</em>
-<a class="jxr_linenumber" name="L444" href="#L444">444</a> <em class="jxr_javadoccomment">     *                                  fails to follow required syntax.</em>
-<a class="jxr_linenumber" name="L445" href="#L445">445</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L446" href="#L446">446</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> readBoundary()
-<a class="jxr_linenumber" name="L447" href="#L447">447</a>             <strong class="jxr_keyword">throws</strong> FileUploadIOException, <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MalformedStreamException</a> {
-<a class="jxr_linenumber" name="L448" href="#L448">448</a>         byte[] marker = <strong class="jxr_keyword">new</strong> byte[2];
-<a class="jxr_linenumber" name="L449" href="#L449">449</a>         <strong class="jxr_keyword">boolean</strong> nextChunk = false;
-<a class="jxr_linenumber" name="L450" href="#L450">450</a> 
-<a class="jxr_linenumber" name="L451" href="#L451">451</a>         head += boundaryLength;
-<a class="jxr_linenumber" name="L452" href="#L452">452</a>         <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L453" href="#L453">453</a>             marker[0] = readByte();
-<a class="jxr_linenumber" name="L454" href="#L454">454</a>             <strong class="jxr_keyword">if</strong> (marker[0] == LF) {
-<a class="jxr_linenumber" name="L455" href="#L455">455</a>                 <em class="jxr_comment">// Work around IE5 Mac bug with input type=image.</em>
-<a class="jxr_linenumber" name="L456" href="#L456">456</a>                 <em class="jxr_comment">// Because the boundary delimiter, not including the trailing</em>
-<a class="jxr_linenumber" name="L457" href="#L457">457</a>                 <em class="jxr_comment">// CRLF, must not appear within any file (RFC 2046, section</em>
-<a class="jxr_linenumber" name="L458" href="#L458">458</a>                 <em class="jxr_comment">// 5.1.1), we know the missing CR is due to a buggy browser</em>
-<a class="jxr_linenumber" name="L459" href="#L459">459</a>                 <em class="jxr_comment">// rather than a file containing something similar to a</em>
-<a class="jxr_linenumber" name="L460" href="#L460">460</a>                 <em class="jxr_comment">// boundary.</em>
-<a class="jxr_linenumber" name="L461" href="#L461">461</a>                 <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L462" href="#L462">462</a>             }
-<a class="jxr_linenumber" name="L463" href="#L463">463</a> 
-<a class="jxr_linenumber" name="L464" href="#L464">464</a>             marker[1] = readByte();
-<a class="jxr_linenumber" name="L465" href="#L465">465</a>             <strong class="jxr_keyword">if</strong> (arrayequals(marker, STREAM_TERMINATOR, 2)) {
-<a class="jxr_linenumber" name="L466" href="#L466">466</a>                 nextChunk = false;
-<a class="jxr_linenumber" name="L467" href="#L467">467</a>             } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (arrayequals(marker, FIELD_SEPARATOR, 2)) {
-<a class="jxr_linenumber" name="L468" href="#L468">468</a>                 nextChunk = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L469" href="#L469">469</a>             } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L470" href="#L470">470</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MalformedStreamException</a>(
-<a class="jxr_linenumber" name="L471" href="#L471">471</a>                 <span class="jxr_string">"Unexpected characters follow a boundary"</span>);
-<a class="jxr_linenumber" name="L472" href="#L472">472</a>             }
-<a class="jxr_linenumber" name="L473" href="#L473">473</a>         } <strong class="jxr_keyword">catch</strong> (FileUploadIOException e) {
-<a class="jxr_linenumber" name="L474" href="#L474">474</a>             <em class="jxr_comment">// wraps a SizeException, re-throw as it will be unwrapped later</em>
-<a class="jxr_linenumber" name="L475" href="#L475">475</a>             <strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L476" href="#L476">476</a>         } <strong class="jxr_keyword">catch</strong> (IOException e) {
-<a class="jxr_linenumber" name="L477" href="#L477">477</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MalformedStreamException</a>(<span class="jxr_string">"Stream ended unexpectedly"</span>);
-<a class="jxr_linenumber" name="L478" href="#L478">478</a>         }
-<a class="jxr_linenumber" name="L479" href="#L479">479</a>         <strong class="jxr_keyword">return</strong> nextChunk;
-<a class="jxr_linenumber" name="L480" href="#L480">480</a>     }
-<a class="jxr_linenumber" name="L481" href="#L481">481</a> 
-<a class="jxr_linenumber" name="L482" href="#L482">482</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L483" href="#L483">483</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Changes the boundary token used for partitioning the stream.</em>
-<a class="jxr_linenumber" name="L484" href="#L484">484</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L485" href="#L485">485</a> <em class="jxr_javadoccomment">     * &lt;p&gt;This method allows single pass processing of nested multipart</em>
-<a class="jxr_linenumber" name="L486" href="#L486">486</a> <em class="jxr_javadoccomment">     * streams.</em>
-<a class="jxr_linenumber" name="L487" href="#L487">487</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L488" href="#L488">488</a> <em class="jxr_javadoccomment">     * &lt;p&gt;The boundary token of the nested stream is &lt;code&gt;required&lt;/code&gt;</em>
-<a class="jxr_linenumber" name="L489" href="#L489">489</a> <em class="jxr_javadoccomment">     * to be of the same length as the boundary token in parent stream.</em>
-<a class="jxr_linenumber" name="L490" href="#L490">490</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L491" href="#L491">491</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Restoring the parent stream boundary token after processing of a</em>
-<a class="jxr_linenumber" name="L492" href="#L492">492</a> <em class="jxr_javadoccomment">     * nested stream is left to the application.</em>
-<a class="jxr_linenumber" name="L493" href="#L493">493</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> <em class="jxr_javadoccomment">     * @param boundary The boundary to be used for parsing of the nested</em>
-<a class="jxr_linenumber" name="L495" href="#L495">495</a> <em class="jxr_javadoccomment">     *                 stream.</em>
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> <em class="jxr_javadoccomment">     * @throws IllegalBoundaryException if the &lt;code&gt;boundary&lt;/code&gt;</em>
-<a class="jxr_linenumber" name="L498" href="#L498">498</a> <em class="jxr_javadoccomment">     *                                  has a different length than the one</em>
-<a class="jxr_linenumber" name="L499" href="#L499">499</a> <em class="jxr_javadoccomment">     *                                  being currently parsed.</em>
-<a class="jxr_linenumber" name="L500" href="#L500">500</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L501" href="#L501">501</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setBoundary(byte[] boundary)
-<a class="jxr_linenumber" name="L502" href="#L502">502</a>             <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">IllegalBoundaryException</a> {
-<a class="jxr_linenumber" name="L503" href="#L503">503</a>         <strong class="jxr_keyword">if</strong> (boundary.length != boundaryLength - BOUNDARY_PREFIX.length) {
-<a class="jxr_linenumber" name="L504" href="#L504">504</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">IllegalBoundaryException</a>(
-<a class="jxr_linenumber" name="L505" href="#L505">505</a>             <span class="jxr_string">"The length of a boundary token can not be changed"</span>);
-<a class="jxr_linenumber" name="L506" href="#L506">506</a>         }
-<a class="jxr_linenumber" name="L507" href="#L507">507</a>         System.arraycopy(boundary, 0, <strong class="jxr_keyword">this</strong>.boundary, BOUNDARY_PREFIX.length,
-<a class="jxr_linenumber" name="L508" href="#L508">508</a>                 boundary.length);
-<a class="jxr_linenumber" name="L509" href="#L509">509</a>     }
-<a class="jxr_linenumber" name="L510" href="#L510">510</a> 
-<a class="jxr_linenumber" name="L511" href="#L511">511</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L512" href="#L512">512</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Reads the &lt;code&gt;header-part&lt;/code&gt; of the current</em>
-<a class="jxr_linenumber" name="L513" href="#L513">513</a> <em class="jxr_javadoccomment">     * &lt;code&gt;encapsulation&lt;/code&gt;.</em>
-<a class="jxr_linenumber" name="L514" href="#L514">514</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L515" href="#L515">515</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Headers are returned verbatim to the input stream, including the</em>
-<a class="jxr_linenumber" name="L516" href="#L516">516</a> <em class="jxr_javadoccomment">     * trailing &lt;code&gt;CRLF&lt;/code&gt; marker. Parsing is left to the</em>
-<a class="jxr_linenumber" name="L517" href="#L517">517</a> <em class="jxr_javadoccomment">     * application.</em>
-<a class="jxr_linenumber" name="L518" href="#L518">518</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L519" href="#L519">519</a> <em class="jxr_javadoccomment">     * &lt;p&gt;&lt;strong&gt;TODO&lt;/strong&gt; allow limiting maximum header size to</em>
-<a class="jxr_linenumber" name="L520" href="#L520">520</a> <em class="jxr_javadoccomment">     * protect against abuse.</em>
-<a class="jxr_linenumber" name="L521" href="#L521">521</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L522" href="#L522">522</a> <em class="jxr_javadoccomment">     * @return The &lt;code&gt;header-part&lt;/code&gt; of the current encapsulation.</em>
-<a class="jxr_linenumber" name="L523" href="#L523">523</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L524" href="#L524">524</a> <em class="jxr_javadoccomment">     * @throws FileUploadIOException if the bytes read from the stream exceeded the size limits.</em>
-<a class="jxr_linenumber" name="L525" href="#L525">525</a> <em class="jxr_javadoccomment">     * @throws MalformedStreamException if the stream ends unexpectedly.</em>
-<a class="jxr_linenumber" name="L526" href="#L526">526</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L527" href="#L527">527</a>     <strong class="jxr_keyword">public</strong> String readHeaders() <strong class="jxr_keyword">throws</strong> FileUploadIOException, MalformedStreamException {
-<a class="jxr_linenumber" name="L528" href="#L528">528</a>         <strong class="jxr_keyword">int</strong> i = 0;
-<a class="jxr_linenumber" name="L529" href="#L529">529</a>         byte b;
-<a class="jxr_linenumber" name="L530" href="#L530">530</a>         <em class="jxr_comment">// to support multi-byte characters</em>
-<a class="jxr_linenumber" name="L531" href="#L531">531</a>         ByteArrayOutputStream baos = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream();
-<a class="jxr_linenumber" name="L532" href="#L532">532</a>         <strong class="jxr_keyword">int</strong> size = 0;
-<a class="jxr_linenumber" name="L533" href="#L533">533</a>         <strong class="jxr_keyword">while</strong> (i &lt; HEADER_SEPARATOR.length) {
-<a class="jxr_linenumber" name="L534" href="#L534">534</a>             <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L535" href="#L535">535</a>                 b = readByte();
-<a class="jxr_linenumber" name="L536" href="#L536">536</a>             } <strong class="jxr_keyword">catch</strong> (FileUploadIOException e) {
-<a class="jxr_linenumber" name="L537" href="#L537">537</a>                 <em class="jxr_comment">// wraps a SizeException, re-throw as it will be unwrapped later</em>
-<a class="jxr_linenumber" name="L538" href="#L538">538</a>                 <strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L539" href="#L539">539</a>             } <strong class="jxr_keyword">catch</strong> (IOException e) {
-<a class="jxr_linenumber" name="L540" href="#L540">540</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MalformedStreamException</a>(<span class="jxr_string">"Stream ended unexpectedly"</span>);
-<a class="jxr_linenumber" name="L541" href="#L541">541</a>             }
-<a class="jxr_linenumber" name="L542" href="#L542">542</a>             <strong class="jxr_keyword">if</strong> (++size &gt; HEADER_PART_SIZE_MAX) {
-<a class="jxr_linenumber" name="L543" href="#L543">543</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MalformedStreamException</a>(
-<a class="jxr_linenumber" name="L544" href="#L544">544</a>                         format(<span class="jxr_string">"Header section has more than %s bytes (maybe it is not properly terminated)"</span>,
-<a class="jxr_linenumber" name="L545" href="#L545">545</a>                                Integer.valueOf(HEADER_PART_SIZE_MAX)));
-<a class="jxr_linenumber" name="L546" href="#L546">546</a>             }
-<a class="jxr_linenumber" name="L547" href="#L547">547</a>             <strong class="jxr_keyword">if</strong> (b == HEADER_SEPARATOR[i]) {
-<a class="jxr_linenumber" name="L548" href="#L548">548</a>                 i++;
-<a class="jxr_linenumber" name="L549" href="#L549">549</a>             } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L550" href="#L550">550</a>                 i = 0;
-<a class="jxr_linenumber" name="L551" href="#L551">551</a>             }
-<a class="jxr_linenumber" name="L552" href="#L552">552</a>             baos.write(b);
-<a class="jxr_linenumber" name="L553" href="#L553">553</a>         }
-<a class="jxr_linenumber" name="L554" href="#L554">554</a> 
-<a class="jxr_linenumber" name="L555" href="#L555">555</a>         String headers = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L556" href="#L556">556</a>         <strong class="jxr_keyword">if</strong> (headerEncoding != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L557" href="#L557">557</a>             <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L558" href="#L558">558</a>                 headers = baos.toString(headerEncoding);
-<a class="jxr_linenumber" name="L559" href="#L559">559</a>             } <strong class="jxr_keyword">catch</strong> (UnsupportedEncodingException e) {
-<a class="jxr_linenumber" name="L560" href="#L560">560</a>                 <em class="jxr_comment">// Fall back to platform default if specified encoding is not</em>
-<a class="jxr_linenumber" name="L561" href="#L561">561</a>                 <em class="jxr_comment">// supported.</em>
-<a class="jxr_linenumber" name="L562" href="#L562">562</a>                 headers = baos.toString();
-<a class="jxr_linenumber" name="L563" href="#L563">563</a>             }
-<a class="jxr_linenumber" name="L564" href="#L564">564</a>         } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L565" href="#L565">565</a>             headers = baos.toString();
-<a class="jxr_linenumber" name="L566" href="#L566">566</a>         }
-<a class="jxr_linenumber" name="L567" href="#L567">567</a> 
-<a class="jxr_linenumber" name="L568" href="#L568">568</a>         <strong class="jxr_keyword">return</strong> headers;
-<a class="jxr_linenumber" name="L569" href="#L569">569</a>     }
-<a class="jxr_linenumber" name="L570" href="#L570">570</a> 
-<a class="jxr_linenumber" name="L571" href="#L571">571</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L572" href="#L572">572</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Reads &lt;code&gt;body-data&lt;/code&gt; from the current</em>
-<a class="jxr_linenumber" name="L573" href="#L573">573</a> <em class="jxr_javadoccomment">     * &lt;code&gt;encapsulation&lt;/code&gt; and writes its contents into the</em>
-<a class="jxr_linenumber" name="L574" href="#L574">574</a> <em class="jxr_javadoccomment">     * output &lt;code&gt;Stream&lt;/code&gt;.</em>
-<a class="jxr_linenumber" name="L575" href="#L575">575</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L576" href="#L576">576</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Arbitrary large amounts of data can be processed by this</em>
-<a class="jxr_linenumber" name="L577" href="#L577">577</a> <em class="jxr_javadoccomment">     * method using a constant size buffer. (see {@link</em>
-<a class="jxr_linenumber" name="L578" href="#L578">578</a> <em class="jxr_javadoccomment">     * #MultipartStream(InputStream,byte[],int,</em>
-<a class="jxr_linenumber" name="L579" href="#L579">579</a> <em class="jxr_javadoccomment">     *   MultipartStream.ProgressNotifier) constructor}).</em>
-<a class="jxr_linenumber" name="L580" href="#L580">580</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L581" href="#L581">581</a> <em class="jxr_javadoccomment">     * @param output The &lt;code&gt;Stream&lt;/code&gt; to write data into. May</em>
-<a class="jxr_linenumber" name="L582" href="#L582">582</a> <em class="jxr_javadoccomment">     *               be null, in which case this method is equivalent</em>
-<a class="jxr_linenumber" name="L583" href="#L583">583</a> <em class="jxr_javadoccomment">     *               to {@link #discardBodyData()}.</em>
-<a class="jxr_linenumber" name="L584" href="#L584">584</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L585" href="#L585">585</a> <em class="jxr_javadoccomment">     * @return the amount of data written.</em>
-<a class="jxr_linenumber" name="L586" href="#L586">586</a> <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L587" href="#L587">587</a> <em class="jxr_javadoccomment">     * @throws MalformedStreamException if the stream ends unexpectedly.</em>
-<a class="jxr_linenumber" name="L588" href="#L588">588</a> <em class="jxr_javadoccomment">     * @throws IOException              if an i/o error occurs.</em>
-<a class="jxr_linenumber" name="L589" href="#L589">589</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L590" href="#L590">590</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> readBodyData(OutputStream output)
-<a class="jxr_linenumber" name="L591" href="#L591">591</a>             <strong class="jxr_keyword">throws</strong> MalformedStreamException, IOException {
-<a class="jxr_linenumber" name="L592" href="#L592">592</a>         <strong class="jxr_keyword">return</strong> (<strong class="jxr_keyword">int</strong>) Streams.copy(newInputStream(), output, false); <em class="jxr_comment">// N.B. Streams.copy closes the input stream</em>
-<a class="jxr_linenumber" name="L593" href="#L593">593</a>     }
-<a class="jxr_linenumber" name="L594" href="#L594">594</a> 
-<a class="jxr_linenumber" name="L595" href="#L595">595</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L596" href="#L596">596</a> <em class="jxr_javadoccomment">     * Creates a new {@link ItemInputStream}.</em>
-<a class="jxr_linenumber" name="L597" href="#L597">597</a> <em class="jxr_javadoccomment">     * @return A new instance of {@link ItemInputStream}.</em>
-<a class="jxr_linenumber" name="L598" href="#L598">598</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L599" href="#L599">599</a>     <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">ItemInputStream</a> newInputStream() {
-<a class="jxr_linenumber" name="L600" href="#L600">600</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">ItemInputStream</a>();
+<a class="jxr_linenumber" name="L341" href="#L341">341</a>         <strong class="jxr_keyword">this</strong>.input = input;
+<a class="jxr_linenumber" name="L342" href="#L342">342</a>         <strong class="jxr_keyword">this</strong>.bufSize = Math.max(bufSize, boundaryLength*2);
+<a class="jxr_linenumber" name="L343" href="#L343">343</a>         <strong class="jxr_keyword">this</strong>.buffer = <strong class="jxr_keyword">new</strong> byte[<strong class="jxr_keyword">this</strong>.bufSize];
+<a class="jxr_linenumber" name="L344" href="#L344">344</a>         <strong class="jxr_keyword">this</strong>.notifier = pNotifier;
+<a class="jxr_linenumber" name="L345" href="#L345">345</a> 
+<a class="jxr_linenumber" name="L346" href="#L346">346</a>         <strong class="jxr_keyword">this</strong>.boundary = <strong class="jxr_keyword">new</strong> byte[<strong class="jxr_keyword">this</strong>.boundaryLength];
+<a class="jxr_linenumber" name="L347" href="#L347">347</a>         <strong class="jxr_keyword">this</strong>.boundaryTable = <strong class="jxr_keyword">new</strong> <strong class="jxr_keyword">int</strong>[<strong class="jxr_keyword">this</strong>.boundaryLength + 1];
+<a class="jxr_linenumber" name="L348" href="#L348">348</a>         <strong class="jxr_keyword">this</strong>.keepRegion = <strong class="jxr_keyword">this</strong>.boundary.length;
+<a class="jxr_linenumber" name="L349" href="#L349">349</a> 
+<a class="jxr_linenumber" name="L350" href="#L350">350</a>         System.arraycopy(BOUNDARY_PREFIX, 0, <strong class="jxr_keyword">this</strong>.boundary, 0,
+<a class="jxr_linenumber" name="L351" href="#L351">351</a>                 BOUNDARY_PREFIX.length);
+<a class="jxr_linenumber" name="L352" href="#L352">352</a>         System.arraycopy(boundary, 0, <strong class="jxr_keyword">this</strong>.boundary, BOUNDARY_PREFIX.length,
+<a class="jxr_linenumber" name="L353" href="#L353">353</a>                 boundary.length);
+<a class="jxr_linenumber" name="L354" href="#L354">354</a>         computeBoundaryTable();
+<a class="jxr_linenumber" name="L355" href="#L355">355</a> 
+<a class="jxr_linenumber" name="L356" href="#L356">356</a>         head = 0;
+<a class="jxr_linenumber" name="L357" href="#L357">357</a>         tail = 0;
+<a class="jxr_linenumber" name="L358" href="#L358">358</a>     }
+<a class="jxr_linenumber" name="L359" href="#L359">359</a> 
+<a class="jxr_linenumber" name="L360" href="#L360">360</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L361" href="#L361">361</a> <em class="jxr_javadoccomment">     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a default size buffer.</em>
+<a class="jxr_linenumber" name="L362" href="#L362">362</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L363" href="#L363">363</a> <em class="jxr_javadoccomment">     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.</em>
+<a class="jxr_linenumber" name="L364" href="#L364">364</a> <em class="jxr_javadoccomment">     * @param boundary The token used for dividing the stream into</em>
+<a class="jxr_linenumber" name="L365" href="#L365">365</a> <em class="jxr_javadoccomment">     *                 &lt;code&gt;encapsulations&lt;/code&gt;.</em>
+<a class="jxr_linenumber" name="L366" href="#L366">366</a> <em class="jxr_javadoccomment">     * @param pNotifier An object for calling the progress listener, if any.</em>
+<a class="jxr_linenumber" name="L367" href="#L367">367</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L368" href="#L368">368</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L369" href="#L369">369</a> <em class="jxr_javadoccomment">     * @see #MultipartStream(InputStream, byte[], int, ProgressNotifier)</em>
+<a class="jxr_linenumber" name="L370" href="#L370">370</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L371" href="#L371">371</a>     <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MultipartStream</a>(InputStream input,
+<a class="jxr_linenumber" name="L372" href="#L372">372</a>             byte[] boundary,
+<a class="jxr_linenumber" name="L373" href="#L373">373</a>             <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">ProgressNotifier</a> pNotifier) {
+<a class="jxr_linenumber" name="L374" href="#L374">374</a>         <strong class="jxr_keyword">this</strong>(input, boundary, DEFAULT_BUFSIZE, pNotifier);
+<a class="jxr_linenumber" name="L375" href="#L375">375</a>     }
+<a class="jxr_linenumber" name="L376" href="#L376">376</a> 
+<a class="jxr_linenumber" name="L377" href="#L377">377</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L378" href="#L378">378</a> <em class="jxr_javadoccomment">     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a default size buffer.</em>
+<a class="jxr_linenumber" name="L379" href="#L379">379</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L380" href="#L380">380</a> <em class="jxr_javadoccomment">     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.</em>
+<a class="jxr_linenumber" name="L381" href="#L381">381</a> <em class="jxr_javadoccomment">     * @param boundary The token used for dividing the stream into</em>
+<a class="jxr_linenumber" name="L382" href="#L382">382</a> <em class="jxr_javadoccomment">     *                 &lt;code&gt;encapsulations&lt;/code&gt;.</em>
+<a class="jxr_linenumber" name="L383" href="#L383">383</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L384" href="#L384">384</a> <em class="jxr_javadoccomment">     * @deprecated 1.2.1 Use {@link #MultipartStream(InputStream, byte[], int,</em>
+<a class="jxr_linenumber" name="L385" href="#L385">385</a> <em class="jxr_javadoccomment">     *  ProgressNotifier)}.</em>
+<a class="jxr_linenumber" name="L386" href="#L386">386</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L387" href="#L387">387</a>     @Deprecated
+<a class="jxr_linenumber" name="L388" href="#L388">388</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MultipartStream</a>(InputStream input,
+<a class="jxr_linenumber" name="L389" href="#L389">389</a>             byte[] boundary) {
+<a class="jxr_linenumber" name="L390" href="#L390">390</a>         <strong class="jxr_keyword">this</strong>(input, boundary, DEFAULT_BUFSIZE, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L391" href="#L391">391</a>     }
+<a class="jxr_linenumber" name="L392" href="#L392">392</a> 
+<a class="jxr_linenumber" name="L393" href="#L393">393</a>     <em class="jxr_comment">// --------------------------------------------------------- Public methods</em>
+<a class="jxr_linenumber" name="L394" href="#L394">394</a> 
+<a class="jxr_linenumber" name="L395" href="#L395">395</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L396" href="#L396">396</a> <em class="jxr_javadoccomment">     * Retrieves the character encoding used when reading the headers of an</em>
+<a class="jxr_linenumber" name="L397" href="#L397">397</a> <em class="jxr_javadoccomment">     * individual part. When not specified, or &lt;code&gt;null&lt;/code&gt;, the platform</em>
+<a class="jxr_linenumber" name="L398" href="#L398">398</a> <em class="jxr_javadoccomment">     * default encoding is used.</em>
+<a class="jxr_linenumber" name="L399" href="#L399">399</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L400" href="#L400">400</a> <em class="jxr_javadoccomment">     * @return The encoding used to read part headers.</em>
+<a class="jxr_linenumber" name="L401" href="#L401">401</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L402" href="#L402">402</a>     <strong class="jxr_keyword">public</strong> String getHeaderEncoding() {
+<a class="jxr_linenumber" name="L403" href="#L403">403</a>         <strong class="jxr_keyword">return</strong> headerEncoding;
+<a class="jxr_linenumber" name="L404" href="#L404">404</a>     }
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> 
+<a class="jxr_linenumber" name="L406" href="#L406">406</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L407" href="#L407">407</a> <em class="jxr_javadoccomment">     * Specifies the character encoding to be used when reading the headers of</em>
+<a class="jxr_linenumber" name="L408" href="#L408">408</a> <em class="jxr_javadoccomment">     * individual parts. When not specified, or &lt;code&gt;null&lt;/code&gt;, the platform</em>
+<a class="jxr_linenumber" name="L409" href="#L409">409</a> <em class="jxr_javadoccomment">     * default encoding is used.</em>
+<a class="jxr_linenumber" name="L410" href="#L410">410</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L411" href="#L411">411</a> <em class="jxr_javadoccomment">     * @param encoding The encoding used to read part headers.</em>
+<a class="jxr_linenumber" name="L412" href="#L412">412</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L413" href="#L413">413</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setHeaderEncoding(String encoding) {
+<a class="jxr_linenumber" name="L414" href="#L414">414</a>         headerEncoding = encoding;
+<a class="jxr_linenumber" name="L415" href="#L415">415</a>     }
+<a class="jxr_linenumber" name="L416" href="#L416">416</a> 
+<a class="jxr_linenumber" name="L417" href="#L417">417</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L418" href="#L418">418</a> <em class="jxr_javadoccomment">     * Reads a byte from the &lt;code&gt;buffer&lt;/code&gt;, and refills it as</em>
+<a class="jxr_linenumber" name="L419" href="#L419">419</a> <em class="jxr_javadoccomment">     * necessary.</em>
+<a class="jxr_linenumber" name="L420" href="#L420">420</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L421" href="#L421">421</a> <em class="jxr_javadoccomment">     * @return The next byte from the input stream.</em>
+<a class="jxr_linenumber" name="L422" href="#L422">422</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L423" href="#L423">423</a> <em class="jxr_javadoccomment">     * @throws IOException if there is no more data available.</em>
+<a class="jxr_linenumber" name="L424" href="#L424">424</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L425" href="#L425">425</a>     <strong class="jxr_keyword">public</strong> byte readByte() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="L426" href="#L426">426</a>         <em class="jxr_comment">// Buffer depleted ?</em>
+<a class="jxr_linenumber" name="L427" href="#L427">427</a>         <strong class="jxr_keyword">if</strong> (head == tail) {
+<a class="jxr_linenumber" name="L428" href="#L428">428</a>             head = 0;
+<a class="jxr_linenumber" name="L429" href="#L429">429</a>             <em class="jxr_comment">// Refill.</em>
+<a class="jxr_linenumber" name="L430" href="#L430">430</a>             tail = input.read(buffer, head, bufSize);
+<a class="jxr_linenumber" name="L431" href="#L431">431</a>             <strong class="jxr_keyword">if</strong> (tail == -1) {
+<a class="jxr_linenumber" name="L432" href="#L432">432</a>                 <em class="jxr_comment">// No more data available.</em>
+<a class="jxr_linenumber" name="L433" href="#L433">433</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IOException(<span class="jxr_string">"No more data is available"</span>);
+<a class="jxr_linenumber" name="L434" href="#L434">434</a>             }
+<a class="jxr_linenumber" name="L435" href="#L435">435</a>             <strong class="jxr_keyword">if</strong> (notifier != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L436" href="#L436">436</a>                 notifier.noteBytesRead(tail);
+<a class="jxr_linenumber" name="L437" href="#L437">437</a>             }
+<a class="jxr_linenumber" name="L438" href="#L438">438</a>         }
+<a class="jxr_linenumber" name="L439" href="#L439">439</a>         <strong class="jxr_keyword">return</strong> buffer[head++];
+<a class="jxr_linenumber" name="L440" href="#L440">440</a>     }
+<a class="jxr_linenumber" name="L441" href="#L441">441</a> 
+<a class="jxr_linenumber" name="L442" href="#L442">442</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L443" href="#L443">443</a> <em class="jxr_javadoccomment">     * Skips a &lt;code&gt;boundary&lt;/code&gt; token, and checks whether more</em>
+<a class="jxr_linenumber" name="L444" href="#L444">444</a> <em class="jxr_javadoccomment">     * &lt;code&gt;encapsulations&lt;/code&gt; are contained in the stream.</em>
+<a class="jxr_linenumber" name="L445" href="#L445">445</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L446" href="#L446">446</a> <em class="jxr_javadoccomment">     * @return &lt;code&gt;true&lt;/code&gt; if there are more encapsulations in</em>
+<a class="jxr_linenumber" name="L447" href="#L447">447</a> <em class="jxr_javadoccomment">     *         this stream; &lt;code&gt;false&lt;/code&gt; otherwise.</em>
+<a class="jxr_linenumber" name="L448" href="#L448">448</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L449" href="#L449">449</a> <em class="jxr_javadoccomment">     * @throws FileUploadIOException if the bytes read from the stream exceeded the size limits</em>
+<a class="jxr_linenumber" name="L450" href="#L450">450</a> <em class="jxr_javadoccomment">     * @throws MalformedStreamException if the stream ends unexpectedly or</em>
+<a class="jxr_linenumber" name="L451" href="#L451">451</a> <em class="jxr_javadoccomment">     *                                  fails to follow required syntax.</em>
+<a class="jxr_linenumber" name="L452" href="#L452">452</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L453" href="#L453">453</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> readBoundary()
+<a class="jxr_linenumber" name="L454" href="#L454">454</a>             <strong class="jxr_keyword">throws</strong> FileUploadIOException, <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MalformedStreamException</a> {
+<a class="jxr_linenumber" name="L455" href="#L455">455</a>         byte[] marker = <strong class="jxr_keyword">new</strong> byte[2];
+<a class="jxr_linenumber" name="L456" href="#L456">456</a>         <strong class="jxr_keyword">boolean</strong> nextChunk = false;
+<a class="jxr_linenumber" name="L457" href="#L457">457</a> 
+<a class="jxr_linenumber" name="L458" href="#L458">458</a>         head += boundaryLength;
+<a class="jxr_linenumber" name="L459" href="#L459">459</a>         <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L460" href="#L460">460</a>             marker[0] = readByte();
+<a class="jxr_linenumber" name="L461" href="#L461">461</a>             <strong class="jxr_keyword">if</strong> (marker[0] == LF) {
+<a class="jxr_linenumber" name="L462" href="#L462">462</a>                 <em class="jxr_comment">// Work around IE5 Mac bug with input type=image.</em>
+<a class="jxr_linenumber" name="L463" href="#L463">463</a>                 <em class="jxr_comment">// Because the boundary delimiter, not including the trailing</em>
+<a class="jxr_linenumber" name="L464" href="#L464">464</a>                 <em class="jxr_comment">// CRLF, must not appear within any file (RFC 2046, section</em>
+<a class="jxr_linenumber" name="L465" href="#L465">465</a>                 <em class="jxr_comment">// 5.1.1), we know the missing CR is due to a buggy browser</em>
+<a class="jxr_linenumber" name="L466" href="#L466">466</a>                 <em class="jxr_comment">// rather than a file containing something similar to a</em>
+<a class="jxr_linenumber" name="L467" href="#L467">467</a>                 <em class="jxr_comment">// boundary.</em>
+<a class="jxr_linenumber" name="L468" href="#L468">468</a>                 <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L469" href="#L469">469</a>             }
+<a class="jxr_linenumber" name="L470" href="#L470">470</a> 
+<a class="jxr_linenumber" name="L471" href="#L471">471</a>             marker[1] = readByte();
+<a class="jxr_linenumber" name="L472" href="#L472">472</a>             <strong class="jxr_keyword">if</strong> (arrayequals(marker, STREAM_TERMINATOR, 2)) {
+<a class="jxr_linenumber" name="L473" href="#L473">473</a>                 nextChunk = false;
+<a class="jxr_linenumber" name="L474" href="#L474">474</a>             } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (arrayequals(marker, FIELD_SEPARATOR, 2)) {
+<a class="jxr_linenumber" name="L475" href="#L475">475</a>                 nextChunk = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L476" href="#L476">476</a>             } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L477" href="#L477">477</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MalformedStreamException</a>(
+<a class="jxr_linenumber" name="L478" href="#L478">478</a>                 <span class="jxr_string">"Unexpected characters follow a boundary"</span>);
+<a class="jxr_linenumber" name="L479" href="#L479">479</a>             }
+<a class="jxr_linenumber" name="L480" href="#L480">480</a>         } <strong class="jxr_keyword">catch</strong> (FileUploadIOException e) {
+<a class="jxr_linenumber" name="L481" href="#L481">481</a>             <em class="jxr_comment">// wraps a SizeException, re-throw as it will be unwrapped later</em>
+<a class="jxr_linenumber" name="L482" href="#L482">482</a>             <strong class="jxr_keyword">throw</strong> e;
+<a class="jxr_linenumber" name="L483" href="#L483">483</a>         } <strong class="jxr_keyword">catch</strong> (IOException e) {
+<a class="jxr_linenumber" name="L484" href="#L484">484</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">MalformedStreamException</a>(<span class="jxr_string">"Stream ended unexpectedly"</span>);
+<a class="jxr_linenumber" name="L485" href="#L485">485</a>         }
+<a class="jxr_linenumber" name="L486" href="#L486">486</a>         <strong class="jxr_keyword">return</strong> nextChunk;
+<a class="jxr_linenumber" name="L487" href="#L487">487</a>     }
+<a class="jxr_linenumber" name="L488" href="#L488">488</a> 
+<a class="jxr_linenumber" name="L489" href="#L489">489</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L490" href="#L490">490</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Changes the boundary token used for partitioning the stream.</em>
+<a class="jxr_linenumber" name="L491" href="#L491">491</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L492" href="#L492">492</a> <em class="jxr_javadoccomment">     * &lt;p&gt;This method allows single pass processing of nested multipart</em>
+<a class="jxr_linenumber" name="L493" href="#L493">493</a> <em class="jxr_javadoccomment">     * streams.</em>
+<a class="jxr_linenumber" name="L494" href="#L494">494</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L495" href="#L495">495</a> <em class="jxr_javadoccomment">     * &lt;p&gt;The boundary token of the nested stream is &lt;code&gt;required&lt;/code&gt;</em>
+<a class="jxr_linenumber" name="L496" href="#L496">496</a> <em class="jxr_javadoccomment">     * to be of the same length as the boundary token in parent stream.</em>
+<a class="jxr_linenumber" name="L497" href="#L497">497</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L498" href="#L498">498</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Restoring the parent stream boundary token after processing of a</em>
+<a class="jxr_linenumber" name="L499" href="#L499">499</a> <em class="jxr_javadoccomment">     * nested stream is left to the application.</em>
+<a class="jxr_linenumber" name="L500" href="#L500">500</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L501" href="#L501">501</a> <em class="jxr_javadoccomment">     * @param boundary The boundary to be used for parsing of the nested</em>
+<a class="jxr_linenumber" name="L502" href="#L502">502</a> <em class="jxr_javadoccomment">     *                 stream.</em>
+<a class="jxr_linenumber" name="L503" href="#L503">503</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L504" href="#L504">504</a> <em class="jxr_javadoccomment">     * @throws IllegalBoundaryException if the &lt;code&gt;boundary&lt;/code&gt;</em>
+<a class="jxr_linenumber" name="L505" href="#L505">505</a> <em class="jxr_javadoccomment">     *                                  has a different length than the one</em>
+<a class="jxr_linenumber" name="L506" href="#L506">506</a> <em class="jxr_javadoccomment">     *                                  being currently parsed.</em>
+<a class="jxr_linenumber" name="L507" href="#L507">507</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L508" href="#L508">508</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setBoundary(byte[] boundary)
+<a class="jxr_linenumber" name="L509" href="#L509">509</a>             <strong class="jxr_keyword">throws</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">IllegalBoundaryException</a> {
+<a class="jxr_linenumber" name="L510" href="#L510">510</a>         <strong class="jxr_keyword">if</strong> (boundary.length != boundaryLength - BOUNDARY_PREFIX.length) {
+<a class="jxr_linenumber" name="L511" href="#L511">511</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/fileupload/MultipartStream.html">IllegalBoundaryException</a>(
+<a class="jxr_linenumber" name="L512" href="#L512">512</a>             <span class="jxr_string">"The length of a boundary token can not be changed"</span>);
+<a class="jxr_linenumber" name="L513" href="#L513">513</a>         }
+<a class="jxr_linenumber" name="L514" href="#L514">514</a>         System.arraycopy(boundary, 0, <strong class="jxr_keyword">this</strong>.boundary, BOUNDARY_PREFIX.length,
+<a class="jxr_linenumber" name="L515" href="#L515">515</a>                 boundary.length);
+<a class="jxr_linenumber" name="L516" href="#L516">516</a>         computeBoundaryTable();
+<a class="jxr_linenumber" name="L517" href="#L517">517</a>     }
+<a class="jxr_linenumber" name="L518" href="#L518">518</a> 
+<a class="jxr_linenumber" name="L519" href="#L519">519</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L520" href="#L520">520</a> <em class="jxr_javadoccomment">     * Compute the table used for Knuth-Morris-Pratt search algorithm.</em>
+<a class="jxr_linenumber" name="L521" href="#L521">521</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L522" href="#L522">522</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> computeBoundaryTable() {
+<a class="jxr_linenumber" name="L523" href="#L523">523</a>         <strong class="jxr_keyword">int</strong> position = 2;
+<a class="jxr_linenumber" name="L524" href="#L524">524</a>         <strong class="jxr_keyword">int</strong> candidate = 0;
+<a class="jxr_linenumber" name="L525" href="#L525">525</a> 
+<a class="jxr_linenumber" name="L526" href="#L526">526</a>         boundaryTable[0] = -1;
+<a class="jxr_linenumber" name="L527" href="#L527">527</a>         boundaryTable[1] = 0;
+<a class="jxr_linenumber" name="L528" href="#L528">528</a> 
+<a class="jxr_linenumber" name="L529" href="#L529">529</a>         <strong class="jxr_keyword">while</strong> (position &lt;= boundaryLength) {
+<a class="jxr_linenumber" name="L530" href="#L530">530</a>             <strong class="jxr_keyword">if</strong> (boundary[position - 1] == boundary[candidate]) {
+<a class="jxr_linenumber" name="L531" href="#L531">531</a>                 boundaryTable[position] = candidate + 1;
+<a class="jxr_linenumber" name="L532" href="#L532">532</a>                 candidate++;
+<a class="jxr_linenumber" name="L533" href="#L533">533</a>                 position++;
+<a class="jxr_linenumber" name="L534" href="#L534">534</a>             } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (candidate &gt; 0) {
+<a class="jxr_linenumber" name="L535" href="#L535">535</a>                 candidate = boundaryTable[candidate];
+<a class="jxr_linenumber" name="L536" href="#L536">536</a>             } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L537" href="#L537">537</a>                 boundaryTable[position] = 0;
+<a class="jxr_linenumber" name="L538" href="#L538">538</a>                 position++;
+<a class="jxr_linenumber" name="L539" href="#L539">539</a>             }
+<a class="jxr_linenumber" name="L540" href="#L540">540</a>         }
+<a class="jxr_linenumber" name="L541" href="#L541">541</a>     }
+<a class="jxr_linenumber" name="L542" href="#L542">542</a> 
+<a class="jxr_linenumber" name="L543" href="#L543">543</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L544" href="#L544">544</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Reads the &lt;code&gt;header-part&lt;/code&gt; of the current</em>
+<a class="jxr_linenumber" name="L545" href="#L545">545</a> <em class="jxr_javadoccomment">     * &lt;code&gt;encapsulation&lt;/code&gt;.</em>
+<a class="jxr_linenumber" name="L546" href="#L546">546</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L547" href="#L547">547</a> <em class="jxr_javadoccomment">     * &lt;p&gt;Headers are returned verbatim to the input stream, including the</em>
+<a class="jxr_linenumber" name="L548" href="#L548">548</a> <em class="jxr_javadoccomment">     * trailing &lt;code&gt;CRLF&lt;/code&gt; marker. Parsing is left to the</em>
+<a class="jxr_linenumber" name="L549" href="#L549">549</a> <em class="jxr_javadoccomment">     * application.</em>
+<a class="jxr_linenumber" name="L550" href="#L550">550</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L551" href="#L551">551</a> <em class="jxr_javadoccomment">     * &lt;p&gt;&lt;strong&gt;TODO&lt;/strong&gt; allow limiting maximum header size to</em>

[... 934 lines stripped ...]


Mime
View raw message