httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1790855 - in /httpd/httpd/trunk/modules/http2: h2_session.c h2_stream.c
Date Mon, 10 Apr 2017 15:23:34 GMT
Author: icing
Date: Mon Apr 10 15:23:34 2017
New Revision: 1790855

URL: http://svn.apache.org/viewvc?rev=1790855&view=rev
Log:
On the trunk:

mod_http2: explicit int conversions to silence warnings in mod-h2 build.


Modified:
    httpd/httpd/trunk/modules/http2/h2_session.c
    httpd/httpd/trunk/modules/http2/h2_stream.c

Modified: httpd/httpd/trunk/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1790855&r1=1790854&r2=1790855&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_session.c Mon Apr 10 15:23:34 2017
@@ -792,13 +792,13 @@ static apr_status_t h2_session_create_in
         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;

Modified: httpd/httpd/trunk/modules/http2/h2_stream.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_stream.c?rev=1790855&r1=1790854&r2=1790855&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_stream.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_stream.c Mon Apr 10 15:23:34 2017
@@ -1008,7 +1008,7 @@ apr_status_t h2_stream_in_consumed(h2_st
         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;
         }



Mime
View raw message