httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1698107 - in /httpd/httpd/trunk/modules/http2: h2_mplx.c h2_response.c h2_session.c
Date Thu, 27 Aug 2015 10:19:36 GMT
Author: icing
Date: Thu Aug 27 10:19:36 2015
New Revision: 1698107

URL: http://svn.apache.org/r1698107
Log:
Applied patch by normw@gknw.net for ANSI C compliance.

Modified:
    httpd/httpd/trunk/modules/http2/h2_mplx.c
    httpd/httpd/trunk/modules/http2/h2_response.c
    httpd/httpd/trunk/modules/http2/h2_session.c

Modified: httpd/httpd/trunk/modules/http2/h2_mplx.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_mplx.c?rev=1698107&r1=1698106&r2=1698107&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_mplx.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_mplx.c Thu Aug 27 10:19:36 2015
@@ -436,7 +436,12 @@ apr_status_t h2_mplx_in_update_windows(h
     }
     status = apr_thread_mutex_lock(m->lock);
     if (APR_SUCCESS == status) {
-        update_ctx ctx = { cb, cb_ctx, 0 };
+        update_ctx ctx;
+        
+        ctx.cb              = cb;
+        ctx.cb_ctx          = cb_ctx;
+        ctx.streams_updated = 0;
+
         status = APR_EAGAIN;
         h2_io_set_iter(m->stream_ios, update_window, &ctx);
         

Modified: httpd/httpd/trunk/modules/http2/h2_response.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_response.c?rev=1698107&r1=1698106&r2=1698107&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_response.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_response.c Thu Aug 27 10:19:36 2015
@@ -202,7 +202,14 @@ static h2_ngheader *make_ngheader(apr_po
 {
     size_t n;
     h2_ngheader *h;
-    nvctx_t ctx = { NULL, 1, strlen(status) + 1, 0, NULL, pool };
+    nvctx_t ctx;
+    
+    ctx.nv       = NULL;
+    ctx.nvlen    = 1;
+    ctx.nvstrlen = strlen(status) + 1;
+    ctx.offset   = 0;
+    ctx.strbuf   = NULL;
+    ctx.pool     = pool;
     
     apr_table_do(count_header, &ctx, header, NULL);
     

Modified: httpd/httpd/trunk/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1698107&r1=1698106&r2=1698107&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_session.c Thu Aug 27 10:19:36 2015
@@ -852,7 +852,11 @@ static int h2_session_resume_streams_wit
     AP_DEBUG_ASSERT(session);
     if (!h2_stream_set_is_empty(session->streams)
         && session->mplx && !session->aborted) {
-        resume_ctx ctx = { session, 0 };
+        resume_ctx ctx;
+        
+        ctx.session      = session;
+        ctx.resume_count = 0;
+
         /* Resume all streams where we have data in the out queue and
          * which had been suspended before. */
         h2_stream_set_iter(session->streams, resume_on_data, &ctx);



Mime
View raw message