incoming trailers passed into chunked request bodies, outgoing trailers not supported yet

[apache] / modules / http2 / h2_session.c

diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c
index 46898c43160211cbe4b99bde2cbb00af494a71fe..d70eefd2965c3e339ac2d87ec869013692dc1074 100644 (file)
--- a/modules/http2/h2_session.c
+++ b/modules/http2/h2_session.c
@@ -1076,6 +1076,18 @@ static ssize_t stream_data_cb(nghttp2_session *ng2s,
     }
     
     if (eos) {
+        apr_table_t *trailers = h2_stream_get_trailers(stream);
+        if (trailers && !apr_is_empty_table(trailers)) {
+            h2_ngheader *nh;
+            int rv;
+            
+            nh = h2_util_ngheader_make(stream->pool, trailers);
+            rv = nghttp2_submit_trailer(ng2s, stream->id, nh->nv, nh->nvlen);
+            if (rv < 0) {
+                nread = rv;
+            }
+        }
+        
         *data_flags |= NGHTTP2_DATA_FLAG_EOF;
     }