View | Details | Raw Unified | Return to bug 56334
Collapse All | Expand All

(-)java/org/apache/jasper/compiler/ELParser.java (-1 / +3 lines)
Lines 317-323 Link Here
317
            if (ch == '\\' || ch == quote) {
317
            if (ch == '\\' || ch == quote) {
318
                if (output == null) {
318
                if (output == null) {
319
                    output = new StringBuilder(len + 20);
319
                    output = new StringBuilder(len + 20);
320
                    output.append(quote);
320
                    if (quote != 0) {
321
                        output.append(quote);
322
                    }
321
                }
323
                }
322
                output.append(input.substring(lastAppend, i));
324
                output.append(input.substring(lastAppend, i));
323
                lastAppend = i + 1;
325
                lastAppend = i + 1;
(-)test/org/apache/jasper/compiler/TestParser.java (+7 lines)
Lines 417-422 Link Here
417
        Assert.assertTrue(result, result.contains("<set data-value=\"05c##{&gt;hello&lt;\"/>"));
417
        Assert.assertTrue(result, result.contains("<set data-value=\"05c##{&gt;hello&lt;\"/>"));
418
        Assert.assertTrue(result, result.contains("05x:<set data-value=\"\"/>"));
418
        Assert.assertTrue(result, result.contains("05x:<set data-value=\"\"/>"));
419
        Assert.assertTrue(result, result.contains("<set xmlns:foo=\"urn:06a\\bar\\baz\"/>"));
419
        Assert.assertTrue(result, result.contains("<set xmlns:foo=\"urn:06a\\bar\\baz\"/>"));
420
        Assert.assertTrue(result, result.contains("07a:<set data-value=\"\\?resize\"/>"));
421
        Assert.assertTrue(result, result.contains("07b:<set data-content=\"\\?resize=.+\"/>"));
422
        Assert.assertTrue(result, result.contains("07c:<set data-content=\"\\?resize=.+\"/>"));
423
        Assert.assertTrue(result, result.contains("07d:<set data-content=\"false\"/>"));
424
        Assert.assertTrue(result, result.contains("07e:<set data-content=\"false\"/>"));
425
        Assert.assertTrue(result, result.contains("07f:<set data-content=\"\\\'something\'\"/>"));
426
        /* Assert.assertTrue(result, result.contains("07g:<set data-content=\"\\\'something\'\"/>")); */
420
    }
427
    }
421
428
422
    /** Assertion for text printed by tags:echo */
429
    /** Assertion for text printed by tags:echo */
(-)test/webapp/bug5nnnn/bug56334and56561.jspx (-1 / +10 lines)
Lines 18-24 Link Here
18
<jsp:root version="2.3"
18
<jsp:root version="2.3"
19
    xmlns="http://www.w3.org/1999/xhtml"
19
    xmlns="http://www.w3.org/1999/xhtml"
20
    xmlns:jsp="http://java.sun.com/JSP/Page"
20
    xmlns:jsp="http://java.sun.com/JSP/Page"
21
    xmlns:c="http://java.sun.com/jsp/jstl/core">
21
    xmlns:c="http://java.sun.com/jsp/jstl/core"
22
    xmlns:fn="http://java.sun.com/jsp/jstl/functions">
22
23
23
    <jsp:directive.page contentType="text/plain; charset=ISO-8859-1"/>
24
    <jsp:directive.page contentType="text/plain; charset=ISO-8859-1"/>
24
25
Lines 56-59 Link Here
56
    <!-- Test 6: nonTaglibXmlnsAttributes on a Node.UninterpretedTag -->
57
    <!-- Test 6: nonTaglibXmlnsAttributes on a Node.UninterpretedTag -->
57
    <set xmlns:foo="urn:06a\bar\baz" />
58
    <set xmlns:foo="urn:06a\bar\baz" />
58
59
60
    <!-- 7. Tests for bug 56334 comment 15 -->
61
    07a:<set data-value="${'\\?resize'}" />
62
    07b:<set data-content="${fn:escapeXml('\\?resize=.+')}" />
63
    07c:<set data-content="${fn:escapeXml( '\\?resize=.+')}" />
64
    07d:<set data-content="${fn:contains(some_value,'\\?resize=.+')}" />
65
    07e:<set data-content="${fn:contains(some_value, '\\?resize=.+')}" />
66
    07f:<set data-content="${fn:toLowerCase('\\\'someThing\'')}" />
67
    <!--07g:<set data-content="${fn:toLowerCase( '\\\'someThing\'')}" />-->
59
</jsp:root>
68
</jsp:root>
(-)webapps/docs/changelog.xml (+4 lines)
Lines 201-206 Link Here
201
  </subsection>
201
  </subsection>
202
  <subsection name="Jasper">
202
  <subsection name="Jasper">
203
    <changelog>
203
    <changelog>
204
      <fix>
205
        <bug>56334#c15</bug>: Fix a regression in EL parsing when quoted string
206
        follows a whitespace. (kkolinko)
207
      </fix>
204
      <update>
208
      <update>
205
        <bug>56543</bug>: Update to the Eclipse JDT Compiler 4.4RC4 to pick up
209
        <bug>56543</bug>: Update to the Eclipse JDT Compiler 4.4RC4 to pick up
206
        some fixes for Java 8 support. (markt/kkolinko)
210
        some fixes for Java 8 support. (markt/kkolinko)

Return to bug 56334