Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3407 from jboeuf/fix_3390

Browse Source 
Fixing issue #3390
pull/3409/head
Craig Tiller 9 years ago
parent d64ed6a38b 51261563da
commit 493fd97282
1 changed files with 4 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/core/security/client_auth_filter.c

7
src/core/security/client_auth_filter.c
Unescape View File

@ -203,7 +203,8 @@ static void auth_start_transport_op(grpc_call_element *elem,
size_t i; size_t i;
grpc_client_security_context *sec_ctx = NULL; grpc_client_security_context *sec_ctx = NULL;
if (calld->security_context_set == 0) { if (calld->security_context_set == 0 &&
op->cancel_with_status == GRPC_STATUS_OK) {
calld->security_context_set = 1; calld->security_context_set = 1;
GPR_ASSERT(op->context); GPR_ASSERT(op->context);
if (op->context[GRPC_CONTEXT_SECURITY].value == NULL) { if (op->context[GRPC_CONTEXT_SECURITY].value == NULL) {
@ -218,11 +219,11 @@ static void auth_start_transport_op(grpc_call_element *elem,
chand->security_connector->base.auth_context, "client_auth_filter"); chand->security_connector->base.auth_context, "client_auth_filter");
} }
if (op->bind_pollset) { if (op->bind_pollset != NULL) {
calld->pollset = op->bind_pollset; calld->pollset = op->bind_pollset;
} }
if (op->send_ops && !calld->sent_initial_metadata) { if (op->send_ops != NULL && !calld->sent_initial_metadata) {
size_t nops = op->send_ops->nops; size_t nops = op->send_ops->nops;
grpc_stream_op *ops = op->send_ops->ops; grpc_stream_op *ops = op->send_ops->ops;
for (i = 0; i < nops; i++) { for (i = 0; i < nops; i++) {

Write Preview
Loading…
Cancel
Save