nodejs
diff --git a/‎lib/internal/http2/core.js‎
Lines changed: 37 additions & 30 deletions b/‎lib/internal/http2/core.js‎
Lines changed: 37 additions & 30 deletions
diff --git a/‎src/node_http2.cc‎
Lines changed: 16 additions & 16 deletions b/‎src/node_http2.cc‎
Lines changed: 16 additions & 16 deletions
@@ -126,7 +126,10 @@ const {
   HTTP_STATUS_OK,
   HTTP_STATUS_NO_CONTENT,
   HTTP_STATUS_NOT_MODIFIED,
-  HTTP_STATUS_SWITCHING_PROTOCOLS
+  HTTP_STATUS_SWITCHING_PROTOCOLS,
+
+  STREAM_OPTION_EMPTY_PAYLOAD,
+  STREAM_OPTION_GET_TRAILERS
 } = constants;
 
 // Top level to avoid creating a closure
@@ -411,20 +414,22 @@ function requestOnConnect(headers, options) {
     return;
   }
 
-  let getTrailers = false;
+  let streamOptions = 0;
+  if (options.endStream)
+    streamOptions |= STREAM_OPTION_EMPTY_PAYLOAD;
+
   if (typeof options.getTrailers === 'function') {
-    getTrailers = true;
+    streamOptions |= STREAM_OPTION_GET_TRAILERS;
     this[kState].getTrailers = options.getTrailers;
   }
 
   // ret will be either the reserved stream ID (if positive)
   // or an error code (if negative)
   const ret = handle.submitRequest(headersList,
-                                   !!options.endStream,
+                                   streamOptions,
                                    options.parent | 0,
                                    options.weight | 0,
-                                   !!options.exclusive,
-                                   getTrailers);
+                                   !!options.exclusive);
 
   // In an error condition, one of three possible response codes will be
   // possible:
