From: Andrew Gerrand <adg@golang.org>
Date: Thu, 7 Aug 2014 22:57:41 +0000 (+1000)
Subject: encoding/json: document coercion of invalid UTF-8 characters
X-Git-Tag: go1.4beta1~875
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=77a8dcab03c1bf8efa5cafaa2d9dc0a9f7a3dcf6;p=gostls13.git

encoding/json: document coercion of invalid UTF-8 characters

Fixes #8342.

LGTM=iant
R=golang-codereviews, iant
CC=golang-codereviews
https://golang.org/cl/122180043
---

diff --git a/src/pkg/encoding/json/encode.go b/src/pkg/encoding/json/encode.go
index 741ddd89cb..5341a3a01b 100644
--- a/src/pkg/encoding/json/encode.go
+++ b/src/pkg/encoding/json/encode.go
@@ -40,8 +40,8 @@ import (
 //
 // Floating point, integer, and Number values encode as JSON numbers.
 //
-// String values encode as JSON strings. InvalidUTF8Error will be returned
-// if an invalid UTF-8 sequence is encountered.
+// String values encode as JSON strings coerced to valid UTF-8,
+// replacing invalid bytes with the Unicode replacement rune.
 // The angle brackets "<" and ">" are escaped to "\u003c" and "\u003e"
 // to keep some browsers from misinterpreting JSON output as HTML.
 // Ampersand "&" is also escaped to "\u0026" for the same reason.