diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-05-08 16:05:23 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-05-08 16:56:11 +0200 |
| commit | c707642017505f967ff828382e4b924baf7bb208 (patch) | |
| tree | a22887794171be02b53814f7ec5018e896b1c39b /lib/http2.c | |
| parent | 0dace7ec1b9a844ca5b3b51030589592665ef5b7 (diff) | |
| download | curl-bagder/timer-id.tar.gz | |
multi: use a fixed array of timers instead of mallocbagder/timer-id
... since the total amount is low this is faster, easier and reduces
memory overhead.
Also, Curl_expire_done() can now mark an expire timeout as done so that
it never times out.
Diffstat (limited to 'lib/http2.c')
| -rw-r--r-- | lib/http2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/http2.c b/lib/http2.c index 994e53deb..c65305029 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -569,7 +569,7 @@ static int on_frame_recv(nghttp2_session *session, const nghttp2_frame *frame, /* if we receive data for another handle, wake that up */ if(conn_s->data != data_s) - Curl_expire(data_s, 0, EXPIRE_H2DATA); + Curl_expire(data_s, 0, EXPIRE_RUN_NOW); } break; case NGHTTP2_PUSH_PROMISE: @@ -646,7 +646,7 @@ static int on_data_chunk_recv(nghttp2_session *session, uint8_t flags, /* if we receive data for another handle, wake that up */ if(conn->data != data_s) - Curl_expire(data_s, 0, EXPIRE_H2DATA); + Curl_expire(data_s, 0, EXPIRE_RUN_NOW); DEBUGF(infof(data_s, "%zu data received for stream %u " "(%zu left in buffer %p, total %zu)\n", @@ -909,7 +909,7 @@ static int on_header(nghttp2_session *session, const nghttp2_frame *frame, Curl_add_buffer(stream->header_recvbuf, " \r\n", 3); /* if we receive data for another handle, wake that up */ if(conn->data != data_s) - Curl_expire(data_s, 0, EXPIRE_H2DATA); + Curl_expire(data_s, 0, EXPIRE_RUN_NOW); DEBUGF(infof(data_s, "h2 status: HTTP/2 %03d (easy %p)\n", stream->status_code, data_s)); @@ -925,7 +925,7 @@ static int on_header(nghttp2_session *session, const nghttp2_frame *frame, Curl_add_buffer(stream->header_recvbuf, "\r\n", 2); /* if we receive data for another handle, wake that up */ if(conn->data != data_s) - Curl_expire(data_s, 0, EXPIRE_H2DATA); + Curl_expire(data_s, 0, EXPIRE_RUN_NOW); DEBUGF(infof(data_s, "h2 header: %.*s: %.*s\n", namelen, name, valuelen, value)); |