@@ -1567,7 +1572,7 @@ function processHeaders(headers) {
 }
 
 function processRespondWithFD(fd, headers, offset = 0, length = -1,
-                              getTrailers = false) {
+                              streamOptions = 0) {
   const session = this[kSession];
   const state = this[kState];
   state.headersSent = true;
@@ -1577,7 +1582,7 @@ function processRespondWithFD(fd, headers, offset = 0, length = -1,
 
   const handle = session[kHandle];
   const ret =
-    handle.submitFile(this[kID], fd, headers, offset, length, getTrailers);
+    handle.submitFile(this[kID], fd, headers, offset, length, streamOptions);
   let err;
   switch (ret) {
     case NGHTTP2_ERR_NOMEM:
@@ -1592,7 +1597,7 @@ function processRespondWithFD(fd, headers, offset = 0, length = -1,
   }
 }
 
-function doSendFD(session, options, fd, headers, getTrailers, err, stat) {
+function doSendFD(session, options, fd, headers, streamOptions, err, stat) {
   if (this.destroyed || session.destroyed) {
     abort(this);
     return;
@@ -1622,10 +1627,10 @@ function doSendFD(session, options, fd, headers, getTrailers, err, stat) {
   processRespondWithFD.call(this, fd, headersList,
                             statOptions.offset,
                             statOptions.length,
-                            getTrailers);
+                            streamOptions);
 }
 
-function doSendFileFD(session, options, fd, headers, getTrailers, err, stat) {
+function doSendFileFD(session, options, fd, headers, streamOptions, err, stat) {
   if (this.destroyed || session.destroyed) {
     abort(this);
     return;
@@ -1680,10 +1685,10 @@ function doSendFileFD(session, options, fd, headers, getTrailers, err, stat) {
   processRespondWithFD.call(this, fd, headersList,
                             options.offset,
                             options.length,
-                            getTrailers);
+                            streamOptions);
 }
 
-function afterOpen(session, options, headers, getTrailers, err, fd) {
+function afterOpen(session, options, headers, streamOptions, err, fd) {
   const state = this[kState];
   const onError = options.onError;
   if (this.destroyed || session.destroyed) {
@@ -1701,7 +1706,8 @@ function afterOpen(session, options, headers, getTrailers, err, fd) {
   state.fd = fd;
 
   fs.fstat(fd,
-           doSendFileFD.bind(this, session, options, fd, headers, getTrailers));
+           doSendFileFD.bind(this, session, options, fd,
+                             headers, streamOptions));
 }
 
 function streamOnError(err) {
@@ -1785,9 +1791,9 @@ class ServerHttp2Stream extends Http2Stream {
       throw headersList;
     }
 
-    const ret = handle.submitPushPromise(this[kID],
-                                         headersList,
-                                         options.endStream);
+    const streamOptions = options.endStream ? STREAM_OPTION_EMPTY_PAYLOAD : 0;
+
+    const ret = handle.submitPushPromise(this[kID], headersList, streamOptions);
     let err;
     switch (ret) {
       case NGHTTP2_ERR_NOMEM:
@@ -1843,14 +1849,17 @@ class ServerHttp2Stream extends Http2Stream {
     options = Object.assign(Object.create(null), options);
     options.endStream = !!options.endStream;
 
-    let getTrailers = false;
+    let streamOptions = 0;
+    if (options.endStream)
+      streamOptions |= STREAM_OPTION_EMPTY_PAYLOAD;
+
     if (options.getTrailers !== undefined) {
       if (typeof options.getTrailers !== 'function') {
         throw new errors.TypeError('ERR_INVALID_OPT_VALUE',
                                    'getTrailers',
                                    options.getTrailers);
       }
-      getTrailers = true;
+      streamOptions |= STREAM_OPTION_GET_TRAILERS;
       state.getTrailers = options.getTrailers;
     }
 
@@ -1880,10 +1889,7 @@ class ServerHttp2Stream extends Http2Stream {
 
     const handle = session[kHandle];
     const ret =
-      handle.submitResponse(this[kID],
-                            headersList,
-                            options.endStream,
-                            getTrailers);
+      handle.submitResponse(this[kID], headersList, streamOptions);
     let err;
     switch (ret) {
       case NGHTTP2_ERR_NOMEM:
@@ -1936,14 +1942,14 @@ class ServerHttp2Stream extends Http2Stream {
                                  options.statCheck);
     }
 
-    let getTrailers = false;
+    let streamOptions = 0;
     if (options.getTrailers !== undefined) {
       if (typeof options.getTrailers !== 'function') {
         throw new errors.TypeError('ERR_INVALID_OPT_VALUE',
                                    'getTrailers',
                                    options.getTrailers);
       }
-      getTrailers = true;
+      streamOptions |= STREAM_OPTION_GET_TRAILERS;
       state.getTrailers = options.getTrailers;
     }
 
@@ -1962,7 +1968,8 @@ class ServerHttp2Stream extends Http2Stream {
 
     if (options.statCheck !== undefined) {
       fs.fstat(fd,
-               doSendFD.bind(this, session, options, fd, headers, getTrailers));
+               doSendFD.bind(this, session, options, fd,
+                             headers, streamOptions));
       return;
     }
 
@@ -1976,7 +1983,7 @@ class ServerHttp2Stream extends Http2Stream {
     processRespondWithFD.call(this, fd, headersList,
                               options.offset,
                               options.length,
-                              getTrailers);
+                              streamOptions);
   }
 
   // Initiate a file response on this Http2Stream. The path is passed to
@@ -2018,14 +2025,14 @@ class ServerHttp2Stream extends Http2Stream {
                                  options.statCheck);
     }
 
-    let getTrailers = false;
+    let streamOptions = 0;
     if (options.getTrailers !== undefined) {
       if (typeof options.getTrailers !== 'function') {
         throw new errors.TypeError('ERR_INVALID_OPT_VALUE',
                                    'getTrailers',
                                    options.getTrailers);
       }
-      getTrailers = true;
+      streamOptions |= STREAM_OPTION_GET_TRAILERS;
       state.getTrailers = options.getTrailers;
     }
 
@@ -2039,7 +2046,7 @@ class ServerHttp2Stream extends Http2Stream {
     }
 
     fs.open(path, 'r',
-            afterOpen.bind(this, session, options, headers, getTrailers));
+            afterOpen.bind(this, session, options, headers, streamOptions));
   }
 
   // Sends a block of informational headers. In theory, the HTTP/2 spec
 
@@ -479,7 +479,7 @@ void Http2Session::SubmitRstStream(const FunctionCallbackInfo<Value>& args) {
 
 void Http2Session::SubmitRequest(const FunctionCallbackInfo<Value>& args) {
   // args[0] Array of headers
-  // args[1] endStream boolean
+  // args[1] options int
   // args[2] parentStream ID (for priority spec)
   // args[3] weight (for priority spec)
   // args[4] exclusive boolean (for priority spec)
@@ -492,15 +492,14 @@ void Http2Session::SubmitRequest(const FunctionCallbackInfo<Value>& args) {
   Isolate* isolate = env->isolate();
 
   Local<Array> headers = args[0].As<Array>();
-  bool endStream = args[1]->BooleanValue(context).ToChecked();
+  int options = args[1]->IntegerValue(context).ToChecked();
   int32_t parent = args[2]->Int32Value(context).ToChecked();
   int32_t weight = args[3]->Int32Value(context).ToChecked();
   bool exclusive = args[4]->BooleanValue(context).ToChecked();
-  bool getTrailers = args[5]->BooleanValue(context).ToChecked();
 
-  DEBUG_HTTP2("Http2Session: submitting request: headers: %d, end-stream: %d, "
+  DEBUG_HTTP2("Http2Session: submitting request: headers: %d, options: %d, "
               "parent: %d, weight: %d, exclusive: %d\n", headers->Length(),
-              endStream, parent, weight, exclusive);
+              options, parent, weight, exclusive);
 
   nghttp2_priority_spec prispec;
   nghttp2_priority_spec_init(&prispec, parent, weight, exclusive ? 1 : 0);
@@ -509,8 +508,7 @@ void Http2Session::SubmitRequest(const FunctionCallbackInfo<Value>& args) {
 
   int32_t ret = session->Nghttp2Session::SubmitRequest(&prispec,
                                                        *list, list.length(),
-                                                       nullptr, endStream,
-                                                       getTrailers);
+                                                       nullptr, options);
   DEBUG_HTTP2("Http2Session: request submitted, response: %d\n", ret);
   args.GetReturnValue().Set(ret);
 }
@@ -529,11 +527,10 @@ void Http2Session::SubmitResponse(const FunctionCallbackInfo<Value>& args) {
 
   int32_t id = args[0]->Int32Value(context).ToChecked();
   Local<Array> headers = args[1].As<Array>();
-  bool endStream = args[2]->BooleanValue(context).ToChecked();
-  bool getTrailers = args[3]->BooleanValue(context).ToChecked();
+  int options = args[2]->IntegerValue(context).ToChecked();
 
   DEBUG_HTTP2("Http2Session: submitting response for stream %d: headers: %d, "
-              "end-stream: %d\n", id, headers->Length(), endStream);
+              "options: %d\n", id, headers->Length(), options);
 
   if (!(stream = session->FindStream(id))) {
     return args.GetReturnValue().Set(NGHTTP2_ERR_INVALID_STREAM_ID);
@@ -542,7 +539,7 @@ void Http2Session::SubmitResponse(const FunctionCallbackInfo<Value>& args) {
   Headers list(isolate, context, headers);
 
   args.GetReturnValue().Set(
-      stream->SubmitResponse(*list, list.length(), endStream, getTrailers));
+      stream->SubmitResponse(*list, list.length(), options));
 }
 
 void Http2Session::SubmitFile(const FunctionCallbackInfo<Value>& args) {
@@ -566,7 +563,7 @@ void Http2Session::SubmitFile(const FunctionCallbackInfo<Value>& args) {
 
   int64_t offset = args[3]->IntegerValue(context).ToChecked();
   int64_t length = args[4]->IntegerValue(context).ToChecked();
-  bool getTrailers = args[5]->BooleanValue(context).ToChecked();
+  int options = args[5]->IntegerValue(context).ToChecked();
 
   CHECK_GE(offset, 0);
 
@@ -580,7 +577,7 @@ void Http2Session::SubmitFile(const FunctionCallbackInfo<Value>& args) {
   Headers list(isolate, context, headers);
 
   args.GetReturnValue().Set(stream->SubmitFile(fd, *list, list.length(),
-                                               offset, length, getTrailers));
+                                               offset, length, options));
 }
 
 void Http2Session::SendHeaders(const FunctionCallbackInfo<Value>& args) {
@@ -719,10 +716,10 @@ void Http2Session::SubmitPushPromise(const FunctionCallbackInfo<Value>& args) {
   Nghttp2Stream* parent;
   int32_t id = args[0]->Int32Value(context).ToChecked();
   Local<Array> headers = args[1].As<Array>();
-  bool endStream = args[2]->BooleanValue(context).ToChecked();
+  int options = args[2]->IntegerValue(context).ToChecked();
 
   DEBUG_HTTP2("Http2Session: submitting push promise for stream %d: "
-              "end-stream: %d, headers: %d\n", id, endStream,
+              "options: %d, headers: %d\n", id, options,
               headers->Length());
 
   if (!(parent = session->FindStream(id))) {
@@ -732,7 +729,7 @@ void Http2Session::SubmitPushPromise(const FunctionCallbackInfo<Value>& args) {
   Headers list(isolate, context, headers);
 
   int32_t ret = parent->SubmitPushPromise(*list, list.length(),
-                                          nullptr, endStream);
+                                          nullptr, options);
   DEBUG_HTTP2("Http2Session: push promise submitted, ret: %d\n", ret);
   args.GetReturnValue().Set(ret);
 }
@@ -1250,6 +1247,9 @@ void Initialize(Local<Object> target,
   NODE_DEFINE_HIDDEN_CONSTANT(constants, NGHTTP2_ERR_STREAM_CLOSED);
   NODE_DEFINE_CONSTANT(constants, NGHTTP2_ERR_FRAME_SIZE_ERROR);
 
+  NODE_DEFINE_HIDDEN_CONSTANT(constants, STREAM_OPTION_EMPTY_PAYLOAD);
+  NODE_DEFINE_HIDDEN_CONSTANT(constants, STREAM_OPTION_GET_TRAILERS);
+
   NODE_DEFINE_CONSTANT(constants, NGHTTP2_FLAG_NONE);
   NODE_DEFINE_CONSTANT(constants, NGHTTP2_FLAG_END_STREAM);
   NODE_DEFINE_CONSTANT(constants, NGHTTP2_FLAG_END_HEADERS);