Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk

2017-03-30 14:58:37 +11:00 · 2017-03-30 14:58:37 +11:00 · c7aa64aa10
parent bacf51a83d 18f17ac102
commit c7aa64aa10
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
@ -1506,7 +1506,7 @@ public class Request implements HttpServletRequest
            s.renewId(this);
            if (getRemoteUser() != null)
                s.setAttribute(Session.SESSION_CREATED_SECURE, Boolean.TRUE);
-            if (s.isIdChanged())
+            if (s.isIdChanged() && _sessionHandler.isUsingCookies())
                _channel.getResponse().addCookie(_sessionHandler.getSessionCookie(s, getContextPath(), isSecure()));
        }