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
be20d0f0
Commit
be20d0f0
authored
Feb 19, 2015
by
Tom Evans
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #185 from igniterealtime/OF-877
OF-877 breaks plugins webservices fix
parents
77942590
de1f6408
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
7 deletions
+12
-7
HttpBindManager.java
src/java/org/jivesoftware/openfire/http/HttpBindManager.java
+12
-7
No files found.
src/java/org/jivesoftware/openfire/http/HttpBindManager.java
View file @
be20d0f0
...
@@ -123,9 +123,9 @@ public final class HttpBindManager {
...
@@ -123,9 +123,9 @@ public final class HttpBindManager {
public
static
Map
<
String
,
Boolean
>
HTTP_BIND_ALLOWED_ORIGINS
=
new
HashMap
<
String
,
Boolean
>();
public
static
Map
<
String
,
Boolean
>
HTTP_BIND_ALLOWED_ORIGINS
=
new
HashMap
<
String
,
Boolean
>();
private
static
HttpBindManager
instance
=
new
HttpBindManager
();
private
static
HttpBindManager
instance
=
new
HttpBindManager
();
// Compression "disabled" by default; use "optional" to enable compression (restart required)
// Compression "disabled" by default; use "optional" to enable compression (restart required)
// When enabled, http response will be compressed if the http request includes an
// When enabled, http response will be compressed if the http request includes an
// "Accept" header with a value of "gzip" and/or "deflate"
// "Accept" header with a value of "gzip" and/or "deflate"
private
static
boolean
isCompressionEnabled
=
!(
JiveGlobals
.
getProperty
(
private
static
boolean
isCompressionEnabled
=
!(
JiveGlobals
.
getProperty
(
ConnectionSettings
.
Client
.
COMPRESSION_SETTINGS
,
Connection
.
CompressionPolicy
.
disabled
.
toString
())
ConnectionSettings
.
Client
.
COMPRESSION_SETTINGS
,
Connection
.
CompressionPolicy
.
disabled
.
toString
())
...
@@ -173,6 +173,9 @@ public final class HttpBindManager {
...
@@ -173,6 +173,9 @@ public final class HttpBindManager {
PropertyEventDispatcher
.
addListener
(
new
HttpServerPropertyListener
());
PropertyEventDispatcher
.
addListener
(
new
HttpServerPropertyListener
());
this
.
httpSessionManager
=
new
HttpSessionManager
();
this
.
httpSessionManager
=
new
HttpSessionManager
();
// we need to initialise contexts at constructor time in order for plugins to add their contexts before start()
contexts
=
new
ContextHandlerCollection
();
// setup the cache for the allowed origins
// setup the cache for the allowed origins
this
.
setupAllowedOriginsMap
();
this
.
setupAllowedOriginsMap
();
}
}
...
@@ -225,7 +228,7 @@ public final class HttpBindManager {
...
@@ -225,7 +228,7 @@ public final class HttpBindManager {
if
(
port
>
0
)
{
if
(
port
>
0
)
{
HttpConfiguration
httpConfig
=
new
HttpConfiguration
();
HttpConfiguration
httpConfig
=
new
HttpConfiguration
();
configureProxiedConnector
(
httpConfig
);
configureProxiedConnector
(
httpConfig
);
ServerConnector
connector
=
new
ServerConnector
(
httpBindServer
,
null
,
null
,
null
,
-
1
,
bindThreads
,
ServerConnector
connector
=
new
ServerConnector
(
httpBindServer
,
null
,
null
,
null
,
-
1
,
bindThreads
,
new
HttpConnectionFactory
(
httpConfig
));
new
HttpConnectionFactory
(
httpConfig
));
// Listen on a specific network interface if it has been set.
// Listen on a specific network interface if it has been set.
...
@@ -279,8 +282,8 @@ public final class HttpBindManager {
...
@@ -279,8 +282,8 @@ public final class HttpBindManager {
sslConnector
=
new
HTTPSPDYServerConnector
(
httpBindServer
,
sslContextFactory
);
sslConnector
=
new
HTTPSPDYServerConnector
(
httpBindServer
,
sslContextFactory
);
}
else
{
}
else
{
sslConnector
=
new
ServerConnector
(
httpBindServer
,
null
,
null
,
null
,
-
1
,
bindThreads
,
sslConnector
=
new
ServerConnector
(
httpBindServer
,
null
,
null
,
null
,
-
1
,
bindThreads
,
new
SslConnectionFactory
(
sslContextFactory
,
"http/1.1"
),
new
HttpConnectionFactory
(
httpsConfig
));
new
SslConnectionFactory
(
sslContextFactory
,
"http/1.1"
),
new
HttpConnectionFactory
(
httpsConfig
));
}
}
sslConnector
.
setHost
(
getBindInterface
());
sslConnector
.
setHost
(
getBindInterface
());
sslConnector
.
setPort
(
securePort
);
sslConnector
.
setPort
(
securePort
);
...
@@ -517,7 +520,7 @@ public final class HttpBindManager {
...
@@ -517,7 +520,7 @@ public final class HttpBindManager {
private
synchronized
void
configureHttpBindServer
(
int
port
,
int
securePort
)
{
private
synchronized
void
configureHttpBindServer
(
int
port
,
int
securePort
)
{
// this is the number of threads allocated to each connector/port
// this is the number of threads allocated to each connector/port
int
bindThreads
=
JiveGlobals
.
getIntProperty
(
HTTP_BIND_THREADS
,
HTTP_BIND_THREADS_DEFAULT
);
int
bindThreads
=
JiveGlobals
.
getIntProperty
(
HTTP_BIND_THREADS
,
HTTP_BIND_THREADS_DEFAULT
);
final
QueuedThreadPool
tp
=
new
QueuedThreadPool
();
final
QueuedThreadPool
tp
=
new
QueuedThreadPool
();
tp
.
setName
(
"Jetty-QTP-BOSH"
);
tp
.
setName
(
"Jetty-QTP-BOSH"
);
...
@@ -540,7 +543,9 @@ public final class HttpBindManager {
...
@@ -540,7 +543,9 @@ public final class HttpBindManager {
httpBindServer
.
addConnector
(
httpsConnector
);
httpBindServer
.
addConnector
(
httpsConnector
);
}
}
contexts
=
new
ContextHandlerCollection
();
//contexts = new ContextHandlerCollection();
// TODO implement a way to get plugins to add their their web services to contexts
createBoshHandler
(
contexts
,
"/http-bind"
);
createBoshHandler
(
contexts
,
"/http-bind"
);
createCrossDomainHandler
(
contexts
,
"/crossdomain.xml"
);
createCrossDomainHandler
(
contexts
,
"/crossdomain.xml"
);
loadStaticDirectory
(
contexts
);
loadStaticDirectory
(
contexts
);
...
...
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