Merge remote-tracking branch 'upstream/v3' into event

# Conflicts:
#	sse.go

Author: liuzengh

sse.go

@@ -566,7 +566,7 @@ func (es *EventSource) processEvent(scanner *bufio.Scanner) error {
 	if len(ed.Retry) > 0 {
 		if retry, err := strconv.Atoi(string(ed.Retry)); err == nil {
 			es.lock.Lock()
-			es.serverSentRetry = time.Second * time.Duration(retry)
+			es.serverSentRetry = time.Millisecond * time.Duration(retry)
 			es.lock.Unlock()
 		} else {
 			es.triggerOnError(err)