From: Andrew Balholm <andybalholm@gmail.com>
Date: Wed, 8 Aug 2012 23:43:10 +0000 (+1000)
Subject: exp/html: when ignoring <textarea> tag, switch tokenizer out of raw text mode
X-Git-Tag: go1.1rc2~2670
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e4a50195c389e67d6d3277b46d4179602bec8c41;p=gostls13.git

exp/html: when ignoring <textarea> tag, switch tokenizer out of raw text mode

Pass 1 additional test.

R=nigeltao
CC=golang-dev
https://golang.org/cl/6459060
---

diff --git a/src/pkg/exp/html/parse.go b/src/pkg/exp/html/parse.go
index be33245600..03c007e1cd 100644
--- a/src/pkg/exp/html/parse.go
+++ b/src/pkg/exp/html/parse.go
@@ -1618,6 +1618,8 @@ func inSelectIM(p *parser) bool {
 				return false
 			}
 			// Ignore the token.
+			// In order to properly ignore <textarea>, we need to change the tokenizer mode.
+			p.tokenizer.rawTag = ""
 			return true
 		case a.Script:
 			return inHeadIM(p)
diff --git a/src/pkg/exp/html/testlogs/tests_innerHTML_1.dat.log b/src/pkg/exp/html/testlogs/tests_innerHTML_1.dat.log
index f34bb783ac..d3df267de9 100644
--- a/src/pkg/exp/html/testlogs/tests_innerHTML_1.dat.log
+++ b/src/pkg/exp/html/testlogs/tests_innerHTML_1.dat.log
@@ -79,7 +79,7 @@ PASS "<table><td><td>"
 PASS "</select><option>"
 PASS "<input><option>"
 PASS "<keygen><option>"
-FAIL "<textarea><option>"
+PASS "<textarea><option>"
 FAIL "</html><!--abc-->"
 PASS "</frameset><frame>"
 PASS ""