Skip to content

Commit

Permalink
fix merge issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Geoffrey Kizer committed Jul 13, 2021
1 parent e5af1b7 commit 05bae0f
Showing 1 changed file with 1 addition and 3 deletions.
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

0 comments on commit 05bae0f

Please sign in to comment.