← Back to branch summary

~james-page/ubuntu/oneiric/tomcat6/CVE-2011-3190

« back to all changes in this revision

Viewing changes to java/org/apache/jasper/compiler/JspDocumentParser.java

  • Committer: Bazaar Package Importer
  • Author(s): tony mancill
  • Date: 2011-04-18 20:38:29 UTC
  • mfrom: (2.2.27 sid)
  • Revision ID: james.westby@ubuntu.com-20110418203829-ogfwstmnzl4o3nby
Tags: 6.0.32-3
http://bugs.debian.org/623242
* Team upload.
* Include upstream patch for ASF Bugzilla - Bug 50700
  (Context parameters are being overridden with parameters from the 
   web application deployment descriptor) (Closes: #623242)

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/jasper/compiler/JspDocumentParser.java
60
60
        "http://xml.org/sax/properties/lexical-handler";
61
61
    private static final String JSP_URI = "http://java.sun.com/JSP/Page";
62
62
 
63
 
    private static final EnableDTDValidationException ENABLE_DTD_VALIDATION_EXCEPTION =
64
 
        new EnableDTDValidationException(
65
 
            "jsp.error.enable_dtd_validation",
66
 
            null);
67
 
 
68
63
    private ParserController parserController;
69
64
    private JspCompilationContext ctxt;
70
65
    private PageInfo pageInfo;
752
747
    public void startDTD(String name, String publicId, String systemId)
753
748
        throws SAXException {
754
749
        if (!isValidating) {
755
 
            fatalError(ENABLE_DTD_VALIDATION_EXCEPTION);
 
750
            fatalError(new EnableDTDValidationException(
 
751
                    "jsp.error.enable_dtd_validation", null));
756
752
        }
757
753
 
758
754
        inDTD = true;
1288
1284
                            prefix,
1289
1285
                            uri,
1290
1286
                            location,
1291
 
                            err);
 
1287
                            err,
 
1288
                            null);
1292
1289
                    if (ctxt.getOptions().isCaching()) {
1293
1290
                        ctxt.getOptions().getCache().put(uri, result);
1294
1291
                    }
1447
1444
        EnableDTDValidationException(String message, Locator loc) {
1448
1445
            super(message, loc);
1449
1446
        }
 
1447
 
 
1448
        @Override
 
1449
        public synchronized Throwable fillInStackTrace() {
 
1450
            // This class does not provide a stack trace
 
1451
            return this;
 
1452
        }
1450
1453
    }
1451
1454
 
1452
1455
    private static String getBodyType(Node.CustomTag custom) {