Commit 8727c6ed authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato

1) Updated JavaMail to 1.4.1. JM-1222

2) Updated for Openfire 3.4.3
3) Added missing #createSocket() to socket factory (required by new JavaMail 1.4.1 and Christmas present)

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9675 b35dd754-fafc-0310-a699-88a17e54d16e
parent 808f91f3
......@@ -66,7 +66,7 @@
<property name="version.major" value="3"/>
<property name="version.minor" value="4"/>
<property name="version.revision" value="2"/>
<property name="version.revision" value="3"/>
<property name="version.extra" value=""/> <!-- For 'beta' or 'alpha' -->
<property name="dist.prefix" value="openfire"/>
......
No preview for this file type
......@@ -31,7 +31,7 @@ jsp-api.jar | Jetty 6.0.1 (2.0)
jtds.jar | 1.2.2
junit.jar | 4.3.1
jzlib.jar | 1.0.7
mail.jar | 1.4.0 (JavaMail)
mail.jar | 1.4.1 (JavaMail)
mina-core.jar | 1.1.5 (https://svn.apache.org/repos/asf/mina/branches/1.1)
mina-filter-compression.jar | 1.1.5 (https://svn.apache.org/repos/asf/mina/branches/1.1)
mina-filter-ssl.jar | 1.1.5 (https://svn.apache.org/repos/asf/mina/branches/1.1)
......
......@@ -326,7 +326,7 @@ public class XMPPServer {
name = JiveGlobals.getProperty("xmpp.domain", "127.0.0.1").toLowerCase();
version = new Version(3, 4, 2, Version.ReleaseStatus.Release, -1);
version = new Version(3, 4, 3, Version.ReleaseStatus.Release, -1);
if ("true".equals(JiveGlobals.getXMLProperty("setup"))) {
setupMode = false;
}
......
......@@ -57,6 +57,10 @@ public class SimpleSSLSocketFactory extends SSLSocketFactory {
return new SimpleSSLSocketFactory();
}
public Socket createSocket() throws IOException {
return factory.createSocket();
}
public Socket createSocket(Socket socket, String s, int i, boolean flag)
throws IOException
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment