diff options
| author |  Srini Polavarapu <35056280+srini100@users.noreply.github.com> | 2018-08-01 10:34:15 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-08-01 10:34:15 -0700 |
| commit | 92fd2620ab03c438fdeab23400cb6f31f5ba7816 (patch) | |
| tree | 58fa96457ffa608eab38c1288133a813e78ff71b | |
| parent | 6975fe484cf17bf056b1f8e2daf23899a0378083 (diff) | |
| parent | 39b005061bda037f361e97a24305bbdd78181c38 (diff) | |
Merge pull request #16198 from srini100/master
upmerge from v1.14.x
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.cc | 2 | ||||
| -rw-r--r-- | src/objective-c/BoringSSL.podspec | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 9ad271753c..bd6fec6fbe 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -1208,7 +1208,7 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, grpc_error_add_child(closure->error_data.error, error); } if (closure->next_data.scratch < CLOSURE_BARRIER_FIRST_REF_BIT) { - if ((t->write_state == GRPC_CHTTP2_WRITE_STATE_IDLE) || + if (s->seen_error || (t->write_state == GRPC_CHTTP2_WRITE_STATE_IDLE) || !(closure->next_data.scratch & CLOSURE_BARRIER_MAY_COVER_WRITE)) { GRPC_CLOSURE_RUN(closure, closure->error_data.error); } else { diff --git a/src/objective-c/BoringSSL.podspec b/src/objective-c/BoringSSL.podspec index 363983183e..dc56680393 100644 --- a/src/objective-c/BoringSSL.podspec +++ b/src/objective-c/BoringSSL.podspec @@ -31,7 +31,7 @@ Pod::Spec.new do |s| s.name = 'BoringSSL' - version = '10.0.5' + version = '10.0.6' s.version = version s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google’s needs.' # Adapted from the homepage: @@ -68,7 +68,7 @@ Pod::Spec.new do |s| s.source = { :git => 'https://github.com/google/boringssl.git', - :commit => "0c1f336fba7c8cdbe8f32a8c75a8a9f8461feff1", + :commit => "b29b21a81b32ec273f118f589f46d56ad3332420", } s.ios.deployment_target = '5.0' |