Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Openfire
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Openfire
Commits
4d6a8055
Commit
4d6a8055
authored
Nov 26, 2015
by
Dave Cridland
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #400 from sco0ter/of976
OF-976 Language is not properly set in HttpSession
parents
e446347c
a8596add
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
HttpSessionManager.java
...va/org/jivesoftware/openfire/http/HttpSessionManager.java
+4
-1
No files found.
src/java/org/jivesoftware/openfire/http/HttpSessionManager.java
View file @
4d6a8055
...
@@ -34,6 +34,7 @@ import java.util.concurrent.atomic.AtomicInteger;
...
@@ -34,6 +34,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import
org.dom4j.DocumentException
;
import
org.dom4j.DocumentException
;
import
org.dom4j.DocumentHelper
;
import
org.dom4j.DocumentHelper
;
import
org.dom4j.Element
;
import
org.dom4j.Element
;
import
org.dom4j.QName
;
import
org.jivesoftware.openfire.SessionManager
;
import
org.jivesoftware.openfire.SessionManager
;
import
org.jivesoftware.openfire.StreamID
;
import
org.jivesoftware.openfire.StreamID
;
import
org.jivesoftware.openfire.auth.UnauthorizedException
;
import
org.jivesoftware.openfire.auth.UnauthorizedException
;
...
@@ -43,6 +44,8 @@ import org.jivesoftware.util.TaskEngine;
...
@@ -43,6 +44,8 @@ import org.jivesoftware.util.TaskEngine;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
javax.xml.XMLConstants
;
/**
/**
* Manages sessions for all users connecting to Openfire using the HTTP binding protocol,
* Manages sessions for all users connecting to Openfire using the HTTP binding protocol,
* <a href="http://www.xmpp.org/extensions/xep-0124.html">XEP-0124</a>.
* <a href="http://www.xmpp.org/extensions/xep-0124.html">XEP-0124</a>.
...
@@ -169,7 +172,7 @@ public class HttpSessionManager {
...
@@ -169,7 +172,7 @@ public class HttpSessionManager {
// TODO Check if IP address is allowed to connect to the server
// TODO Check if IP address is allowed to connect to the server
// Default language is English ("en").
// Default language is English ("en").
String
language
=
rootNode
.
attributeValue
(
"xml:lang"
);
String
language
=
rootNode
.
attributeValue
(
QName
.
get
(
"lang"
,
XMLConstants
.
XML_NS_URI
)
);
if
(
language
==
null
||
""
.
equals
(
language
))
{
if
(
language
==
null
||
""
.
equals
(
language
))
{
language
=
"en"
;
language
=
"en"
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment