Revert "http2: fix end without read"

lib/internal/http2/compat.js

@@ -260,6 +260,8 @@ class Http2ServerRequest extends Readable {
     stream[kRequest] = this;
 
     // Pause the stream..
+    stream.pause();
+    stream.on('data', onStreamData);
     stream.on('trailers', onStreamTrailers);
     stream.on('end', onStreamEnd);
     stream.on('error', onStreamError);
@@ -326,12 +328,8 @@ class Http2ServerRequest extends Readable {
   _read(nread) {
     const state = this[kState];
     if (!state.closed) {
-      if (!state.didRead) {
-        state.didRead = true;
-        this[kStream].on('data', onStreamData);
-      } else {
-        process.nextTick(resumeStream, this[kStream]);
-      }
+      state.didRead = true;
+      process.nextTick(resumeStream, this[kStream]);
     } else {
       this.emit('error', new ERR_HTTP2_INVALID_STREAM());
     }

lib/internal/http2/core.js

@@ -349,11 +349,11 @@ function onStreamClose(code) {
     // Push a null so the stream can end whenever the client consumes
     // it completely.
     stream.push(null);
-    // If the client hasn't tried to consume the stream and there is no
-    // resume scheduled (which would indicate they would consume in the future),
-    // then just dump the incoming data so that the stream can be destroyed.
-    if (!stream[kState].didRead && !stream._readableState.resumeScheduled)
-      stream.resume();
+
+    // Same as net.
+    if (stream.readableLength === 0) {
+      stream.read(0);
+    }
   }
 }
 
@@ -1795,8 +1795,6 @@ class Http2Stream extends Duplex {
     const ret = this[kHandle].trailers(headersList);
     if (ret < 0)
       this.destroy(new NghttpError(ret));
-    else
-      this[kMaybeDestroy]();
   }
 
   get closed() {

test/parallel/test-http2-client-upload-reject.js

@@ -20,15 +20,12 @@ fs.readFile(loc, common.mustCall((err, data) => {
   const server = http2.createServer();
 
   server.on('stream', common.mustCall((stream) => {
-    // Wait for some data to come through.
-    setImmediate(() => {
-      stream.on('close', common.mustCall(() => {
-        assert.strictEqual(stream.rstCode, 0);
-      }));
-
-      stream.respond({ ':status': 400 });
-      stream.end();
-    });
+    stream.on('close', common.mustCall(() => {
+      assert.strictEqual(stream.rstCode, 0);
+    }));
+
+    stream.respond({ ':status': 400 });
+    stream.end();
   }));
 
   server.listen(0, common.mustCall(() => {