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

Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x

This commit is contained in:
Joakim Erdfelt 2022-06-15 15:07:38 -05:00
parent 55a3da5cb7 309b6a9b66
commit 45b899cb7a
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/RegexPathSpec.java
View File

@ -18,12 +18,12 @@ import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.eclipse.jetty.util.log.Log; import org.slf4j.Logger;
import org.eclipse.jetty.util.log.Logger; import org.slf4j.LoggerFactory;
public class RegexPathSpec extends AbstractPathSpec public class RegexPathSpec extends AbstractPathSpec
{ {
private static final Logger LOG = Log.getLogger(UriTemplatePathSpec.class); private static final Logger LOG = LoggerFactory.getLogger(UriTemplatePathSpec.class);
private static final Map<Character, String> FORBIDDEN_ESCAPED = new HashMap<>(); private static final Map<Character, String> FORBIDDEN_ESCAPED = new HashMap<>();

12
jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/proxy/WebSocketProxy.java
View File

@ -31,10 +31,20 @@ import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.api.StatusCode;
import org.eclipse.jetty.websocket.api.WebSocketConnectionListener;
import org.eclipse.jetty.websocket.api.WebSocketPartialListener;
import org.eclipse.jetty.websocket.api.WebSocketPingPongListener;
import org.eclipse.jetty.websocket.api.exceptions.WebSocketException;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class WebSocketProxy public class WebSocketProxy
{ {
private static final Logger LOG = Log.getLogger(WebSocketProxy.class); private static final Logger LOG = LoggerFactory.getLogger(WebSocketProxy.class);
private final WebSocketClient client; private final WebSocketClient client;
private final URI serverUri; private final URI serverUri;