Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix merge issues
  • Loading branch information
Geoffrey Kizer committed Jul 13, 2021
commit 05bae0fadad746ff05af124bd3fc67f28e789202
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,11 @@ internal sealed partial class Http2Connection : HttpConnectionBase
private readonly Dictionary<int, Http2Stream> _httpStreams;

private readonly CreditManager _connectionWindow;
private readonly CreditManager _concurrentStreams;
private RttEstimator _rttEstimator;

private int _nextStream;
private bool _expectingSettingsAck;
private int _initialServerStreamWindowSize;
private int _maxConcurrentStreams;
private int _pendingWindowUpdate;
private long _idleSinceTickCount;

Expand Down Expand Up @@ -1511,7 +1509,7 @@ private void AddStream(Http2Stream http2Stream)
// assigning the stream ID to ensure only one stream gets an ID, and it must be held
// across setting the initial window size (available credit) and storing the stream into
// collection such that window size updates are able to atomically affect all known streams.
http2Stream.Initialize(_nextStream, _initialWindowSize);
http2Stream.Initialize(_nextStream, _initialServerStreamWindowSize);

// Client-initiated streams are always odd-numbered, so increase by 2.
_nextStream += 2;
Expand Down