You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/04/25 12:46:34 UTC

[1/2] guacamole-client git commit: GUACAMOLE-549: Do not automatically create HttpSession. If an extension truly needs an HttpSession, it should create it manually via the HttpServletRequest.

Repository: guacamole-client
Updated Branches:
  refs/heads/master c81cb7868 -> 03281667b


GUACAMOLE-549: Do not automatically create HttpSession. If an extension truly needs an HttpSession, it should create it manually via the HttpServletRequest.

Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/320d3428
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/320d3428
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/320d3428

Branch: refs/heads/master
Commit: 320d3428999927439dfb0a455fb59aba0c41aa91
Parents: c81cb78
Author: Michael Jumper <mj...@apache.org>
Authored: Wed Apr 25 00:45:50 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Wed Apr 25 00:45:50 2018 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/guacamole/rest/auth/TokenRESTService.java | 2 +-
 .../src/main/java/org/apache/guacamole/rest/user/UserResource.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/320d3428/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenRESTService.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenRESTService.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenRESTService.java
index cea0315..e8c1c77 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenRESTService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenRESTService.java
@@ -121,7 +121,7 @@ public class TokenRESTService {
         credentials.setUsername(username);
         credentials.setPassword(password);
         credentials.setRequest(request);
-        credentials.setSession(request.getSession(true));
+        credentials.setSession(request.getSession(false));
         credentials.setRemoteAddress(request.getRemoteAddr());
         credentials.setRemoteHostname(request.getRemoteHost());
 

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/320d3428/guacamole/src/main/java/org/apache/guacamole/rest/user/UserResource.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/user/UserResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/UserResource.java
index 72c9162..4e7ab92 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/user/UserResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/UserResource.java
@@ -158,7 +158,7 @@ public class UserResource
         credentials.setUsername(user.getIdentifier());
         credentials.setPassword(userPasswordUpdate.getOldPassword());
         credentials.setRequest(request);
-        credentials.setSession(request.getSession(true));
+        credentials.setSession(request.getSession(false));
         credentials.setRemoteAddress(request.getRemoteAddr());
         credentials.setRemoteHostname(request.getRemoteHost());
 


[2/2] guacamole-client git commit: GUACAMOLE-549: Merge do not automatically create HttpSession.

Posted by vn...@apache.org.
GUACAMOLE-549: Merge do not automatically create HttpSession.


Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/03281667
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/03281667
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/03281667

Branch: refs/heads/master
Commit: 03281667b4c997f7b75c18809dfdd8f0c8163a4c
Parents: c81cb78 320d342
Author: Nick Couchman <vn...@apache.org>
Authored: Wed Apr 25 08:45:55 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Wed Apr 25 08:45:55 2018 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/guacamole/rest/auth/TokenRESTService.java | 2 +-
 .../src/main/java/org/apache/guacamole/rest/user/UserResource.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------