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

2017-10-03 18:55:12 +02:00 · 2017-10-03 18:55:12 +02:00 · 552250356b
parent 30592719c0 e2d7057988
commit 552250356b
1 changed files with 1 additions and 1 deletions
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
@ -281,7 +281,7 @@ public class Request implements HttpServletRequest
    public PushBuilder newPushBuilder()
    {
        if (!isPushSupported())
-            throw new IllegalStateException(String.format("%s,push=%b,channel=%s", this, isPush(), getHttpChannel()));
+            return null;

        HttpFields fields = new HttpFields(getHttpFields().size()+5);