~ubuntu-branches/ubuntu/precise/tomcat7/precise-proposed

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/ssi/SSIInclude.java

  • Committer: Bazaar Package Importer
  • Author(s): tony mancill
  • Date: 2011-07-25 22:58:33 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110725225833-1t773ak3y3g9utm2
Tags: 7.0.19-1
* Team upload.
* New upstream release.
  - Includes fix for CVE-2011-2526 (Closes: #634992)
* Remove patch for CVE-2011-2204 (included upstream).

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
 * @author Paul Speed
27
27
 * @author Dan Sandberg
28
28
 * @author David Becker
29
 
 * @version $Id: SSIInclude.java 978840 2010-07-24 10:17:45Z markt $
 
29
 * @version $Id: SSIInclude.java 1138121 2011-06-21 18:32:41Z markt $
30
30
 */
31
31
public final class SSIInclude implements SSICommand {
32
32
    /**
33
33
     * @see SSICommand
34
34
     */
 
35
    @Override
35
36
    public long process(SSIMediator ssiMediator, String commandName,
36
37
            String[] paramNames, String[] paramValues, PrintWriter writer) {
37
38
        long lastModified = 0;