Modified: 
websites/production/commons/content/proper/commons-fileupload/apidocs/src-html/org/apache/commons/fileupload/FileUploadBase.SizeException.html
==============================================================================
--- 
websites/production/commons/content/proper/commons-fileupload/apidocs/src-html/org/apache/commons/fileupload/FileUploadBase.SizeException.html
 (original)
+++ 
websites/production/commons/content/proper/commons-fileupload/apidocs/src-html/org/apache/commons/fileupload/FileUploadBase.SizeException.html
 Mon Feb 13 10:43:35 2023
@@ -174,1345 +174,1375 @@
 <span class="sourceLineNo">166</span>    private long fileSizeMax = -1;<a 
name="line.166"></a>
 <span class="sourceLineNo">167</span><a name="line.167"></a>
 <span class="sourceLineNo">168</span>    /**<a name="line.168"></a>
-<span class="sourceLineNo">169</span>     * The content encoding to use when 
reading part headers.<a name="line.169"></a>
-<span class="sourceLineNo">170</span>     */<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    private String headerEncoding;<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>    /**<a name="line.173"></a>
-<span class="sourceLineNo">174</span>     * The progress listener.<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>     */<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    private ProgressListener listener;<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span>    // 
----------------------------------------------------- Property accessors<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span>    /**<a name="line.180"></a>
-<span class="sourceLineNo">181</span>     * Returns the factory class used 
when creating file items.<a name="line.181"></a>
-<span class="sourceLineNo">182</span>     *<a name="line.182"></a>
-<span class="sourceLineNo">183</span>     * @return The factory class for new 
file items.<a name="line.183"></a>
-<span class="sourceLineNo">184</span>     */<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    public abstract FileItemFactory 
getFileItemFactory();<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>    /**<a name="line.187"></a>
-<span class="sourceLineNo">188</span>     * Sets the factory class to use when 
creating file items.<a name="line.188"></a>
-<span class="sourceLineNo">189</span>     *<a name="line.189"></a>
-<span class="sourceLineNo">190</span>     * @param factory The factory class 
for new file items.<a name="line.190"></a>
-<span class="sourceLineNo">191</span>     */<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    public abstract void 
setFileItemFactory(FileItemFactory factory);<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>    /**<a name="line.194"></a>
-<span class="sourceLineNo">195</span>     * Returns the maximum allowed size 
of a complete request, as opposed<a name="line.195"></a>
-<span class="sourceLineNo">196</span>     * to {@link #getFileSizeMax()}.<a 
name="line.196"></a>
-<span class="sourceLineNo">197</span>     *<a name="line.197"></a>
-<span class="sourceLineNo">198</span>     * @return The maximum allowed size, 
in bytes. The default value of<a name="line.198"></a>
-<span class="sourceLineNo">199</span>     *   -1 indicates, that there is no 
limit.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>     *<a name="line.200"></a>
-<span class="sourceLineNo">201</span>     * @see #setSizeMax(long)<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>     *<a name="line.202"></a>
-<span class="sourceLineNo">203</span>     */<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    public long getSizeMax() {<a 
name="line.204"></a>
-<span class="sourceLineNo">205</span>        return sizeMax;<a 
name="line.205"></a>
-<span class="sourceLineNo">206</span>    }<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span>    /**<a name="line.208"></a>
-<span class="sourceLineNo">209</span>     * Sets the maximum allowed size of a 
complete request, as opposed<a name="line.209"></a>
-<span class="sourceLineNo">210</span>     * to {@link 
#setFileSizeMax(long)}.<a name="line.210"></a>
-<span class="sourceLineNo">211</span>     *<a name="line.211"></a>
-<span class="sourceLineNo">212</span>     * @param sizeMax The maximum allowed 
size, in bytes. The default value of<a name="line.212"></a>
-<span class="sourceLineNo">213</span>     *   -1 indicates, that there is no 
limit.<a name="line.213"></a>
-<span class="sourceLineNo">214</span>     *<a name="line.214"></a>
-<span class="sourceLineNo">215</span>     * @see #getSizeMax()<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>     *<a name="line.216"></a>
-<span class="sourceLineNo">217</span>     */<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    public void setSizeMax(long sizeMax) 
{<a name="line.218"></a>
-<span class="sourceLineNo">219</span>        this.sizeMax = sizeMax;<a 
name="line.219"></a>
-<span class="sourceLineNo">220</span>    }<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>    /**<a name="line.222"></a>
-<span class="sourceLineNo">223</span>     * Returns the maximum allowed size 
of a single uploaded file,<a name="line.223"></a>
-<span class="sourceLineNo">224</span>     * as opposed to {@link 
#getSizeMax()}.<a name="line.224"></a>
-<span class="sourceLineNo">225</span>     *<a name="line.225"></a>
-<span class="sourceLineNo">226</span>     * @see #setFileSizeMax(long)<a 
name="line.226"></a>
-<span class="sourceLineNo">227</span>     * @return Maximum size of a single 
uploaded file.<a name="line.227"></a>
-<span class="sourceLineNo">228</span>     */<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    public long getFileSizeMax() {<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>        return fileSizeMax;<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>    }<a name="line.231"></a>
-<span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span>    /**<a name="line.233"></a>
-<span class="sourceLineNo">234</span>     * Sets the maximum allowed size of a 
single uploaded file,<a name="line.234"></a>
-<span class="sourceLineNo">235</span>     * as opposed to {@link 
#getSizeMax()}.<a name="line.235"></a>
-<span class="sourceLineNo">236</span>     *<a name="line.236"></a>
-<span class="sourceLineNo">237</span>     * @see #getFileSizeMax()<a 
name="line.237"></a>
-<span class="sourceLineNo">238</span>     * @param fileSizeMax Maximum size of 
a single uploaded file.<a name="line.238"></a>
-<span class="sourceLineNo">239</span>     */<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    public void setFileSizeMax(long 
fileSizeMax) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        this.fileSizeMax = fileSizeMax;<a 
name="line.241"></a>
-<span class="sourceLineNo">242</span>    }<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span>    /**<a name="line.244"></a>
-<span class="sourceLineNo">245</span>     * Retrieves the character encoding 
used when reading the headers of an<a name="line.245"></a>
-<span class="sourceLineNo">246</span>     * individual part. When not 
specified, or &lt;code&gt;null&lt;/code&gt;, the request<a name="line.246"></a>
-<span class="sourceLineNo">247</span>     * encoding is used. If that is also 
not specified, or &lt;code&gt;null&lt;/code&gt;,<a name="line.247"></a>
-<span class="sourceLineNo">248</span>     * the platform default encoding is 
used.<a name="line.248"></a>
-<span class="sourceLineNo">249</span>     *<a name="line.249"></a>
-<span class="sourceLineNo">250</span>     * @return The encoding used to read 
part headers.<a name="line.250"></a>
-<span class="sourceLineNo">251</span>     */<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    public String getHeaderEncoding() {<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>        return headerEncoding;<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>    }<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>    /**<a name="line.256"></a>
-<span class="sourceLineNo">257</span>     * Specifies the character encoding 
to be used when reading the headers of<a name="line.257"></a>
-<span class="sourceLineNo">258</span>     * individual part. When not 
specified, or &lt;code&gt;null&lt;/code&gt;, the request<a name="line.258"></a>
-<span class="sourceLineNo">259</span>     * encoding is used. If that is also 
not specified, or &lt;code&gt;null&lt;/code&gt;,<a name="line.259"></a>
-<span class="sourceLineNo">260</span>     * the platform default encoding is 
used.<a name="line.260"></a>
+<span class="sourceLineNo">169</span>     * The maximum permitted number of 
files that may be uploaded in a single<a name="line.169"></a>
+<span class="sourceLineNo">170</span>     * request. A value of -1 indicates 
no maximum.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>     */<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    private long fileCountMax = -1;<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span>    /**<a name="line.174"></a>
+<span class="sourceLineNo">175</span>     * The content encoding to use when 
reading part headers.<a name="line.175"></a>
+<span class="sourceLineNo">176</span>     */<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    private String headerEncoding;<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
+<span class="sourceLineNo">179</span>    /**<a name="line.179"></a>
+<span class="sourceLineNo">180</span>     * The progress listener.<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>     */<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    private ProgressListener listener;<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span>    // 
----------------------------------------------------- Property accessors<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>    /**<a name="line.186"></a>
+<span class="sourceLineNo">187</span>     * Returns the factory class used 
when creating file items.<a name="line.187"></a>
+<span class="sourceLineNo">188</span>     *<a name="line.188"></a>
+<span class="sourceLineNo">189</span>     * @return The factory class for new 
file items.<a name="line.189"></a>
+<span class="sourceLineNo">190</span>     */<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    public abstract FileItemFactory 
getFileItemFactory();<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span>    /**<a name="line.193"></a>
+<span class="sourceLineNo">194</span>     * Sets the factory class to use when 
creating file items.<a name="line.194"></a>
+<span class="sourceLineNo">195</span>     *<a name="line.195"></a>
+<span class="sourceLineNo">196</span>     * @param factory The factory class 
for new file items.<a name="line.196"></a>
+<span class="sourceLineNo">197</span>     */<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    public abstract void 
setFileItemFactory(FileItemFactory factory);<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span>    /**<a name="line.200"></a>
+<span class="sourceLineNo">201</span>     * Returns the maximum allowed size 
of a complete request, as opposed<a name="line.201"></a>
+<span class="sourceLineNo">202</span>     * to {@link #getFileSizeMax()}.<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>     *<a name="line.203"></a>
+<span class="sourceLineNo">204</span>     * @return The maximum allowed size, 
in bytes. The default value of<a name="line.204"></a>
+<span class="sourceLineNo">205</span>     *   -1 indicates, that there is no 
limit.<a name="line.205"></a>
+<span class="sourceLineNo">206</span>     *<a name="line.206"></a>
+<span class="sourceLineNo">207</span>     * @see #setSizeMax(long)<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>     *<a name="line.208"></a>
+<span class="sourceLineNo">209</span>     */<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    public long getSizeMax() {<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span>        return sizeMax;<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>    }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span>    /**<a name="line.214"></a>
+<span class="sourceLineNo">215</span>     * Sets the maximum allowed size of a 
complete request, as opposed<a name="line.215"></a>
+<span class="sourceLineNo">216</span>     * to {@link 
#setFileSizeMax(long)}.<a name="line.216"></a>
+<span class="sourceLineNo">217</span>     *<a name="line.217"></a>
+<span class="sourceLineNo">218</span>     * @param sizeMax The maximum allowed 
size, in bytes. The default value of<a name="line.218"></a>
+<span class="sourceLineNo">219</span>     *   -1 indicates, that there is no 
limit.<a name="line.219"></a>
+<span class="sourceLineNo">220</span>     *<a name="line.220"></a>
+<span class="sourceLineNo">221</span>     * @see #getSizeMax()<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>     *<a name="line.222"></a>
+<span class="sourceLineNo">223</span>     */<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    public void setSizeMax(long sizeMax) 
{<a name="line.224"></a>
+<span class="sourceLineNo">225</span>        this.sizeMax = sizeMax;<a 
name="line.225"></a>
+<span class="sourceLineNo">226</span>    }<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span>    /**<a name="line.228"></a>
+<span class="sourceLineNo">229</span>     * Returns the maximum allowed size 
of a single uploaded file,<a name="line.229"></a>
+<span class="sourceLineNo">230</span>     * as opposed to {@link 
#getSizeMax()}.<a name="line.230"></a>
+<span class="sourceLineNo">231</span>     *<a name="line.231"></a>
+<span class="sourceLineNo">232</span>     * @see #setFileSizeMax(long)<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>     * @return Maximum size of a single 
uploaded file.<a name="line.233"></a>
+<span class="sourceLineNo">234</span>     */<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    public long getFileSizeMax() {<a 
name="line.235"></a>
+<span class="sourceLineNo">236</span>        return fileSizeMax;<a 
name="line.236"></a>
+<span class="sourceLineNo">237</span>    }<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span>    /**<a name="line.239"></a>
+<span class="sourceLineNo">240</span>     * Sets the maximum allowed size of a 
single uploaded file,<a name="line.240"></a>
+<span class="sourceLineNo">241</span>     * as opposed to {@link 
#getSizeMax()}.<a name="line.241"></a>
+<span class="sourceLineNo">242</span>     *<a name="line.242"></a>
+<span class="sourceLineNo">243</span>     * @see #getFileSizeMax()<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span>     * @param fileSizeMax Maximum size of 
a single uploaded file.<a name="line.244"></a>
+<span class="sourceLineNo">245</span>     */<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    public void setFileSizeMax(long 
fileSizeMax) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>        this.fileSizeMax = fileSizeMax;<a 
name="line.247"></a>
+<span class="sourceLineNo">248</span>    }<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span>    /**<a name="line.250"></a>
+<span class="sourceLineNo">251</span>     * Returns the maximum number of 
files allowed in a single request.<a name="line.251"></a>
+<span class="sourceLineNo">252</span>     *<a name="line.252"></a>
+<span class="sourceLineNo">253</span>     * @return The maximum number of 
files allowed in a single request.<a name="line.253"></a>
+<span class="sourceLineNo">254</span>     */<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    public long getFileCountMax() {<a 
name="line.255"></a>
+<span class="sourceLineNo">256</span>        return fileCountMax;<a 
name="line.256"></a>
+<span class="sourceLineNo">257</span>    }<a name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span>    /**<a name="line.259"></a>
+<span class="sourceLineNo">260</span>     * Sets the maximum number of files 
allowed per request.<a name="line.260"></a>
 <span class="sourceLineNo">261</span>     *<a name="line.261"></a>
-<span class="sourceLineNo">262</span>     * @param encoding The encoding used 
to read part headers.<a name="line.262"></a>
+<span class="sourceLineNo">262</span>     * @param fileCountMax The new limit. 
{@code -1} means no limit.<a name="line.262"></a>
 <span class="sourceLineNo">263</span>     */<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    public void setHeaderEncoding(String 
encoding) {<a name="line.264"></a>
-<span class="sourceLineNo">265</span>        headerEncoding = encoding;<a 
name="line.265"></a>
+<span class="sourceLineNo">264</span>    public void setFileCountMax(final 
long fileCountMax) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>        this.fileCountMax = 
fileCountMax;<a name="line.265"></a>
 <span class="sourceLineNo">266</span>    }<a name="line.266"></a>
 <span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span>    // 
