opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a bug

Browse Source
This commit is contained in:
iamqizhao
2015-03-30 18:00:11 -07:00
parent 8ce50750fe
commit 63de54e02b
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
transport/http2_client.go
View File

@ -198,18 +198,6 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
return nil, ContextErr(context.DeadlineExceeded) return nil, ContextErr(context.DeadlineExceeded)
} }
} }
var authData map[string]string
for _, c := range t.authCreds {
authData, err = c.GetRequestMetadata(ctx)
select {
case <-ctx.Done():
return nil, ContextErr(ctx.Err())
default:
}
if err != nil {
return nil, StreamErrorf(codes.InvalidArgument, "transport: %v", err)
}
}
if _, err := wait(ctx, t.shutdownChan, t.writableChan); err != nil { if _, err := wait(ctx, t.shutdownChan, t.writableChan); err != nil {
return nil, err return nil, err
} }
@ -226,8 +214,13 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
if timeout > 0 { if timeout > 0 {
t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-timeout", Value: timeoutEncode(timeout)}) t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-timeout", Value: timeoutEncode(timeout)})
} }
for k, v := range authData { for _, c := range t.authCreds {
t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: v}) if authData, err := c.GetRequestMetadata(ctx); err != nil {
return nil, StreamErrorf(codes.InvalidArgument, "transport: %v", err)
}
for k, v := range authData {
t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: v})
}
} }
var ( var (
hasMD bool hasMD bool