Merge branch '2.3.x' of github.com:grails/grails-core into 2.3.x

Author: graemerocher

grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/metaclass/ForwardMethodspec.groovy

@@ -41,6 +41,8 @@ class ForwardMethodSpec extends Specification {
         request.getAttribute(GrailsApplicationAttributes.CONTROLLER_NAME_ATTRIBUTE) >> { 'foo' }
         request.getAttribute(GrailsApplicationAttributes.WEB_REQUEST) >> { webRequest }
         request.getRequestDispatcher(_) >> { dispatcher }
+        def parameters = [:]
+        request.getParameterMap() >> { parameters }
     }
 
     def 'Test forward request with controller and action params and url converter'() {

grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ScanTests.java

@@ -40,4 +40,17 @@ public void testTagsDefaultNamespace() {
             }
         }
     }
+    
+    public void testMaxHtmlLength() {
+        String gsp = "0123456789ABCDEFGHIJK";
+        GroovyPageScanner scanner = new GroovyPageScanner(gsp);
+        scanner.setMaxHtmlLength(10);
+        assertEquals(GroovyPageScanner.HTML, scanner.nextToken());
+        assertEquals("0123456789", scanner.getToken());
+        assertEquals(GroovyPageScanner.HTML, scanner.nextToken());
+        assertEquals("ABCDEFGHIJ", scanner.getToken());
+        assertEquals(GroovyPageScanner.HTML, scanner.nextToken());
+        assertEquals("K", scanner.getToken());
+        assertEquals(GroovyPageScanner.EOF, scanner.nextToken());
+    }
 }

grails-web/src/main/groovy/org/codehaus/groovy/grails/web/pages/GroovyPageScanner.java

@@ -31,6 +31,7 @@
  * Date: Jan 10, 2004
  */
 class GroovyPageScanner implements Tokens {
+    private static final int DEFAULT_MAX_HTML_LENGTH = 64000;
     private String text;
     private int end1;
     private int begin1;
@@ -42,6 +43,7 @@ class GroovyPageScanner implements Tokens {
     private List<Integer> lineNumberPositions;
     private int lastLineNumberIndex = -1;
     private String pageName = "Unknown";
+    private int maxHtmlLength = DEFAULT_MAX_HTML_LENGTH;
 
     GroovyPageScanner(String text) {
         Strip strip = new Strip(text);
@@ -117,6 +119,7 @@ int nextToken() {
             char c = text.charAt(end1++);
             char c1 = left > 1 ? text.charAt(end1) : 0;
             char c2 = left > 2 ? text.charAt(end1 + 1) : 0;
+            int tokenLength = end1 - begin1;
 
             switch (state) {
                 case HTML:
@@ -168,6 +171,10 @@ else if (isStartOfGExpression(c, c1)) {
                     if (c == '@' && c1 == '{') {
                         return found(GDIRECT, 2);
                     }
+                    
+                    if (tokenLength > maxHtmlLength) {
+                        return found(HTML, 0);
+                    }
 
                     break;
                 case JEXPR:
@@ -292,4 +299,12 @@ void reset() {
         lastNamespace = null;
         lastLineNumberIndex = -1;
     }
+
+    public int getMaxHtmlLength() {
+        return maxHtmlLength;
+    }
+
+    public void setMaxHtmlLength(int maxHtmlLength) {
+        this.maxHtmlLength = maxHtmlLength;
+    }
 }