fix handling of redirect from asset download

vendor/github.com/golang/protobuf/proto/properties.go

@@ -173,7 +173,6 @@ func (sp *StructProperties) Swap(i, j int) { sp.order[i], sp.order[j] = sp.order
 type Properties struct {
 	Name     string // name of the field, for error messages
 	OrigName string // original name before protocol compiler (always set)
-	JSONName string // name to use for JSON; determined by protoc
 	Wire     string
 	WireType int
 	Tag      int
@@ -230,9 +229,8 @@ func (p *Properties) String() string {
 	if p.Packed {
 		s += ",packed"
 	}
-	s += ",name=" + p.OrigName
-	if p.JSONName != p.OrigName {
-		s += ",json=" + p.JSONName
+	if p.OrigName != p.Name {
+		s += ",name=" + p.OrigName
 	}
 	if p.proto3 {
 		s += ",proto3"
@@ -312,8 +310,6 @@ func (p *Properties) Parse(s string) {
 			p.Packed = true
 		case strings.HasPrefix(f, "name="):
 			p.OrigName = f[5:]
-		case strings.HasPrefix(f, "json="):
-			p.JSONName = f[5:]
 		case strings.HasPrefix(f, "enum="):
 			p.Enum = f[5:]
 		case f == "proto3":

vendor/github.com/golang/protobuf/proto/text_parser.go

@@ -119,14 +119,6 @@ func isWhitespace(c byte) bool {
 	return false
 }
 
-func isQuote(c byte) bool {
-	switch c {
-	case '"', '\'':
-		return true
-	}
-	return false
-}
-
 func (p *textParser) skipWhitespace() {
 	i := 0
 	for i < len(p.s) && (isWhitespace(p.s[i]) || p.s[i] == '#') {
@@ -341,13 +333,13 @@ func (p *textParser) next() *token {
 	p.advance()
 	if p.done {
 		p.cur.value = ""
-	} else if len(p.cur.value) > 0 && isQuote(p.cur.value[0]) {
+	} else if len(p.cur.value) > 0 && p.cur.value[0] == '"' {
 		// Look for multiple quoted strings separated by whitespace,
 		// and concatenate them.
 		cat := p.cur
 		for {
 			p.skipWhitespace()
-			if p.done || !isQuote(p.s[0]) {
+			if p.done || p.s[0] != '"' {
 				break
 			}
 			p.advance()