cleanup

Author: arjan-bal

internal/transport/http2_client.go

@@ -1654,13 +1654,6 @@ func (t *http2Client) reader(errCh chan<- error) {
 		}
 	}()
 
-	pool := t.bufferPool
-	if pool == nil {
-		// Note that this is only supposed to be nil in tests. Otherwise, stream
-		// is always initialized with a BufferPool.
-		pool = mem.DefaultBufferPool()
-	}
-
 	if err := t.readServerPreface(); err != nil {
 		errCh <- err
 		return

internal/transport/http2_server.go

@@ -169,7 +169,6 @@ func NewServerTransport(conn net.Conn, config *ServerConfig) (_ ServerTransport,
 	if config.MaxHeaderListSize != nil {
 		maxHeaderListSize = *config.MaxHeaderListSize
 	}
-
 	framer := newFramer(conn, writeBufSize, readBufSize, config.SharedWriteBuffer, maxHeaderListSize, config.BufferPool)
 	// Send initial settings as connection preface to client.
 	isettings := []http2.Setting{{
@@ -669,16 +668,10 @@ func (t *http2Server) HandleStreams(ctx context.Context, handle func(*ServerStre
 		close(t.readerDone)
 		<-t.loopyWriterDone
 	}()
-	pool := t.bufferPool
-	if pool == nil {
-		// Note that this is only supposed to be nil in tests. Otherwise, stream
-		// is always initialized with a BufferPool.
-		pool = mem.DefaultBufferPool()
-	}
 	for {
 		t.controlBuf.throttle()
-		atomic.StoreInt64(&t.lastRead, time.Now().UnixNano())
 		frame, err := t.framer.readFrame()
+		atomic.StoreInt64(&t.lastRead, time.Now().UnixNano())
 		if err != nil {
 			if se, ok := err.(http2.StreamError); ok {
 				if t.logger.V(logLevel) {

internal/transport/http_util.go

@@ -443,21 +443,22 @@ func newFramer(conn io.ReadWriter, writeBufferSize, readBufferSize int, sharedWr
 	return f
 }
 
+// readFrame reads a single frame. The returned Frame is only valid
+// until the next call to readFrame.
 func (f *framer) readFrame() (any, error) {
 	fh, err := f.fr.ReadFrameHeader()
 	if err != nil {
 		return nil, err
 	}
+	// Read the data frame directly from the underlying io.Reader to avoid
+	// copies.
 	if fh.Type == http2.FrameData {
 		err = f.readDataFrame(fh, f.pool, &f.dataFrame)
 		return &f.dataFrame, err
-	} else {
-		return f.fr.ReadFrameForHeader(fh)
 	}
+	return f.fr.ReadFrameForHeader(fh)
 }
 
-// readDataFrame reads and parses a data frame from the underlying io.Reader.
-// Frames aren't safe to read from after a subsequent call to ReadFrame.
 func (f *framer) readDataFrame(fh http2.FrameHeader, pool mem.BufferPool, df *parsedDataFrame) (err error) {
 	if fh.StreamID == 0 {
 		// DATA frames MUST be associated with a stream. If a