← Back to branch summary

~ubuntu-branches/ubuntu/saucy/jenkins/saucy

« back to all changes in this revision

Viewing changes to core/src/main/java/hudson/model/FileParameterValue.java

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-01-10 09:50:50 UTC
  • mfrom: (5.1.10 experimental)
  • Revision ID: package-import@ubuntu.com-20130110095050-kj8xuw20gcfh62k3
Tags: 1.480.2+dfsg-1~exp1
http://bugs.debian.org/696816
http://bugs.debian.org/697617
* New upstream release (Closes: #696816, #697617):
  - d/control: Added new BD on libjbcrypt-java.
  - d/control: Versioned BD jenkins-winstone >= 0.9.10-jenkins-40.
  - d/control: Versioned BD jenkins-trilead-ssh2 >= 214-jenkins-1.
  - Fixes the following security vulnerabilities:
    CVE-2012-6072, CVE-2012-6073, CVE-2012-6072, CVE-2013-0158.
* Tidied lintian warnings.
* Bumped Standards-Version: 3.9.4, no changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/src/main/java/hudson/model/FileParameterValue.java
181
181
            AbstractBuild build = (AbstractBuild)request.findAncestor(AbstractBuild.class).getObject();
182
182
            File fileParameter = getLocationUnderBuild(build);
183
183
            if (fileParameter.isFile()) {
184
 
                response.serveFile(request, fileParameter.toURI().toURL());
 
184
                InputStream data = new FileInputStream(fileParameter);
 
185
                long lastModified = fileParameter.lastModified();
 
186
                long contentLength = fileParameter.length();
 
187
                if (request.hasParameter("view")) {
 
188
                    response.serveFile(request, data, lastModified, contentLength, "plain.txt");
 
189
                } else {
 
190
                    response.serveFile(request, data, lastModified, contentLength, originalFileName);
 
191
                }
185
192
            }
186
193
        }
187
194
    }