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-10.0.x' into 'jetty-11.0.x'.

This commit is contained in:
Simone Bordet 2020-07-09 13:32:47 +02:00
parent 06737ce800 d31bbb2195
commit a5a2ae6f45
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -2,6 +2,8 @@ jetty-11.0.0-SNAPSHOT
jetty-11.0.0-alpha0 jetty-11.0.0-alpha0
jetty-10.0.0.beta1
jetty-9.4.30.v20200611 - 11 June 2020 jetty-9.4.30.v20200611 - 11 June 2020
+ 4776 Incorrect path matching for WebSocket using PathMappings + 4776 Incorrect path matching for WebSocket using PathMappings
+ 4826 Upgrade to Apache Jasper 8.5.54 + 4826 Upgrade to Apache Jasper 8.5.54

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

@ -56,7 +56,7 @@ public class MultiplexConnectionPool extends AbstractConnectionPool implements C
public Connection acquire(boolean create) public Connection acquire(boolean create)
{ {
Connection connection = activate(); Connection connection = activate();
if (connection == null) if (connection == null && create)
{ {
int queuedRequests = getHttpDestination().getQueuedRequestCount(); int queuedRequests = getHttpDestination().getQueuedRequestCount();
int maxMultiplex = getMaxMultiplex(); int maxMultiplex = getMaxMultiplex();