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

Merged branch 'jetty-9.4.x' into 'master'.

This commit is contained in:
Simone Bordet 2017-09-25 13:05:00 +02:00
parent c35d7724f4 6aafc3b792
commit d0d52c8ba1
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
View File

@ -729,7 +729,7 @@ public class HttpClient extends ContainerLifeCycle
*/ */
public void setUserAgentField(HttpField agent) public void setUserAgentField(HttpField agent)
{ {
if (agent.getHeader() != HttpHeader.USER_AGENT) if (agent != null && agent.getHeader() != HttpHeader.USER_AGENT)
throw new IllegalArgumentException(); throw new IllegalArgumentException();
this.agentField = agent; this.agentField = agent;
} }

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

@ -26,7 +26,7 @@ The modules and XML files involved can be seen with the following commands:
.... ....
$ java -jar $JETTY_HOME/start.jar --list-modules $ java -jar $JETTY_HOME/start.jar --list-modules
... ...
1) protonego-boot <transitive> 1) alpn-impl <transitive>
... ...
2) http ${jetty.base}/start.d/http.ini 2) http ${jetty.base}/start.d/http.ini
2) ssl ${jetty.base}/start.d/ssl.ini 2) ssl ${jetty.base}/start.d/ssl.ini
@ -64,6 +64,7 @@ Currently there are very few HTTP/2 configuration properties and the default val
[cols=",",options="header",] [cols=",",options="header",]
|======================================================================= |=======================================================================
|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 128). Larger values increase parallelism but cost a memory commitment.
|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. |jetty.http2.initialSessionRecvWindow |The initial receive flow control window size for a new session (default 1048576). 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 524288). Larger values may allow greater throughput but also risk head of line blocking if TCP/IP flow control is triggered.
|======================================================================= |=======================================================================