--------------------------------------------------------- Public methods<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>    /**<a name="line.270"></a>
-<span class="sourceLineNo">271</span>     * Processes an &lt;a 
href="http://www.ietf.org/rfc/rfc1867.txt"&gt;RFC 1867&lt;/a&gt;<a 
name="line.271"></a>
-<span class="sourceLineNo">272</span>     * compliant 
&lt;code&gt;multipart/form-data&lt;/code&gt; stream.<a name="line.272"></a>
-<span class="sourceLineNo">273</span>     *<a name="line.273"></a>
-<span class="sourceLineNo">274</span>     * @param req The servlet request to 
be parsed.<a name="line.274"></a>
-<span class="sourceLineNo">275</span>     *<a name="line.275"></a>
-<span class="sourceLineNo">276</span>     * @return A list of 
&lt;code&gt;FileItem&lt;/code&gt; instances parsed from the<a 
name="line.276"></a>
-<span class="sourceLineNo">277</span>     *         request, in the order that 
they were transmitted.<a name="line.277"></a>
-<span class="sourceLineNo">278</span>     *<a name="line.278"></a>
-<span class="sourceLineNo">279</span>     * @throws FileUploadException if 
there are problems reading/parsing<a name="line.279"></a>
-<span class="sourceLineNo">280</span>     *                             the 
request or storing files.<a name="line.280"></a>
-<span class="sourceLineNo">281</span>     *<a name="line.281"></a>
-<span class="sourceLineNo">282</span>     * @deprecated 1.1 Use {@link 
ServletFileUpload#parseRequest(HttpServletRequest)} instead.<a 
name="line.282"></a>
-<span class="sourceLineNo">283</span>     */<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    @Deprecated<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    public List&lt;FileItem&gt; 
parseRequest(HttpServletRequest req)<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    throws FileUploadException {<a 
name="line.286"></a>
-<span class="sourceLineNo">287</span>        return parseRequest(new 
ServletRequestContext(req));<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    }<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span>    /**<a name="line.290"></a>
-<span class="sourceLineNo">291</span>     * Processes an &lt;a 
href="http://www.ietf.org/rfc/rfc1867.txt"&gt;RFC 1867&lt;/a&gt;<a 
name="line.291"></a>
-<span class="sourceLineNo">292</span>     * compliant 
&lt;code&gt;multipart/form-data&lt;/code&gt; stream.<a name="line.292"></a>
-<span class="sourceLineNo">293</span>     *<a name="line.293"></a>
-<span class="sourceLineNo">294</span>     * @param ctx The context for the 
request to be parsed.<a name="line.294"></a>
-<span class="sourceLineNo">295</span>     *<a name="line.295"></a>
-<span class="sourceLineNo">296</span>     * @return An iterator to instances 
of &lt;code&gt;FileItemStream&lt;/code&gt;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>     *         parsed from the request, 
in the order that they were<a name="line.297"></a>
-<span class="sourceLineNo">298</span>     *         transmitted.<a 
name="line.298"></a>
-<span class="sourceLineNo">299</span>     *<a name="line.299"></a>
-<span class="sourceLineNo">300</span>     * @throws FileUploadException if 
there are problems reading/parsing<a name="line.300"></a>
-<span class="sourceLineNo">301</span>     *                             the 
request or storing files.<a name="line.301"></a>
-<span class="sourceLineNo">302</span>     * @throws IOException An I/O error 
occurred. This may be a network<a name="line.302"></a>
-<span class="sourceLineNo">303</span>     *   error while communicating with 
the client or a problem while<a name="line.303"></a>
-<span class="sourceLineNo">304</span>     *   storing the uploaded content.<a 
name="line.304"></a>
-<span class="sourceLineNo">305</span>     */<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    public FileItemIterator 
getItemIterator(RequestContext ctx)<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    throws FileUploadException, 
IOException {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        try {<a name="line.308"></a>
-<span class="sourceLineNo">309</span>            return new 
FileItemIteratorImpl(ctx);<a name="line.309"></a>
-<span class="sourceLineNo">310</span>        } catch (FileUploadIOException e) 
{<a name="line.310"></a>
-<span class="sourceLineNo">311</span>            // unwrap encapsulated 
SizeException<a name="line.311"></a>
-<span class="sourceLineNo">312</span>            throw (FileUploadException) 
e.getCause();<a name="line.312"></a>
-<span class="sourceLineNo">313</span>        }<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    }<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span>    /**<a name="line.316"></a>
-<span class="sourceLineNo">317</span>     * Processes an &lt;a 
href="http://www.ietf.org/rfc/rfc1867.txt"&gt;RFC 1867&lt;/a&gt;<a 
name="line.317"></a>
-<span class="sourceLineNo">318</span>     * compliant 
&lt;code&gt;multipart/form-data&lt;/code&gt; stream.<a name="line.318"></a>
-<span class="sourceLineNo">319</span>     *<a name="line.319"></a>
-<span class="sourceLineNo">320</span>     * @param ctx The context for the 
request to be parsed.<a name="line.320"></a>
-<span class="sourceLineNo">321</span>     *<a name="line.321"></a>
-<span class="sourceLineNo">322</span>     * @return A list of 
&lt;code&gt;FileItem&lt;/code&gt; instances parsed from the<a 
name="line.322"></a>
-<span class="sourceLineNo">323</span>     *         request, in the order that 
they were transmitted.<a name="line.323"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span>    /**<a name="line.269"></a>
+<span class="sourceLineNo">270</span>     * Retrieves the character encoding 
used when reading the headers of an<a name="line.270"></a>
+<span class="sourceLineNo">271</span>     * individual part. When not 
specified, or &lt;code&gt;null&lt;/code&gt;, the request<a name="line.271"></a>
+<span class="sourceLineNo">272</span>     * encoding is used. If that is also 
not specified, or &lt;code&gt;null&lt;/code&gt;,<a name="line.272"></a>
+<span class="sourceLineNo">273</span>     * the platform default encoding is 
used.<a name="line.273"></a>
+<span class="sourceLineNo">274</span>     *<a name="line.274"></a>
+<span class="sourceLineNo">275</span>     * @return The encoding used to read 
part headers.<a name="line.275"></a>
+<span class="sourceLineNo">276</span>     */<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    public String getHeaderEncoding() {<a 
name="line.277"></a>
+<span class="sourceLineNo">278</span>        return headerEncoding;<a 
name="line.278"></a>
+<span class="sourceLineNo">279</span>    }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>    /**<a name="line.281"></a>
+<span class="sourceLineNo">282</span>     * Specifies the character encoding 
to be used when reading the headers of<a name="line.282"></a>
+<span class="sourceLineNo">283</span>     * individual part. When not 
specified, or &lt;code&gt;null&lt;/code&gt;, the request<a name="line.283"></a>
+<span class="sourceLineNo">284</span>     * encoding is used. If that is also 
not specified, or &lt;code&gt;null&lt;/code&gt;,<a name="line.284"></a>
+<span class="sourceLineNo">285</span>     * the platform default encoding is 
used.<a name="line.285"></a>
+<span class="sourceLineNo">286</span>     *<a name="line.286"></a>
+<span class="sourceLineNo">287</span>     * @param encoding The encoding used 
to read part headers.<a name="line.287"></a>
+<span class="sourceLineNo">288</span>     */<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    public void setHeaderEncoding(String 
encoding) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>        headerEncoding = encoding;<a 
name="line.290"></a>
+<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>    // 
--------------------------------------------------------- Public methods<a 
name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    /**<a name="line.295"></a>
+<span class="sourceLineNo">296</span>     * Processes an &lt;a 
href="http://www.ietf.org/rfc/rfc1867.txt"&gt;RFC 1867&lt;/a&gt;<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>     * compliant 
&lt;code&gt;multipart/form-data&lt;/code&gt; stream.<a name="line.297"></a>
+<span class="sourceLineNo">298</span>     *<a name="line.298"></a>
+<span class="sourceLineNo">299</span>     * @param req The servlet request to 
be parsed.<a name="line.299"></a>
+<span class="sourceLineNo">300</span>     *<a name="line.300"></a>
+<span class="sourceLineNo">301</span>     * @return A list of 
&lt;code&gt;FileItem&lt;/code&gt; instances parsed from the<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>     *         request, in the order that 
they were transmitted.<a name="line.302"></a>
+<span class="sourceLineNo">303</span>     *<a name="line.303"></a>
+<span class="sourceLineNo">304</span>     * @throws FileUploadException if 
there are problems reading/parsing<a name="line.304"></a>
+<span class="sourceLineNo">305</span>     *                             the 
request or storing files.<a name="line.305"></a>
+<span class="sourceLineNo">306</span>     *<a name="line.306"></a>
+<span class="sourceLineNo">307</span>     * @deprecated 1.1 Use {@link 
ServletFileUpload#parseRequest(HttpServletRequest)} instead.<a 
name="line.307"></a>
+<span class="sourceLineNo">308</span>     */<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    @Deprecated<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    public List&lt;FileItem&gt; 
parseRequest(HttpServletRequest req)<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    throws FileUploadException {<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span>        return parseRequest(new 
ServletRequestContext(req));<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    }<a name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span>    /**<a name="line.315"></a>
+<span class="sourceLineNo">316</span>     * Processes an &lt;a 
href="http://www.ietf.org/rfc/rfc1867.txt"&gt;RFC 1867&lt;/a&gt;<a 
name="line.316"></a>
+<span class="sourceLineNo">317</span>     * compliant 
&lt;code&gt;multipart/form-data&lt;/code&gt; stream.<a name="line.317"></a>
+<span class="sourceLineNo">318</span>     *<a name="line.318"></a>
+<span class="sourceLineNo">319</span>     * @param ctx The context for the 
request to be parsed.<a name="line.319"></a>
+<span class="sourceLineNo">320</span>     *<a name="line.320"></a>
+<span class="sourceLineNo">321</span>     * @return An iterator to instances 
of &lt;code&gt;FileItemStream&lt;/code&gt;<a name="line.321"></a>
+<span class="sourceLineNo">322</span>     *         parsed from the request, 
in the order that they were<a name="line.322"></a>
+<span class="sourceLineNo">323</span>     *         transmitted.<a 
name="line.323"></a>
 <span class="sourceLineNo">324</span>     *<a name="line.324"></a>
 <span class="sourceLineNo">325</span>     * @throws FileUploadException if 
there are problems reading/parsing<a name="line.325"></a>
 <span class="sourceLineNo">326</span>     *                             the 
request or storing files.<a name="line.326"></a>
-<span class="sourceLineNo">327</span>     */<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    public List&lt;FileItem&gt; 
parseRequest(RequestContext ctx)<a name="line.328"></a>
-<span class="sourceLineNo">329</span>            throws FileUploadException 
{<a name="line.329"></a>
-<span class="sourceLineNo">330</span>        List&lt;FileItem&gt; items = new 
ArrayList&lt;FileItem&gt;();<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        boolean successful = false;<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>        try {<a name="line.332"></a>
-<span class="sourceLineNo">333</span>            FileItemIterator iter = 
getItemIterator(ctx);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>            FileItemFactory fac = 
getFileItemFactory();<a name="line.334"></a>
-<span class="sourceLineNo">335</span>            if (fac == null) {<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>                throw new 
NullPointerException("No FileItemFactory has been set.");<a name="line.336"></a>
-<span class="sourceLineNo">337</span>            }<a name="line.337"></a>
-<span class="sourceLineNo">338</span>            while (iter.hasNext()) {<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>                final FileItemStream item 
= iter.next();<a name="line.339"></a>
-<span class="sourceLineNo">340</span>                // Don't use getName() 
here to prevent an InvalidFileNameException.<a name="line.340"></a>
-<span class="sourceLineNo">341</span>                final String fileName = 
((FileItemIteratorImpl.FileItemStreamImpl) item).name;<a name="line.341"></a>
-<span class="sourceLineNo">342</span>                FileItem fileItem = 
fac.createItem(item.getFieldName(), item.getContentType(),<a 
name="line.342"></a>
-<span class="sourceLineNo">343</span>                                          
         item.isFormField(), fileName);<a name="line.343"></a>
-<span class="sourceLineNo">344</span>                items.add(fileItem);<a 
name="line.344"></a>
-<span class="sourceLineNo">345</span>                try {<a 
name="line.345"></a>
-<span class="sourceLineNo">346</span>                    
Streams.copy(item.openStream(), fileItem.getOutputStream(), true);<a 
name="line.346"></a>
-<span class="sourceLineNo">347</span>                } catch 
(FileUploadIOException e) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>                    throw 
(FileUploadException) e.getCause();<a name="line.348"></a>
-<span class="sourceLineNo">349</span>                } catch (IOException e) 
{<a name="line.349"></a>
-<span class="sourceLineNo">350</span>                    throw new 
IOFileUploadException(format("Processing of %s request failed. %s",<a 
name="line.350"></a>
-<span class="sourceLineNo">351</span>                                          
                 MULTIPART_FORM_DATA, e.getMessage()), e);<a 
name="line.351"></a>
-<span class="sourceLineNo">352</span>                }<a name="line.352"></a>
-<span class="sourceLineNo">353</span>                final FileItemHeaders fih 
= item.getHeaders();<a name="line.353"></a>
-<span class="sourceLineNo">354</span>                
fileItem.setHeaders(fih);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>            }<a name="line.355"></a>
-<span class="sourceLineNo">356</span>            successful = true;<a 
name="line.356"></a>
-<span class="sourceLineNo">357</span>            return items;<a 
name="line.357"></a>
-<span class="sourceLineNo">358</span>        } catch (FileUploadIOException e) 
{<a name="line.358"></a>
-<span class="sourceLineNo">359</span>            throw (FileUploadException) 
e.getCause();<a name="line.359"></a>
-<span class="sourceLineNo">360</span>        } catch (IOException e) {<a 
name="line.360"></a>
-<span class="sourceLineNo">361</span>            throw new 
FileUploadException(e.getMessage(), e);<a name="line.361"></a>
-<span class="sourceLineNo">362</span>        } finally {<a name="line.362"></a>
-<span class="sourceLineNo">363</span>            if (!successful) {<a 
name="line.363"></a>
-<span class="sourceLineNo">364</span>                for (FileItem fileItem : 
items) {<a name="line.364"></a>
-<span class="sourceLineNo">365</span>                    try {<a 
name="line.365"></a>
-<span class="sourceLineNo">366</span>                        
fileItem.delete();<a name="line.366"></a>
-<span class="sourceLineNo">367</span>                    } catch (Exception 
ignored) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span>                        // ignored TODO 
perhaps add to tracker delete failure list somehow?<a name="line.368"></a>
-<span class="sourceLineNo">369</span>                    }<a 
name="line.369"></a>
-<span class="sourceLineNo">370</span>                }<a name="line.370"></a>
-<span class="sourceLineNo">371</span>            }<a name="line.371"></a>
-<span class="sourceLineNo">372</span>        }<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    }<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span>    /**<a name="line.375"></a>
-<span class="sourceLineNo">376</span>     * Processes an &lt;a 
href="http://www.ietf.org/rfc/rfc1867.txt"&gt;RFC 1867&lt;/a&gt;<a 
name="line.376"></a>
-<span class="sourceLineNo">377</span>     * compliant 
&lt;code&gt;multipart/form-data&lt;/code&gt; stream.<a name="line.377"></a>
-<span class="sourceLineNo">378</span>     *<a name="line.378"></a>
-<span class="sourceLineNo">379</span>     * @param ctx The context for the 
request to be parsed.<a name="line.379"></a>
-<span class="sourceLineNo">380</span>     *<a name="line.380"></a>
-<span class="sourceLineNo">381</span>     * @return A map of 
&lt;code&gt;FileItem&lt;/code&gt; instances parsed from the request.<a 
name="line.381"></a>
-<span class="sourceLineNo">382</span>     *<a name="line.382"></a>
-<span class="sourceLineNo">383</span>     * @throws FileUploadException if 
there are problems reading/parsing<a name="line.383"></a>
-<span class="sourceLineNo">384</span>     *                             the 
request or storing files.<a name="line.384"></a>
-<span class="sourceLineNo">385</span>     *<a name="line.385"></a>
-<span class="sourceLineNo">386</span>     * @since 1.3<a name="line.386"></a>
-<span class="sourceLineNo">387</span>     */<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    public Map&lt;String, 
List&lt;FileItem&gt;&gt; parseParameterMap(RequestContext ctx)<a 
name="line.388"></a>
-<span class="sourceLineNo">389</span>            throws FileUploadException 
{<a name="line.389"></a>
-<span class="sourceLineNo">390</span>        final List&lt;FileItem&gt; items 
= parseRequest(ctx);<a name="line.390"></a>
-<span class="sourceLineNo">391</span>        final Map&lt;String, 
List&lt;FileItem&gt;&gt; itemsMap = new HashMap&lt;String, 
List&lt;FileItem&gt;&gt;(items.size());<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>        for (FileItem fileItem : items) 
{<a name="line.393"></a>
-<span class="sourceLineNo">394</span>            String fieldName = 
fileItem.getFieldName();<a name="line.394"></a>
-<span class="sourceLineNo">395</span>            List&lt;FileItem&gt; 
mappedItems = itemsMap.get(fieldName);<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span>            if (mappedItems == null) {<a 
name="line.397"></a>
-<span class="sourceLineNo">398</span>                mappedItems = new 
ArrayList&lt;FileItem&gt;();<a name="line.398"></a>
-<span class="sourceLineNo">399</span>                itemsMap.put(fieldName, 
mappedItems);<a name="line.399"></a>
-<span class="sourceLineNo">400</span>            }<a name="line.400"></a>
-<span class="sourceLineNo">401</span><a name="line.401"></a>
-<span class="sourceLineNo">402</span>            mappedItems.add(fileItem);<a 
name="line.402"></a>
-<span class="sourceLineNo">403</span>        }<a name="line.403"></a>
+<span class="sourceLineNo">327</span>     * @throws IOException An I/O error 
occurred. This may be a network<a name="line.327"></a>
+<span class="sourceLineNo">328</span>     *   error while communicating with 
the client or a problem while<a name="line.328"></a>
+<span class="sourceLineNo">329</span>     *   storing the uploaded content.<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>     */<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    public FileItemIterator 
getItemIterator(RequestContext ctx)<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    throws FileUploadException, 
IOException {<a name="line.332"></a>
+<span class="sourceLineNo">333</span>        try {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>            return new 
FileItemIteratorImpl(ctx);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>        } catch (FileUploadIOException e) 
{<a name="line.335"></a>
+<span class="sourceLineNo">336</span>            // unwrap encapsulated 
SizeException<a name="line.336"></a>
+<span class="sourceLineNo">337</span>            throw (FileUploadException) 
e.getCause();<a name="line.337"></a>
+<span class="sourceLineNo">338</span>        }<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span>    /**<a name="line.341"></a>
+<span class="sourceLineNo">342</span>     * Processes an &lt;a 
href="http://www.ietf.org/rfc/rfc1867.txt"&gt;RFC 1867&lt;/a&gt;<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span>     * compliant 
&lt;code&gt;multipart/form-data&lt;/code&gt; stream.<a name="line.343"></a>
+<span class="sourceLineNo">344</span>     *<a name="line.344"></a>
+<span class="sourceLineNo">345</span>     * @param ctx The context for the 
request to be parsed.<a name="line.345"></a>
+<span class="sourceLineNo">346</span>     *<a name="line.346"></a>
+<span class="sourceLineNo">347</span>     * @return A list of 
&lt;code&gt;FileItem&lt;/code&gt; instances parsed from the<a 
name="line.347"></a>
+<span class="sourceLineNo">348</span>     *         request, in the order that 
they were transmitted.<a name="line.348"></a>
+<span class="sourceLineNo">349</span>     *<a name="line.349"></a>
+<span class="sourceLineNo">350</span>     * @throws FileUploadException if 
there are problems reading/parsing<a name="line.350"></a>
+<span class="sourceLineNo">351</span>     *                             the 
request or storing files.<a name="line.351"></a>
+<span class="sourceLineNo">352</span>     */<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    public List&lt;FileItem&gt; 
parseRequest(RequestContext ctx)<a name="line.353"></a>
+<span class="sourceLineNo">354</span>            throws FileUploadException 
{<a name="line.354"></a>
+<span class="sourceLineNo">355</span>        List&lt;FileItem&gt; items = new 
ArrayList&lt;FileItem&gt;();<a name="line.355"></a>
+<span class="sourceLineNo">356</span>        boolean successful = false;<a 
name="line.356"></a>
+<span class="sourceLineNo">357</span>        try {<a name="line.357"></a>
+<span class="sourceLineNo">358</span>            FileItemIterator iter = 
getItemIterator(ctx);<a name="line.358"></a>
+<span class="sourceLineNo">359</span>            FileItemFactory fac = 
getFileItemFactory();<a name="line.359"></a>
+<span class="sourceLineNo">360</span>            final byte[] buffer = new 
byte[Streams.DEFAULT_BUFFER_SIZE];<a name="line.360"></a>
+<span class="sourceLineNo">361</span>            if (fac == null) {<a 
name="line.361"></a>
+<span class="sourceLineNo">362</span>                throw new 
NullPointerException("No FileItemFactory has been set.");<a name="line.362"></a>
+<span class="sourceLineNo">363</span>            }<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            while (iter.hasNext()) {<a 
name="line.364"></a>
+<span class="sourceLineNo">365</span>                if (items.size() == 
fileCountMax) {<a name="line.365"></a>
+<span class="sourceLineNo">366</span>                    // The next item will 
exceed the limit.<a name="line.366"></a>
+<span class="sourceLineNo">367</span>                    throw new 
FileCountLimitExceededException(ATTACHMENT, getFileCountMax());<a 
name="line.367"></a>
+<span class="sourceLineNo">368</span>                }<a name="line.368"></a>
+<span class="sourceLineNo">369</span>                final FileItemStream item 
= iter.next();<a name="line.369"></a>
+<span class="sourceLineNo">370</span>                // Don't use getName() 
here to prevent an InvalidFileNameException.<a name="line.370"></a>
+<span class="sourceLineNo">371</span>                final String fileName = 
((FileItemIteratorImpl.FileItemStreamImpl) item).name;<a name="line.371"></a>
+<span class="sourceLineNo">372</span>                FileItem fileItem = 
fac.createItem(item.getFieldName(), item.getContentType(),<a 
name="line.372"></a>
+<span class="sourceLineNo">373</span>                                          
         item.isFormField(), fileName);<a name="line.373"></a>
+<span class="sourceLineNo">374</span>                items.add(fileItem);<a 
name="line.374"></a>
+<span class="sourceLineNo">375</span>                try {<a 
name="line.375"></a>
+<span class="sourceLineNo">376</span>                    
Streams.copy(item.openStream(), fileItem.getOutputStream(), true, buffer);<a 
name="line.376"></a>
+<span class="sourceLineNo">377</span>                } catch 
(FileUploadIOException e) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span>                    throw 
(FileUploadException) e.getCause();<a name="line.378"></a>
+<span class="sourceLineNo">379</span>                } catch (IOException e) 
{<a name="line.379"></a>
+<span class="sourceLineNo">380</span>                    throw new 
IOFileUploadException(format("Processing of %s request failed. %s",<a 
name="line.380"></a>
+<span class="sourceLineNo">381</span>                                          
                 MULTIPART_FORM_DATA, e.getMessage()), e);<a 
name="line.381"></a>
+<span class="sourceLineNo">382</span>                }<a name="line.382"></a>
+<span class="sourceLineNo">383</span>                final FileItemHeaders fih 
= item.getHeaders();<a name="line.383"></a>
+<span class="sourceLineNo">384</span>                
fileItem.setHeaders(fih);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>            }<a name="line.385"></a>
+<span class="sourceLineNo">386</span>            successful = true;<a 
name="line.386"></a>
+<span class="sourceLineNo">387</span>            return items;<a 
name="line.387"></a>
+<span class="sourceLineNo">388</span>        } catch (FileUploadIOException e) 
{<a name="line.388"></a>
+<span class="sourceLineNo">389</span>            throw (FileUploadException) 
e.getCause();<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        } catch (IOException e) {<a 
name="line.390"></a>
+<span class="sourceLineNo">391</span>            throw new 
FileUploadException(e.getMessage(), e);<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        } finally {<a name="line.392"></a>
+<span class="sourceLineNo">393</span>            if (!successful) {<a 
name="line.393"></a>
+<span class="sourceLineNo">394</span>                for (FileItem fileItem : 
items) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>                    try {<a 
name="line.395"></a>
+<span class="sourceLineNo">396</span>                        
fileItem.delete();<a name="line.396"></a>
+<span class="sourceLineNo">397</span>                    } catch (Exception 
ignored) {<a name="line.397"></a>
+<span class="sourceLineNo">398</span>                        // ignored TODO 
perhaps add to tracker delete failure list somehow?<a name="line.398"></a>
+<span class="sourceLineNo">399</span>                    }<a 
name="line.399"></a>
+<span class="sourceLineNo">400</span>                }<a name="line.400"></a>
+<span class="sourceLineNo">401</span>            }<a name="line.401"></a>
+<span class="sourceLineNo">402</span>        }<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    }<a name="line.403"></a>
 <span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span>        return itemsMap;<a 
