From d65a6baca9a20461f976a2455d70eecc7faf2db5 Mon Sep 17 00:00:00 2001 From: James Moger Date: Sat, 16 Nov 2013 08:49:20 -0500 Subject: [PATCH] Update to Jetty 8.1.13 for Servlet 3 Change-Id: If3f30af2ed250968e65cde58bd413213f4d384b1 --- .classpath | 146 +++++++++---------- build.moxie | 2 +- gitblit.iml | 12 +- releases.moxie | 2 +- src/main/java/com/gitblit/GitBlitServer.java | 2 +- 5 files changed, 82 insertions(+), 82 deletions(-) diff --git a/.classpath b/.classpath index 91e6a8bc..fc7ba626 100644 --- a/.classpath +++ b/.classpath @@ -1,78 +1,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build.moxie b/build.moxie index b2abddfc..9f099fae 100644 --- a/build.moxie +++ b/build.moxie @@ -98,7 +98,7 @@ repositories: central, eclipse-snapshots, eclipse # Convenience properties for dependencies properties: { - jetty.version : 7.6.13.v20130916 + jetty.version : 8.1.13.v20130916 wicket.version : 1.4.21 lucene.version : 3.6.1 jgit.version : 3.1.0.201310021548-r diff --git a/gitblit.iml b/gitblit.iml index af35a7a4..67638df6 100644 --- a/gitblit.iml +++ b/gitblit.iml @@ -77,24 +77,24 @@ - + - + - + - + - + - + diff --git a/releases.moxie b/releases.moxie index ca298251..cc764fce 100644 --- a/releases.moxie +++ b/releases.moxie @@ -48,7 +48,7 @@ r20: { - Added GO setting to automatically redirect all http requests to the secure https connector - Automatically display common repository root documents as tabs on the docs page dependencyChanges: - - updated to Jetty 7.6.13 + - updated to Jetty 8.1.13 - updated to JGit 3.1.0 - replaced MarkdownPapers with pegdown 1.4.1 - added Eclipse WikiText libraries for processing confluence, mediawiki, textile, tracwiki, and twiki diff --git a/src/main/java/com/gitblit/GitBlitServer.java b/src/main/java/com/gitblit/GitBlitServer.java index ecb10011..292eec40 100644 --- a/src/main/java/com/gitblit/GitBlitServer.java +++ b/src/main/java/com/gitblit/GitBlitServer.java @@ -340,7 +340,7 @@ public class GitBlitServer { HashSessionManager sessionManager = new HashSessionManager(); sessionManager.setHttpOnly(true); // Use secure cookies if only serving https - sessionManager.setSecureCookies(params.port <= 0 && params.securePort > 0); + sessionManager.setSecureRequestOnly(params.port <= 0 && params.securePort > 0); rootContext.getSessionHandler().setSessionManager(sessionManager); // Ensure there is a defined User Service -- 2.39.5