Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #948 - 9.4.0.RC0 jetty-distribution invalid config etc/jetty-http2c.xml. 

Updated references to deprecated property initialStreamSendWindow
with initialStreamRecvWindow.
This commit is contained in:
Simone Bordet 2016-09-22 21:48:08 +02:00
parent 1ede9febc6
commit 4edc50b59f
7 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc
View File

@ -65,5 +65,5 @@ Currently there are very few HTTP/2 configuration properties and the default val
|======================================================================= |=======================================================================
|Property |Description |Property |Description
|jetty.http2.maxConcurrentStreams |The maximum number of concurrently open streams allowed on a single HTTP/2 connection (default 1024). Larger values increase parallelism but cost a memory commitment. |jetty.http2.maxConcurrentStreams |The maximum number of concurrently open streams allowed on a single HTTP/2 connection (default 1024). Larger values increase parallelism but cost a memory commitment.
|jetty.http2.initialStreamSendWindow |The initial flow control window size for a new stream (default 65535). Larger values may allow greater throughput but also risk head of line blocking if TCP/IP flow control is triggered. |jetty.http2.initialStreamRecvWindow |The initial receive flow control window size for a new stream (default 65535). Larger values may allow greater throughput but also risk head of line blocking if TCP/IP flow control is triggered.
|======================================================================= |=======================================================================

3
jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml
View File

@ -10,7 +10,7 @@
<New class="org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory"> <New class="org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory">
<Arg name="config"><Ref refid="sslHttpConfig"/></Arg> <Arg name="config"><Ref refid="sslHttpConfig"/></Arg>
<Set name="maxConcurrentStreams"><Property name="jetty.http2.maxConcurrentStreams" deprecated="http2.maxConcurrentStreams" default="1024"/></Set> <Set name="maxConcurrentStreams"><Property name="jetty.http2.maxConcurrentStreams" deprecated="http2.maxConcurrentStreams" default="1024"/></Set>
<Set name="initialStreamSendWindow"><Property name="jetty.http2.initialStreamSendWindow" default="65535"/></Set> <Set name="initialStreamRecvWindow"><Property name="jetty.http2.initialStreamRecvWindow" deprecated="jetty.http2.initialStreamSendWindow" default="65535"/></Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>
@ -23,4 +23,3 @@
</Ref> </Ref>
</Configure> </Configure>

3
jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml
View File

@ -10,9 +10,8 @@
<New class="org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory"> <New class="org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory">
<Arg name="config"><Ref refid="httpConfig"/></Arg> <Arg name="config"><Ref refid="httpConfig"/></Arg>
<Set name="maxConcurrentStreams"><Property name="jetty.http2c.maxConcurrentStreams" deprecated="http2.maxConcurrentStreams" default="1024"/></Set> <Set name="maxConcurrentStreams"><Property name="jetty.http2c.maxConcurrentStreams" deprecated="http2.maxConcurrentStreams" default="1024"/></Set>
<Set name="initialStreamSendWindow"><Property name="jetty.http2c.initialStreamSendWindow" default="65535"/></Set> <Set name="initialStreamRecvWindow"><Property name="jetty.http2c.initialStreamRecvWindow" deprecated="jetty.http2c.initialStreamSendWindow" default="65535"/></Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>
</Configure> </Configure>

4
jetty-http2/http2-server/src/main/config/modules/http2.mod
View File

@ -16,5 +16,5 @@ etc/jetty-http2.xml
## Max number of concurrent streams per connection ## Max number of concurrent streams per connection
# jetty.http2.maxConcurrentStreams=1024 # jetty.http2.maxConcurrentStreams=1024
## Initial stream send (server to client) window ## Initial stream receive window (client to server)
# jetty.http2.initialStreamSendWindow=65535 # jetty.http2.initialStreamRecvWindow=65535

4
jetty-http2/http2-server/src/main/config/modules/http2c.mod
View File

@ -18,5 +18,5 @@ etc/jetty-http2c.xml
## Max number of concurrent streams per connection ## Max number of concurrent streams per connection
# jetty.http2c.maxConcurrentStreams=1024 # jetty.http2c.maxConcurrentStreams=1024
## Initial stream send (server to client) window ## Initial stream receive window (client to server)
# jetty.http2c.initialStreamSendWindow=65535 # jetty.http2c.initialStreamRecvWindow=65535

4
jetty-start/src/test/resources/dist-home/modules/http2.mod
View File

@ -16,5 +16,5 @@ etc/jetty-http2.xml
## Max number of concurrent streams per connection ## Max number of concurrent streams per connection
# jetty.http2.maxConcurrentStreams=1024 # jetty.http2.maxConcurrentStreams=1024
## Initial stream send (server to client) window ## Initial stream receive window (client to server)
# jetty.http2.initialStreamSendWindow=65535 # jetty.http2.initialStreamRecvWindow=65535

4
jetty-start/src/test/resources/dist-home/modules/http2c.mod
View File

@ -18,5 +18,5 @@ etc/jetty-http2c.xml
## Max number of concurrent streams per connection ## Max number of concurrent streams per connection
# jetty.http2.maxConcurrentStreams=1024 # jetty.http2.maxConcurrentStreams=1024
## Initial stream send (server to client) window ## Initial stream receive window (client to server)
# jetty.http2.initialStreamSendWindow=65535 # jetty.http2.initialStreamRecvWindow=65535