name="line.405"></a>
-<span class="sourceLineNo">406</span>    }<a name="line.406"></a>
-<span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span>    // 
------------------------------------------------------ Protected methods<a 
name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span>    /**<a name="line.410"></a>
-<span class="sourceLineNo">411</span>     * Retrieves the boundary from the 
&lt;code&gt;Content-type&lt;/code&gt; header.<a name="line.411"></a>
+<span class="sourceLineNo">405</span>    /**<a name="line.405"></a>
+<span class="sourceLineNo">406</span>     * Processes an &lt;a 
href="http://www.ietf.org/rfc/rfc1867.txt"&gt;RFC 1867&lt;/a&gt;<a 
name="line.406"></a>
+<span class="sourceLineNo">407</span>     * compliant 
&lt;code&gt;multipart/form-data&lt;/code&gt; stream.<a name="line.407"></a>
+<span class="sourceLineNo">408</span>     *<a name="line.408"></a>
+<span class="sourceLineNo">409</span>     * @param ctx The context for the 
request to be parsed.<a name="line.409"></a>
+<span class="sourceLineNo">410</span>     *<a name="line.410"></a>
+<span class="sourceLineNo">411</span>     * @return A map of 
&lt;code&gt;FileItem&lt;/code&gt; instances parsed from the request.<a 
name="line.411"></a>
 <span class="sourceLineNo">412</span>     *<a name="line.412"></a>
-<span class="sourceLineNo">413</span>     * @param contentType The value of 
the content type header from which to<a name="line.413"></a>
-<span class="sourceLineNo">414</span>     *                    extract the 
boundary value.<a name="line.414"></a>
+<span class="sourceLineNo">413</span>     * @throws FileUploadException if 
there are problems reading/parsing<a name="line.413"></a>
+<span class="sourceLineNo">414</span>     *                             the 
request or storing files.<a name="line.414"></a>
 <span class="sourceLineNo">415</span>     *<a name="line.415"></a>
-<span class="sourceLineNo">416</span>     * @return The boundary, as a byte 
array.<a name="line.416"></a>
+<span class="sourceLineNo">416</span>     * @since 1.3<a name="line.416"></a>
 <span class="sourceLineNo">417</span>     */<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    protected byte[] getBoundary(String 
contentType) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span>        ParameterParser parser = new 
ParameterParser();<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        parser.setLowerCaseNames(true);<a 
name="line.420"></a>
-<span class="sourceLineNo">421</span>        // Parameter parser can handle 
null input<a name="line.421"></a>
-<span class="sourceLineNo">422</span>        Map&lt;String, String&gt; params 
= parser.parse(contentType, new char[] {';', ','});<a name="line.422"></a>
-<span class="sourceLineNo">423</span>        String boundaryStr = 
params.get("boundary");<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span>        if (boundaryStr == null) {<a 
name="line.425"></a>
-<span class="sourceLineNo">426</span>            return null;<a 
name="line.426"></a>
-<span class="sourceLineNo">427</span>        }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>        byte[] boundary;<a 
name="line.428"></a>
-<span class="sourceLineNo">429</span>        try {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>            boundary = 
boundaryStr.getBytes("ISO-8859-1");<a name="line.430"></a>
-<span class="sourceLineNo">431</span>        } catch 
(UnsupportedEncodingException e) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span>            boundary = 
boundaryStr.getBytes(); // Intentionally falls back to default charset<a 
name="line.432"></a>
+<span class="sourceLineNo">418</span>    public Map&lt;String, 
List&lt;FileItem&gt;&gt; parseParameterMap(RequestContext ctx)<a 
name="line.418"></a>
+<span class="sourceLineNo">419</span>            throws FileUploadException 
{<a name="line.419"></a>
+<span class="sourceLineNo">420</span>        final List&lt;FileItem&gt; items 
= parseRequest(ctx);<a name="line.420"></a>
+<span class="sourceLineNo">421</span>        final Map&lt;String, 
List&lt;FileItem&gt;&gt; itemsMap = new HashMap&lt;String, 
List&lt;FileItem&gt;&gt;(items.size());<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span>        for (FileItem fileItem : items) 
{<a name="line.423"></a>
+<span class="sourceLineNo">424</span>            String fieldName = 
fileItem.getFieldName();<a name="line.424"></a>
+<span class="sourceLineNo">425</span>            List&lt;FileItem&gt; 
mappedItems = itemsMap.get(fieldName);<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span>            if (mappedItems == null) {<a 
name="line.427"></a>
+<span class="sourceLineNo">428</span>                mappedItems = new 
ArrayList&lt;FileItem&gt;();<a name="line.428"></a>
+<span class="sourceLineNo">429</span>                itemsMap.put(fieldName, 
mappedItems);<a name="line.429"></a>
+<span class="sourceLineNo">430</span>            }<a name="line.430"></a>
+<span class="sourceLineNo">431</span><a name="line.431"></a>
+<span class="sourceLineNo">432</span>            mappedItems.add(fileItem);<a 
name="line.432"></a>
 <span class="sourceLineNo">433</span>        }<a name="line.433"></a>
-<span class="sourceLineNo">434</span>        return boundary;<a 
name="line.434"></a>
-<span class="sourceLineNo">435</span>    }<a name="line.435"></a>
-<span class="sourceLineNo">436</span><a name="line.436"></a>
-<span class="sourceLineNo">437</span>    /**<a name="line.437"></a>
-<span class="sourceLineNo">438</span>     * Retrieves the file name from the 
&lt;code&gt;Content-disposition&lt;/code&gt;<a name="line.438"></a>
-<span class="sourceLineNo">439</span>     * header.<a name="line.439"></a>
-<span class="sourceLineNo">440</span>     *<a name="line.440"></a>
-<span class="sourceLineNo">441</span>     * @param headers A 
&lt;code&gt;Map&lt;/code&gt; containing the HTTP request headers.<a 
name="line.441"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span>        return itemsMap;<a 
name="line.435"></a>
+<span class="sourceLineNo">436</span>    }<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span>    // 
------------------------------------------------------ Protected methods<a 
name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span>    /**<a name="line.440"></a>
+<span class="sourceLineNo">441</span>     * Retrieves the boundary from the 
&lt;code&gt;Content-type&lt;/code&gt; header.<a name="line.441"></a>
 <span class="sourceLineNo">442</span>     *<a name="line.442"></a>
-<span class="sourceLineNo">443</span>     * @return The file name for the 
current &lt;code&gt;encapsulation&lt;/code&gt;.<a name="line.443"></a>
-<span class="sourceLineNo">444</span>     * @deprecated 1.2.1 Use {@link 
#getFileName(FileItemHeaders)}.<a name="line.444"></a>
-<span class="sourceLineNo">445</span>     */<a name="line.445"></a>
-<span class="sourceLineNo">446</span>    @Deprecated<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    protected String 
getFileName(Map&lt;String, String&gt; headers) {<a name="line.447"></a>
-<span class="sourceLineNo">448</span>        return 
getFileName(getHeader(headers, CONTENT_DISPOSITION));<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    }<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span>    /**<a name="line.451"></a>
-<span class="sourceLineNo">452</span>     * Retrieves the file name from the 
&lt;code&gt;Content-disposition&lt;/code&gt;<a name="line.452"></a>
-<span class="sourceLineNo">453</span>     * header.<a name="line.453"></a>
-<span class="sourceLineNo">454</span>     *<a name="line.454"></a>
-<span class="sourceLineNo">455</span>     * @param headers The HTTP headers 
object.<a name="line.455"></a>
-<span class="sourceLineNo">456</span>     *<a name="line.456"></a>
-<span class="sourceLineNo">457</span>     * @return The file name for the 
current &lt;code&gt;encapsulation&lt;/code&gt;.<a name="line.457"></a>
-<span class="sourceLineNo">458</span>     */<a name="line.458"></a>
-<span class="sourceLineNo">459</span>    protected String 
getFileName(FileItemHeaders headers) {<a name="line.459"></a>
-<span class="sourceLineNo">460</span>        return 
getFileName(headers.getHeader(CONTENT_DISPOSITION));<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    }<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span>    /**<a name="line.463"></a>
-<span class="sourceLineNo">464</span>     * Returns the given 
content-disposition headers file name.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>     * @param pContentDisposition The 
content-disposition headers value.<a name="line.465"></a>
-<span class="sourceLineNo">466</span>     * @return The file name<a 
name="line.466"></a>
-<span class="sourceLineNo">467</span>     */<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    private String getFileName(String 
pContentDisposition) {<a name="line.468"></a>
-<span class="sourceLineNo">469</span>        String fileName = null;<a 
name="line.469"></a>
-<span class="sourceLineNo">470</span>        if (pContentDisposition != null) 
{<a name="line.470"></a>
-<span class="sourceLineNo">471</span>            String cdl = 
pContentDisposition.toLowerCase(Locale.ENGLISH);<a name="line.471"></a>
-<span class="sourceLineNo">472</span>            if (cdl.startsWith(FORM_DATA) 
|| cdl.startsWith(ATTACHMENT)) {<a name="line.472"></a>
-<span class="sourceLineNo">473</span>                ParameterParser parser = 
new ParameterParser();<a name="line.473"></a>
-<span class="sourceLineNo">474</span>                
parser.setLowerCaseNames(true);<a name="line.474"></a>
-<span class="sourceLineNo">475</span>                // Parameter parser can 
handle null input<a name="line.475"></a>
-<span class="sourceLineNo">476</span>                Map&lt;String, String&gt; 
params = parser.parse(pContentDisposition, ';');<a name="line.476"></a>
-<span class="sourceLineNo">477</span>                if 
(params.containsKey("filename")) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span>                    fileName = 
params.get("filename");<a name="line.478"></a>
-<span class="sourceLineNo">479</span>                    if (fileName != null) 
{<a name="line.479"></a>
-<span class="sourceLineNo">480</span>                        fileName = 
fileName.trim();<a name="line.480"></a>
-<span class="sourceLineNo">481</span>                    } else {<a 
name="line.481"></a>
-<span class="sourceLineNo">482</span>                        // Even if there 
is no value, the parameter is present,<a name="line.482"></a>
-<span class="sourceLineNo">483</span>                        // so we return 
an empty file name rather than no file<a name="line.483"></a>
-<span class="sourceLineNo">484</span>                        // name.<a 
name="line.484"></a>
-<span class="sourceLineNo">485</span>                        fileName = "";<a 
name="line.485"></a>
-<span class="sourceLineNo">486</span>                    }<a 
name="line.486"></a>
-<span class="sourceLineNo">487</span>                }<a name="line.487"></a>
-<span class="sourceLineNo">488</span>            }<a name="line.488"></a>
-<span class="sourceLineNo">489</span>        }<a name="line.489"></a>
-<span class="sourceLineNo">490</span>        return fileName;<a 
name="line.490"></a>
+<span class="sourceLineNo">443</span>     * @param contentType The value of 
the content type header from which to<a name="line.443"></a>
+<span class="sourceLineNo">444</span>     *                    extract the 
boundary value.<a name="line.444"></a>
+<span class="sourceLineNo">445</span>     *<a name="line.445"></a>
+<span class="sourceLineNo">446</span>     * @return The boundary, as a byte 
array.<a name="line.446"></a>
+<span class="sourceLineNo">447</span>     */<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    protected byte[] getBoundary(String 
contentType) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>        ParameterParser parser = new 
ParameterParser();<a name="line.449"></a>
+<span class="sourceLineNo">450</span>        parser.setLowerCaseNames(true);<a 
name="line.450"></a>
+<span class="sourceLineNo">451</span>        // Parameter parser can handle 
null input<a name="line.451"></a>
+<span class="sourceLineNo">452</span>        Map&lt;String, String&gt; params 
= parser.parse(contentType, new char[] {';', ','});<a name="line.452"></a>
+<span class="sourceLineNo">453</span>        String boundaryStr = 
params.get("boundary");<a name="line.453"></a>
+<span class="sourceLineNo">454</span><a name="line.454"></a>
+<span class="sourceLineNo">455</span>        if (boundaryStr == null) {<a 
name="line.455"></a>
+<span class="sourceLineNo">456</span>            return null;<a 
name="line.456"></a>
+<span class="sourceLineNo">457</span>        }<a name="line.457"></a>
+<span class="sourceLineNo">458</span>        byte[] boundary;<a 
name="line.458"></a>
+<span class="sourceLineNo">459</span>        try {<a name="line.459"></a>
+<span class="sourceLineNo">460</span>            boundary = 
boundaryStr.getBytes("ISO-8859-1");<a name="line.460"></a>
+<span class="sourceLineNo">461</span>        } catch 
(UnsupportedEncodingException e) {<a name="line.461"></a>
+<span class="sourceLineNo">462</span>            boundary = 
boundaryStr.getBytes(); // Intentionally falls back to default charset<a 
name="line.462"></a>
+<span class="sourceLineNo">463</span>        }<a name="line.463"></a>
+<span class="sourceLineNo">464</span>        return boundary;<a 
name="line.464"></a>
+<span class="sourceLineNo">465</span>    }<a name="line.465"></a>
+<span class="sourceLineNo">466</span><a name="line.466"></a>
+<span class="sourceLineNo">467</span>    /**<a name="line.467"></a>
+<span class="sourceLineNo">468</span>     * Retrieves the file name from the 
&lt;code&gt;Content-disposition&lt;/code&gt;<a name="line.468"></a>
+<span class="sourceLineNo">469</span>     * header.<a name="line.469"></a>
+<span class="sourceLineNo">470</span>     *<a name="line.470"></a>
+<span class="sourceLineNo">471</span>     * @param headers A 
&lt;code&gt;Map&lt;/code&gt; containing the HTTP request headers.<a 
name="line.471"></a>
+<span class="sourceLineNo">472</span>     *<a name="line.472"></a>
+<span class="sourceLineNo">473</span>     * @return The file name for the 
current &lt;code&gt;encapsulation&lt;/code&gt;.<a name="line.473"></a>
+<span class="sourceLineNo">474</span>     * @deprecated 1.2.1 Use {@link 
#getFileName(FileItemHeaders)}.<a name="line.474"></a>
+<span class="sourceLineNo">475</span>     */<a name="line.475"></a>
+<span class="sourceLineNo">476</span>    @Deprecated<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    protected String 
getFileName(Map&lt;String, String&gt; headers) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span>        return 
getFileName(getHeader(headers, CONTENT_DISPOSITION));<a name="line.478"></a>
+<span class="sourceLineNo">479</span>    }<a name="line.479"></a>
+<span class="sourceLineNo">480</span><a name="line.480"></a>
+<span class="sourceLineNo">481</span>    /**<a name="line.481"></a>
+<span class="sourceLineNo">482</span>     * Retrieves the file name from the 
&lt;code&gt;Content-disposition&lt;/code&gt;<a name="line.482"></a>
+<span class="sourceLineNo">483</span>     * header.<a name="line.483"></a>
+<span class="sourceLineNo">484</span>     *<a name="line.484"></a>
+<span class="sourceLineNo">485</span>     * @param headers The HTTP headers 
object.<a name="line.485"></a>
+<span class="sourceLineNo">486</span>     *<a name="line.486"></a>
+<span class="sourceLineNo">487</span>     * @return The file name for the 
current &lt;code&gt;encapsulation&lt;/code&gt;.<a name="line.487"></a>
+<span class="sourceLineNo">488</span>     */<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    protected String 
getFileName(FileItemHeaders headers) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span>        return 
getFileName(headers.getHeader(CONTENT_DISPOSITION));<a name="line.490"></a>
 <span class="sourceLineNo">491</span>    }<a name="line.491"></a>
 <span class="sourceLineNo">492</span><a name="line.492"></a>
 <span class="sourceLineNo">493</span>    /**<a name="line.493"></a>
-<span class="sourceLineNo">494</span>     * Retrieves the field name from the 
&lt;code&gt;Content-disposition&lt;/code&gt;<a name="line.494"></a>
-<span class="sourceLineNo">495</span>     * header.<a name="line.495"></a>
-<span class="sourceLineNo">496</span>     *<a name="line.496"></a>
-<span class="sourceLineNo">497</span>     * @param headers A 
&lt;code&gt;Map&lt;/code&gt; containing the HTTP request headers.<a 
name="line.497"></a>
-<span class="sourceLineNo">498</span>     *<a name="line.498"></a>
-<span class="sourceLineNo">499</span>     * @return The field name for the 
current &lt;code&gt;encapsulation&lt;/code&gt;.<a name="line.499"></a>
-<span class="sourceLineNo">500</span>     */<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    protected String 
getFieldName(FileItemHeaders headers) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span>        return 
getFieldName(headers.getHeader(CONTENT_DISPOSITION));<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>    /**<a name="line.505"></a>
-<span class="sourceLineNo">506</span>     * Returns the field name, which is 
given by the content-disposition<a name="line.506"></a>
-<span class="sourceLineNo">507</span>     * header.<a name="line.507"></a>
-<span class="sourceLineNo">508</span>     * @param pContentDisposition The 
content-dispositions header value.<a name="line.508"></a>
-<span class="sourceLineNo">509</span>     * @return The field jake<a 
name="line.509"></a>
-<span class="sourceLineNo">510</span>     */<a name="line.510"></a>
-<span class="sourceLineNo">511</span>    private String getFieldName(String 
pContentDisposition) {<a name="line.511"></a>
-<span class="sourceLineNo">512</span>        String fieldName = null;<a 
name="line.512"></a>
-<span class="sourceLineNo">513</span>        if (pContentDisposition != null<a 
name="line.513"></a>
-<span class="sourceLineNo">514</span>                &amp;&amp; 
pContentDisposition.toLowerCase(Locale.ENGLISH).startsWith(FORM_DATA)) {<a 
name="line.514"></a>
-<span class="sourceLineNo">515</span>            ParameterParser parser = new 
ParameterParser();<a name="line.515"></a>
-<span class="sourceLineNo">516</span>            
parser.setLowerCaseNames(true);<a name="line.516"></a>
-<span class="sourceLineNo">517</span>            // Parameter parser can 
handle null input<a name="line.517"></a>
-<span class="sourceLineNo">518</span>            Map&lt;String, String&gt; 
params = parser.parse(pContentDisposition, ';');<a name="line.518"></a>
-<span class="sourceLineNo">519</span>            fieldName = 
params.get("name");<a name="line.519"></a>
-<span class="sourceLineNo">520</span>            if (fieldName != null) {<a 
name="line.520"></a>
-<span class="sourceLineNo">521</span>                fieldName = 
fieldName.trim();<a name="line.521"></a>
-<span class="sourceLineNo">522</span>            }<a name="line.522"></a>
-<span class="sourceLineNo">523</span>        }<a name="line.523"></a>
-<span class="sourceLineNo">524</span>        return fieldName;<a 
name="line.524"></a>
-<span class="sourceLineNo">525</span>    }<a name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span>    /**<a name="line.527"></a>
-<span class="sourceLineNo">528</span>     * Retrieves the field name from the 
&lt;code&gt;Content-disposition&lt;/code&gt;<a name="line.528"></a>
-<span class="sourceLineNo">529</span>     * header.<a name="line.529"></a>
-<span class="sourceLineNo">530</span>     *<a name="line.530"></a>
-<span class="sourceLineNo">531</span>     * @param headers A 
&lt;code&gt;Map&lt;/code&gt; containing the HTTP request headers.<a 
name="line.531"></a>
-<span class="sourceLineNo">532</span>     *<a name="line.532"></a>
-<span class="sourceLineNo">533</span>     * @return The field name for the 
current &lt;code&gt;encapsulation&lt;/code&gt;.<a name="line.533"></a>
-<span class="sourceLineNo">534</span>     * @deprecated 1.2.1 Use {@link 
#getFieldName(FileItemHeaders)}.<a name="line.534"></a>
-<span class="sourceLineNo">535</span>     */<a name="line.535"></a>
-<span class="sourceLineNo">536</span>    @Deprecated<a name="line.536"></a>
-<span class="sourceLineNo">537</span>    protected String 
getFieldName(Map&lt;String, String&gt; headers) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        return 
getFieldName(getHeader(headers, CONTENT_DISPOSITION));<a name="line.538"></a>
-<span class="sourceLineNo">539</span>    }<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span>    /**<a name="line.541"></a>
-<span class="sourceLineNo">542</span>     * Creates a new {@link FileItem} 
instance.<a name="line.542"></a>
-<span class="sourceLineNo">543</span>     *<a name="line.543"></a>
-<span class="sourceLineNo">544</span>     * @param headers       A 
&lt;code&gt;Map&lt;/code&gt; containing the HTTP request<a name="line.544"></a>
-<span class="sourceLineNo">545</span>     *                      headers.<a 
name="line.545"></a>
-<span class="sourceLineNo">546</span>     * @param isFormField   Whether or 
not this item is a form field, as<a name="line.546"></a>
-<span class="sourceLineNo">547</span>     *                      opposed to a 
file.<a name="line.547"></a>
-<span class="sourceLineNo">548</span>     *<a name="line.548"></a>
-<span class="sourceLineNo">549</span>     * @return A newly created 
&lt;code&gt;FileItem&lt;/code&gt; instance.<a name="line.549"></a>
-<span class="sourceLineNo">550</span>     *<a name="line.550"></a>
-<span class="sourceLineNo">551</span>     * @throws FileUploadException if an 
error occurs.<a name="line.551"></a>
-<span class="sourceLineNo">552</span>     * @deprecated 1.2 This method is no 
longer used in favour of<a name="line.552"></a>
-<span class="sourceLineNo">553</span>     *   internally created instances of 
{@link FileItem}.<a name="line.553"></a>
-<span class="sourceLineNo">554</span>     */<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    @Deprecated<a name="line.555"></a>
-<span class="sourceLineNo">556</span>    protected FileItem 
createItem(Map&lt;String, String&gt; headers,<a name="line.556"></a>
-<span class="sourceLineNo">557</span>                                  boolean 
isFormField)<a name="line.557"></a>
-<span class="sourceLineNo">558</span>        throws FileUploadException {<a 
name="line.558"></a>
-<span class="sourceLineNo">559</span>        return 
getFileItemFactory().createItem(getFieldName(headers),<a name="line.559"></a>
-<span class="sourceLineNo">560</span>                getHeader(headers, 
CONTENT_TYPE),<a name="line.560"></a>
-<span class="sourceLineNo">561</span>                isFormField,<a 
name="line.561"></a>
-<span class="sourceLineNo">562</span>                getFileName(headers));<a 
name="line.562"></a>
-<span class="sourceLineNo">563</span>    }<a name="line.563"></a>
-<span class="sourceLineNo">564</span><a name="line.564"></a>
-<span class="sourceLineNo">565</span>    /**<a name="line.565"></a>
-<span class="sourceLineNo">566</span>     * &lt;p&gt; Parses the 
&lt;code&gt;header-part&lt;/code&gt; and returns as key/value<a 
name="line.566"></a>
-<span class="sourceLineNo">567</span>     * pairs.<a name="line.567"></a>
-<span class="sourceLineNo">568</span>     *<a name="line.568"></a>
-<span class="sourceLineNo">569</span>     * &lt;p&gt; If there are multiple 
headers of the same names, the name<a name="line.569"></a>
-<span class="sourceLineNo">570</span>     * will map to a comma-separated list 
containing the values.<a name="line.570"></a>
-<span class="sourceLineNo">571</span>     *<a name="line.571"></a>
-<span class="sourceLineNo">572</span>     * @param headerPart The 
&lt;code&gt;header-part&lt;/code&gt; of the current<a name="line.572"></a>
-<span class="sourceLineNo">573</span>     *                   
&lt;code&gt;encapsulation&lt;/code&gt;.<a name="line.573"></a>
-<span class="sourceLineNo">574</span>     *<a name="line.574"></a>
-<span class="sourceLineNo">575</span>     * @return A 
&lt;code&gt;Map&lt;/code&gt; containing the parsed HTTP request headers.<a 
name="line.575"></a>
-<span class="sourceLineNo">576</span>     */<a name="line.576"></a>
-<span class="sourceLineNo">577</span>    protected FileItemHeaders 
getParsedHeaders(String headerPart) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>        final int len = 
headerPart.length();<a name="line.578"></a>
-<span class="sourceLineNo">579</span>        FileItemHeadersImpl headers = 
newFileItemHeaders();<a name="line.579"></a>
-<span class="sourceLineNo">580</span>        int start = 0;<a 
name="line.580"></a>
-<span class="sourceLineNo">581</span>        for (;;) {<a name="line.581"></a>
-<span class="sourceLineNo">582</span>            int end = 
parseEndOfLine(headerPart, start);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>            if (start == end) {<a 
name="line.583"></a>
-<span class="sourceLineNo">584</span>                break;<a 
name="line.584"></a>
-<span class="sourceLineNo">585</span>            }<a name="line.585"></a>
-<span class="sourceLineNo">586</span>            StringBuilder header = new 
StringBuilder(headerPart.substring(start, end));<a name="line.586"></a>
-<span class="sourceLineNo">587</span>            start = end + 2;<a 
name="line.587"></a>
-<span class="sourceLineNo">588</span>            while (start &lt; len) {<a 
name="line.588"></a>
-<span class="sourceLineNo">589</span>                int nonWs = start;<a 
name="line.589"></a>
-<span class="sourceLineNo">590</span>                while (nonWs &lt; len) 
{<a name="line.590"></a>
-<span class="sourceLineNo">591</span>                    char c = 
headerPart.charAt(nonWs);<a name="line.591"></a>
-<span class="sourceLineNo">592</span>                    if (c != ' '  
&amp;&amp;  c != '\t') {<a name="line.592"></a>
-<span class="sourceLineNo">593</span>                        break;<a 
name="line.593"></a>
-<span class="sourceLineNo">594</span>                    }<a 
name="line.594"></a>
-<span class="sourceLineNo">595</span>                    ++nonWs;<a 
name="line.595"></a>
-<span class="sourceLineNo">596</span>                }<a name="line.596"></a>
-<span class="sourceLineNo">597</span>                if (nonWs == start) {<a 
name="line.597"></a>
-<span class="sourceLineNo">598</span>                    break;<a 
name="line.598"></a>
-<span class="sourceLineNo">599</span>                }<a name="line.599"></a>
-<span class="sourceLineNo">600</span>                // Continuation line 
found<a name="line.600"></a>
-<span class="sourceLineNo">601</span>                end = 
parseEndOfLine(headerPart, nonWs);<a name="line.601"></a>
-<span class="sourceLineNo">602</span>                header.append(" 
").append(headerPart.substring(nonWs, end));<a name="line.602"></a>
-<span class="sourceLineNo">603</span>                start = end + 2;<a 
name="line.603"></a>
-<span class="sourceLineNo">604</span>            }<a name="line.604"></a>
-<span class="sourceLineNo">605</span>            parseHeaderLine(headers, 
header.toString());<a name="line.605"></a>
-<span class="sourceLineNo">606</span>        }<a name="line.606"></a>
-<span class="sourceLineNo">607</span>        return headers;<a 
name="line.607"></a>
-<span class="sourceLineNo">608</span>    }<a name="line.608"></a>
-<span class="sourceLineNo">609</span><a name="line.609"></a>
-<span class="sourceLineNo">610</span>    /**<a name="line.610"></a>
-<span class="sourceLineNo">611</span>     * Creates a new instance of {@link 
FileItemHeaders}.<a name="line.611"></a>
-<span class="sourceLineNo">612</span>     * @return The new instance.<a 
name="line.612"></a>
-<span class="sourceLineNo">613</span>     */<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    protected FileItemHeadersImpl 
newFileItemHeaders() {<a name="line.614"></a>
-<span class="sourceLineNo">615</span>        return new 
FileItemHeadersImpl();<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    }<a name="line.616"></a>
-<span class="sourceLineNo">617</span><a name="line.617"></a>
-<span class="sourceLineNo">618</span>    /**<a name="line.618"></a>
-<span class="sourceLineNo">619</span>     * &lt;p&gt; Parses the 
&lt;code&gt;header-part&lt;/code&gt; and returns as key/value<a 
name="line.619"></a>
-<span class="sourceLineNo">620</span>     * pairs.<a name="line.620"></a>
-<span class="sourceLineNo">621</span>     *<a name="line.621"></a>
-<span class="sourceLineNo">622</span>     * &lt;p&gt; If there are multiple 
headers of the same names, the name<a name="line.622"></a>
-<span class="sourceLineNo">623</span>     * will map to a comma-separated list 
containing the values.<a name="line.623"></a>
-<span class="sourceLineNo">624</span>     *<a name="line.624"></a>
-<span class="sourceLineNo">625</span>     * @param headerPart The 
&lt;code&gt;header-part&lt;/code&gt; of the current<a name="line.625"></a>
-<span class="sourceLineNo">626</span>     *                   
&lt;code&gt;encapsulation&lt;/code&gt;.<a name="line.626"></a>
-<span class="sourceLineNo">627</span>     *<a name="line.627"></a>
-<span class="sourceLineNo">628</span>     * @return A 
&lt;code&gt;Map&lt;/code&gt; containing the parsed HTTP request headers.<a 
name="line.628"></a>
-<span class="sourceLineNo">629</span>     * @deprecated 1.2.1 Use {@link 
#getParsedHeaders(String)}<a name="line.629"></a>
-<span class="sourceLineNo">630</span>     */<a name="line.630"></a>
-<span class="sourceLineNo">631</span>    @Deprecated<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    protected Map&lt;String, String&gt; 
parseHeaders(String headerPart) {<a name="line.632"></a>
-<span class="sourceLineNo">633</span>        FileItemHeaders headers = 
getParsedHeaders(headerPart);<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        Map&lt;String, String&gt; result 
= new HashMap&lt;String, String&gt;();<a name="line.634"></a>
-<span class="sourceLineNo">635</span>        for (Iterator&lt;String&gt; iter 
= headers.getHeaderNames();  iter.hasNext();) {<a name="line.635"></a>
-<span class="sourceLineNo">636</span>            String headerName = 
iter.next();<a name="line.636"></a>
-<span class="sourceLineNo">637</span>            Iterator&lt;String&gt; iter2 
= headers.getHeaders(headerName);<a name="line.637"></a>
-<span class="sourceLineNo">638</span>            StringBuilder headerValue = 
new StringBuilder(iter2.next());<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            while (iter2.hasNext()) {<a 
name="line.639"></a>
-<span class="sourceLineNo">640</span>                
headerValue.append(",").append(iter2.next());<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            }<a name="line.641"></a>
-<span class="sourceLineNo">642</span>            result.put(headerName, 
headerValue.toString());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        }<a name="line.643"></a>
-<span class="sourceLineNo">644</span>        return result;<a 
name="line.644"></a>
-<span class="sourceLineNo">645</span>    }<a name="line.645"></a>
-<span class="sourceLineNo">646</span><a name="line.646"></a>
-<span class="sourceLineNo">647</span>    /**<a name="line.647"></a>
-<span class="sourceLineNo">648</span>     * Skips bytes until the end of the 
current line.<a name="line.648"></a>
-<span class="sourceLineNo">649</span>     * @param headerPart The headers, 
which are being parsed.<a name="line.649"></a>
-<span class="sourceLineNo">650</span>     * @param end Index of the last byte, 
which has yet been<a name="line.650"></a>
-<span class="sourceLineNo">651</span>     *   processed.<a name="line.651"></a>
-<span class="sourceLineNo">652</span>     * @return Index of the \r\n 
sequence, which indicates<a name="line.652"></a>
-<span class="sourceLineNo">653</span>     *   end of line.<a 
name="line.653"></a>
-<span class="sourceLineNo">654</span>     */<a name="line.654"></a>
-<span class="sourceLineNo">655</span>    private int parseEndOfLine(String 
headerPart, int end) {<a name="line.655"></a>
-<span class="sourceLineNo">656</span>        int index = end;<a 
name="line.656"></a>
-<span class="sourceLineNo">657</span>        for (;;) {<a name="line.657"></a>
-<span class="sourceLineNo">658</span>            int offset = 
headerPart.indexOf('\r', index);<a name="line.658"></a>
-<span class="sourceLineNo">659</span>            if (offset == -1  ||  offset 
+ 1 &gt;= headerPart.length()) {<a name="line.659"></a>
-<span class="sourceLineNo">660</span>                throw new 
IllegalStateException(<a name="line.660"></a>
-<span class="sourceLineNo">661</span>                    "Expected headers to 
be terminated by an empty line.");<a name="line.661"></a>
-<span class="sourceLineNo">662</span>            }<a name="line.662"></a>
-<span class="sourceLineNo">663</span>            if (headerPart.charAt(offset 
+ 1) == '\n') {<a name="line.663"></a>
-<span class="sourceLineNo">664</span>                return offset;<a 
name="line.664"></a>
-<span class="sourceLineNo">665</span>            }<a name="line.665"></a>
-<span class="sourceLineNo">666</span>            index = offset + 1;<a 
name="line.666"></a>
-<span class="sourceLineNo">667</span>        }<a name="line.667"></a>
-<span class="sourceLineNo">668</span>    }<a name="line.668"></a>
-<span class="sourceLineNo">669</span><a name="line.669"></a>
-<span class="sourceLineNo">670</span>    /**<a name="line.670"></a>
-<span class="sourceLineNo">671</span>     * Reads the next header line.<a 
name="line.671"></a>
-<span class="sourceLineNo">672</span>     * @param headers String with all 
headers.<a name="line.672"></a>
-<span class="sourceLineNo">673</span>     * @param header Map where to store 
the current header.<a name="line.673"></a>
-<span class="sourceLineNo">674</span>     */<a name="line.674"></a>
-<span class="sourceLineNo">675</span>    private void 
parseHeaderLine(FileItemHeadersImpl headers, String header) {<a 
name="line.675"></a>
-<span class="sourceLineNo">676</span>        final int colonOffset = 
header.indexOf(':');<a name="line.676"></a>
-<span class="sourceLineNo">677</span>        if (colonOffset == -1) {<a 
name="line.677"></a>
-<span class="sourceLineNo">678</span>            // This header line is 
malformed, skip it.<a name="line.678"></a>
-<span class="sourceLineNo">679</span>            return;<a name="line.679"></a>
-<span class="sourceLineNo">680</span>        }<a name="line.680"></a>
-<span class="sourceLineNo">681</span>        String headerName = 
header.substring(0, colonOffset).trim();<a name="line.681"></a>
-<span class="sourceLineNo">682</span>        String headerValue =<a 
name="line.682"></a>
-<span class="sourceLineNo">683</span>            
header.substring(header.indexOf(':') + 1).trim();<a name="line.683"></a>
-<span class="sourceLineNo">684</span>        headers.addHeader(headerName, 
headerValue);<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    }<a name="line.685"></a>
-<span class="sourceLineNo">686</span><a name="line.686"></a>
-<span class="sourceLineNo">687</span>    /**<a name="line.687"></a>
-<span class="sourceLineNo">688</span>     * Returns the header with the 
specified name from the supplied map. The<a name="line.688"></a>
-<span class="sourceLineNo">689</span>     * header lookup is 
case-insensitive.<a name="line.689"></a>
-<span class="sourceLineNo">690</span>     *<a name="line.690"></a>
-<span class="sourceLineNo">691</span>     * @param headers A 
&lt;code&gt;Map&lt;/code&gt; containing the HTTP request headers.<a 
name="line.691"></a>
-<span class="sourceLineNo">692</span>     * @param name    The name of the 
header to return.<a name="line.692"></a>
-<span class="sourceLineNo">693</span>     *<a name="line.693"></a>
-<span class="sourceLineNo">694</span>     * @return The value of specified 
header, or a comma-separated list if<a name="line.694"></a>
-<span class="sourceLineNo">695</span>     *         there were multiple 
headers of that name.<a name="line.695"></a>
-<span class="sourceLineNo">696</span>     * @deprecated 1.2.1 Use {@link 
FileItemHeaders#getHeader(String)}.<a name="line.696"></a>
-<span class="sourceLineNo">697</span>     */<a name="line.697"></a>
-<span class="sourceLineNo">698</span>    @Deprecated<a name="line.698"></a>
-<span class="sourceLineNo">699</span>    protected final String 
getHeader(Map&lt;String, String&gt; headers,<a name="line.699"></a>
-<span class="sourceLineNo">700</span>            String name) {<a 
name="line.700"></a>
-<span class="sourceLineNo">701</span>        return 
headers.get(name.toLowerCase(Locale.ENGLISH));<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    }<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span>    /**<a name="line.704"></a>
-<span class="sourceLineNo">705</span>     * The iterator, which is returned 
by<a name="line.705"></a>
-<span class="sourceLineNo">706</span>     * {@link 
FileUploadBase#getItemIterator(RequestContext)}.<a name="line.706"></a>
-<span class="sourceLineNo">707</span>     */<a name="line.707"></a>
-<span class="sourceLineNo">708</span>    private class FileItemIteratorImpl 
implements FileItemIterator {<a name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span>        /**<a name="line.710"></a>
-<span class="sourceLineNo">711</span>         * Default implementation of 
{@link FileItemStream}.<a name="line.711"></a>
-<span class="sourceLineNo">712</span>         */<a name="line.712"></a>
-<span class="sourceLineNo">713</span>        class FileItemStreamImpl 
implements FileItemStream {<a name="line.713"></a>
-<span class="sourceLineNo">714</span><a name="line.714"></a>
-<span class="sourceLineNo">715</span>            /**<a name="line.715"></a>
-<span class="sourceLineNo">716</span>             * The file items content 
type.<a name="line.716"></a>
-<span class="sourceLineNo">717</span>             */<a name="line.717"></a>
-<span class="sourceLineNo">718</span>            private final String 
contentType;<a name="line.718"></a>
-<span class="sourceLineNo">719</span><a name="line.719"></a>
-<span class="sourceLineNo">720</span>            /**<a name="line.720"></a>
-<span class="sourceLineNo">721</span>             * The file items field 
name.<a name="line.721"></a>
-<span class="sourceLineNo">722</span>             */<a name="line.722"></a>
-<span class="sourceLineNo">723</span>            private final String 
fieldName;<a name="line.723"></a>
-<span class="sourceLineNo">724</span><a name="line.724"></a>
-<span class="sourceLineNo">725</span>            /**<a name="line.725"></a>
-<span class="sourceLineNo">726</span>             * The file items file 
name.<a name="line.726"></a>
-<span class="sourceLineNo">727</span>             */<a name="line.727"></a>
-<span class="sourceLineNo">728</span>            private final String name;<a 
name="line.728"></a>
-<span class="sourceLineNo">729</span><a name="line.729"></a>
-<span class="sourceLineNo">730</span>            /**<a name="line.730"></a>
-<span class="sourceLineNo">731</span>             * Whether the file item is a 
form field.<a name="line.731"></a>
-<span class="sourceLineNo">732</span>             */<a name="line.732"></a>
-<span class="sourceLineNo">733</span>            private final boolean 
formField;<a name="line.733"></a>
-<span class="sourceLineNo">734</span><a name="line.734"></a>
-<span class="sourceLineNo">735</span>            /**<a name="line.735"></a>
-<span class="sourceLineNo">736</span>             * The file items input 
stream.<a name="line.736"></a>
-<span class="sourceLineNo">737</span>             */<a name="line.737"></a>
-<span class="sourceLineNo">738</span>            private final InputStream 
stream;<a name="line.738"></a>
+<span class="sourceLineNo">494</span>     * Returns the given 
content-disposition headers file name.<a name="line.494"></a>
+<span class="sourceLineNo">495</span>     * @param pContentDisposition The 
content-disposition headers value.<a name="line.495"></a>
+<span class="sourceLineNo">496</span>     * @return The file name<a 
name="line.496"></a>
+<span class="sourceLineNo">497</span>     */<a name="line.497"></a>
+<span class="sourceLineNo">498</span>    private String getFileName(String 
pContentDisposition) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span>        String fileName = null;<a 
name="line.499"></a>
+<span class="sourceLineNo">500</span>        if (pContentDisposition != null) 
{<a name="line.500"></a>
+<span class="sourceLineNo">501</span>            String cdl = 
pContentDisposition.toLowerCase(Locale.ENGLISH);<a name="line.501"></a>
+<span class="sourceLineNo">502</span>            if (cdl.startsWith(FORM_DATA) 
|| cdl.startsWith(ATTACHMENT)) {<a name="line.502"></a>
+<span class="sourceLineNo">503</span>                ParameterParser parser = 
new ParameterParser();<a name="line.503"></a>
+<span class="sourceLineNo">504</span>                
parser.setLowerCaseNames(true);<a name="line.504"></a>
+<span class="sourceLineNo">505</span>                // Parameter parser can 
handle null input<a name="line.505"></a>
+<span class="sourceLineNo">506</span>                Map&lt;String, String&gt; 
params = parser.parse(pContentDisposition, ';');<a name="line.506"></a>
+<span class="sourceLineNo">507</span>                if 
(params.containsKey("filename")) {<a name="line.507"></a>
+<span class="sourceLineNo">508</span>                    fileName = 
params.get("filename");<a name="line.508"></a>
+<span class="sourceLineNo">509</span>                    if (fileName != null) 
{<a name="line.509"></a>
+<span class="sourceLineNo">510</span>                        fileName = 
fileName.trim();<a name="line.510"></a>
+<span class="sourceLineNo">511</span>                    } else {<a 
name="line.511"></a>
+<span class="sourceLineNo">512</span>                        // Even if there 
is no value, the parameter is present,<a name="line.512"></a>
+<span class="sourceLineNo">513</span>                        // so we return 
an empty file name rather than no file<a name="line.513"></a>

[... 1772 lines stripped ...]


Reply via email to