← Back to branch summary

~ubuntu-branches/ubuntu/vivid/tomcat7/vivid-proposed

« back to all changes in this revision

Viewing changes to java/org/apache/tomcat/util/http/fileupload/MultipartStream.java

  • Committer: Package Import Robot
  • Author(s): tony mancill, Gianfranco Costamagna, tony mancill
  • Date: 2013-12-24 16:46:34 UTC
  • mfrom: (1.1.14)
  • Revision ID: package-import@ubuntu.com-20131224164634-2racvo4wty70t0za
Tags: 7.0.47-1
https://launchpad.net/bugs/1088681
https://launchpad.net/bugs/1128067
http://bugs.debian.org/729840
[ Gianfranco Costamagna ]
* Team upload.
* New upstream release, patch refresh.
* Renamed patch fix-manager-webapp.path
  to fix-manager-webapp.patch (extension typo).
* Refresh patches for upstream release.
* Removed -Djava.net.preferIPv4Stack=true
  from init script (lp: #1088681),
  thanks Hendrik Haddorp.
* Added webapp manager path patch (lp: #1128067)
  thanks TJ.

[ tony mancill ]
* Bump Standards-Version to 3.9.5.
* Change copyright year in javadocs to 2013.
* Add patch to include the distribution name in error pages.
  (Closes: #729840)

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
80
80
 *   }
81
81
 * </pre>
82
82
 *
83
 
 * @version $Id: MultipartStream.java 1456935 2013-03-15 12:47:29Z markt $
 
83
 * @version $Id: MultipartStream.java 1521063 2013-09-09 12:03:51Z markt $
84
84
 */
85
85
public class MultipartStream {
86
86
 
281
281
     * @see #MultipartStream(InputStream, byte[],
282
282
     *     MultipartStream.ProgressNotifier)
283
283
     */
284
 
    MultipartStream(InputStream input,
 
284
    public MultipartStream(InputStream input,
285
285
            byte[] boundary,
286
286
            int bufSize,
287
287
            ProgressNotifier pNotifier) {