Imported Upstream version 2011.03.07.1upstream/2011.03.07.1

1 files changed, 21 insertions, 2 deletions

diff --git a/src/pkg/xml/xml.go b/src/pkg/xml/xml.go
index 417b4edfd..691c13a11 100644
--- a/src/pkg/xml/xml.go
+++ b/src/pkg/xml/xml.go
@@ -541,17 +541,36 @@ func (p *Parser) RawToken() (Token, os.Error) {
 		}
 
 		// Probably a directive: <!DOCTYPE ...>, <!ENTITY ...>, etc.
-		// We don't care, but accumulate for caller.
+		// We don't care, but accumulate for caller. Quoted angle
+		// brackets do not count for nesting.
 		p.buf.Reset()
 		p.buf.WriteByte(b)
+		inquote := uint8(0)
+		depth := 0
 		for {
 			if b, ok = p.mustgetc(); !ok {
 				return nil, p.err
 			}
-			if b == '>' {
+			if inquote == 0 && b == '>' && depth == 0 {
 				break
 			}
 			p.buf.WriteByte(b)
+			switch {
+			case b == inquote:
+				inquote = 0
+
+			case inquote != 0:
+				// in quotes, no special action
+
+			case b == '\'' || b == '"':
+				inquote = b
+
+			case b == '>' && inquote == 0:
+				depth--
+
+			case b == '<' && inquote == 0:
+				depth++
+			}
 		}
 		return Directive(p.buf.Bytes()), nil
 	}