diff options
| author | Stefan Eissing <icing@apache.org> | 2017-04-10 17:23:34 +0200 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2017-04-10 17:23:34 +0200 |
| commit | 96c374a162d1cafc33a06b1782e0e0f5ee49b081 (patch) | |
| tree | 10d31608ca503d027ea9f82414b1d3a0424558eb | |
| parent | mod_brotli: Fix a minor typo in the description of BrotliAlterETag (diff) | |
| download | apache2-96c374a162d1cafc33a06b1782e0e0f5ee49b081.tar.xz apache2-96c374a162d1cafc33a06b1782e0e0f5ee49b081.zip | |
On the trunk:
mod_http2: explicit int conversions to silence warnings in mod-h2 build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790855 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | modules/http2/h2_session.c | 4 | ||||
| -rw-r--r-- | modules/http2/h2_stream.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c index f37741b61f..997d6fb00e 100644 --- a/modules/http2/h2_session.c +++ b/modules/http2/h2_session.c @@ -792,13 +792,13 @@ static apr_status_t h2_session_create_int(h2_session **psession, return status; } - session->in_pending = h2_iq_create(session->pool, session->max_stream_count); + session->in_pending = h2_iq_create(session->pool, (int)session->max_stream_count); if (session->in_pending == NULL) { apr_pool_destroy(pool); return APR_ENOMEM; } - session->in_process = h2_iq_create(session->pool, session->max_stream_count); + session->in_process = h2_iq_create(session->pool, (int)session->max_stream_count); if (session->in_process == NULL) { apr_pool_destroy(pool); return APR_ENOMEM; diff --git a/modules/http2/h2_stream.c b/modules/http2/h2_stream.c index 9784b4ec28..4cd2132207 100644 --- a/modules/http2/h2_stream.c +++ b/modules/http2/h2_stream.c @@ -1008,7 +1008,7 @@ apr_status_t h2_stream_in_consumed(h2_stream *stream, apr_off_t amount) apr_off_t consumed = amount; while (consumed > 0) { - int len = (consumed > INT_MAX)? INT_MAX : consumed; + int len = (consumed > INT_MAX)? INT_MAX : (int)consumed; nghttp2_session_consume(session->ngh2, stream->id, len); consumed -= len; } |