diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/transport/chttp2_transport.c | 30 | ||||
| -rw-r--r-- | src/php/composer.lock | 10 |
2 files changed, 21 insertions, 19 deletions
diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index dae1b1e1b7..885838ec5d 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -823,24 +823,26 @@ static void unlock(transport *t) { finish_reads(t); /* gather any callbacks that need to be made */ - if (!t->calling_back && cb) { + if (!t->calling_back) { perform_callbacks = prepare_callbacks(t); if (perform_callbacks) { t->calling_back = 1; } - if (t->error_state == ERROR_STATE_SEEN && !t->writing) { - call_closed = 1; - t->calling_back = 1; - t->cb = NULL; /* no more callbacks */ - t->error_state = ERROR_STATE_NOTIFIED; - } - if (t->num_pending_goaways) { - goaways = t->pending_goaways; - num_goaways = t->num_pending_goaways; - t->pending_goaways = NULL; - t->num_pending_goaways = 0; - t->cap_pending_goaways = 0; - t->calling_back = 1; + if (cb) { + if (t->error_state == ERROR_STATE_SEEN && !t->writing && !t->calling_back) { + call_closed = 1; + t->calling_back = 1; + t->cb = NULL; /* no more callbacks */ + t->error_state = ERROR_STATE_NOTIFIED; + } + if (t->num_pending_goaways) { + goaways = t->pending_goaways; + num_goaways = t->num_pending_goaways; + t->pending_goaways = NULL; + t->num_pending_goaways = 0; + t->cap_pending_goaways = 0; + t->calling_back = 1; + } } } diff --git a/src/php/composer.lock b/src/php/composer.lock index c2d723def4..8d0c8de437 100644 --- a/src/php/composer.lock +++ b/src/php/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], "hash": "bb81ea5f72ddea2f594a172ff0f3b44d", @@ -57,12 +57,12 @@ "source": { "type": "git", "url": "https://github.com/google/google-auth-library-php.git", - "reference": "35f87159b327fa6416266948c1747c585a4ae3ad" + "reference": "70ff1c9b27b1678827465c72ce81a067e1653442" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/google-auth-library-php/zipball/35f87159b327fa6416266948c1747c585a4ae3ad", - "reference": "35f87159b327fa6416266948c1747c585a4ae3ad", + "url": "https://api.github.com/repos/google/google-auth-library-php/zipball/70ff1c9b27b1678827465c72ce81a067e1653442", + "reference": "70ff1c9b27b1678827465c72ce81a067e1653442", "shasum": "" }, "require": { @@ -94,7 +94,7 @@ "google", "oauth2" ], - "time": "2015-04-30 11:57:19" + "time": "2015-05-06 16:31:42" }, { "name": "guzzlehttp/guzzle", |