Commits · a1b493b2d5bc7c1f5c421fb152cdaec4e4fcfcb9 · Administrator / Openfire

04 Dec, 2015 1 commit

Revert "OF-115 Remove race during outgoing session creation" · a1b493b2

Dave Cridland authored Dec 04, 2015

This reverts commit d0667e21.

While I think the general code is right, it's clearly got serious shortcomings
so I think it's best to back this out for now.

a1b493b2

01 Dec, 2015 23 commits
- Merge pull request #416 from igniterealtime/refactor-connectionmanagement · efa38c3d
  Guus der Kinderen authored Dec 01, 2015
```
Refactor connectionmanagement
```
  efa38c3d
- Removing unused / old unit test · e8829c01
  Guus der Kinderen authored Dec 01, 2015
  
  e8829c01
- Don't log problems that we cannot resolve properly (and originate outside of... · 3c9030e9
  Guus der Kinderen authored Dec 01, 2015
```
Don't log problems that we cannot resolve properly (and originate outside of our influence) to warn.
```
  3c9030e9
- Exceptions that are not exceptional should not be logged on 'warn' level. · 726c5e03
  Guus der Kinderen authored Dec 01, 2015
  
  726c5e03
- An unchecked checkbox results in no param value. Don't use a default value in that case! · 69c1f5b4
  Guus der Kinderen authored Dec 01, 2015
  
  69c1f5b4
- JMXWeb plugin should not NPE on destruction. · db472de5
  Guus der Kinderen authored Dec 01, 2015
  
  db472de5
- Adding debug logging to trust manager. · fea65b9b
  Guus der Kinderen authored Dec 01, 2015
  
  fea65b9b
- Should procuess RuntimeExceptions gracefully (observed a NPE here). · bdd91418
  Guus der Kinderen authored Dec 01, 2015
  
  bdd91418
- When selecting identity store, the correct menu item should be highlighted. · 2c239e17
  Guus der Kinderen authored Dec 01, 2015
  
  2c239e17
- Fix NPE when no packets were queued before start or fail of new session. · d29ef7e2
  Guus der Kinderen authored Dec 01, 2015
  
  d29ef7e2
- Allow configuration of 'allow self-signed' and 'verify validity' in admin console. · a0ce00e5
  Guus der Kinderen authored Dec 01, 2015
  
  a0ce00e5
- Merge remote-tracking branch 'upstream/master' into refactor-connectionmanagement · 2ea7e588
  Guus der Kinderen authored Dec 01, 2015
```
Conflicts:
	src/i18n/openfire_i18n_en.properties
	src/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java
```
  2ea7e588
- Restore S2S inbound port by creating ConnectionListiner for legacy/nonMINA socket handling. · 1b22ea34
  Guus der Kinderen authored Dec 01, 2015
  
  1b22ea34
- Merge pull request #415 from marclaporte/patch-1 · c34759e0
  Dele Olajide authored Dec 01, 2015
```
Document port number to use http instead of https
```
  c34759e0
- Merge pull request #205 from surevine/dwd/OF-115 · 29ccd90d
  Dave Cridland authored Dec 01, 2015
```
OF-115 Remove race during outgoing session creation
```
  29ccd90d
- Merge pull request #407 from tevans/OF-473 · e9048188
  Dave Cridland authored Dec 01, 2015
```
OF-473: Revert original patch
```
  e9048188
- Merge pull request #413 from sco0ter/nodeNPE · 16f319fe
  Dave Cridland authored Dec 01, 2015
```
Fix NPE in Node.java when changing node configuration.
```
  16f319fe
- Merge pull request #414 from surevine/dwd/pr304 · 2bb8ec26
  Dave Cridland authored Dec 01, 2015
```
Add and document LDAP startTls option to setup
```
  2bb8ec26
- Revert "ConnectionType.SOCKET_S2S is MINA based, so don't exlude it on start()" · f0e6e04d
  Guus der Kinderen authored Dec 01, 2015
```
This reverts commit f25491c7.
```
  f0e6e04d
- ConnectionType.SOCKET_S2S is MINA based, so don't exlude it on start() · f25491c7
  akrherz authored Dec 01, 2015
  
  f25491c7
- Document port number to use http instead of https · 7bdd1e1f
  Marc Laporte authored Dec 01, 2015
  
  7bdd1e1f
- Do not use CRLs, Add logging, and default to BC provider. · 99930932
  Guus der Kinderen authored Dec 01, 2015
  
  99930932
- Adding debug logging. · 8175a5ea
  Guus der Kinderen authored Dec 01, 2015
  
  8175a5ea
30 Nov, 2015 12 commits
- Chain ordering should not fail on self-signed CA root certificate. · 6587a3c8
  Guus der Kinderen authored Nov 30, 2015
  
  6587a3c8
- Reinstated unit test for OpenfireX509TrustManager · 9978b4b0
  Guus der Kinderen authored Nov 30, 2015
  
  9978b4b0
- Fix NPE in S2S. · 7a28ee14
  Guus der Kinderen authored Nov 30, 2015
  
  7a28ee14
- Log a stacktrace when something erroneous occurs. · cbab2458
  Guus der Kinderen authored Nov 30, 2015
  
  cbab2458
- OF-981: Remove Jive-specific build modifications. · 18069a03
  Guus der Kinderen authored Nov 30, 2015
  
  18069a03
- Merge leftovers · 0d9378d5
  Guus der Kinderen authored Nov 30, 2015
  
  0d9378d5
- Merge remote-tracking branch 'upstream/master' into refactor-connectionmanagement · 3b625223
  Guus der Kinderen authored Nov 30, 2015
```
Conflicts:
	src/java/org/jivesoftware/openfire/XMPPServer.java
	src/java/org/jivesoftware/openfire/net/SASLAuthentication.java
	src/java/org/jivesoftware/openfire/net/ServerStanzaHandler.java
	src/java/org/jivesoftware/openfire/session/LocalClientSession.java
	src/java/org/jivesoftware/util/CertificateManager.java
	src/web/WEB-INF/admin.tld
```
  3b625223
- Adding work-around for plugins that introduce non-standard connection types (smack, websocket). · 155bb672
  Guus der Kinderen authored Nov 30, 2015
  
  155bb672
- Restoring 'import CA certificate' functionality. · 5b21ed98
  Guus der Kinderen authored Nov 30, 2015
  
  5b21ed98
- Restoring 'import private key & certificate' functionality. · 5a52d003
  Guus der Kinderen authored Nov 30, 2015
  
  5a52d003
- restAPI minVersion needs to be 3.11.0 alpha due to JSP changes · 1ca70b61
  akrherz authored Nov 30, 2015
  
  1ca70b61
- Presence probe for local user is not allowed when probee not subscribed · a35afcb5
  sentient07 authored Mar 05, 2015
  
  a35afcb5
29 Nov, 2015 1 commit
- Compression policies should be defined in Connection Configuration. · 75494821
  Guus der Kinderen authored Nov 29, 2015
  
  75494821
28 Nov, 2015 3 commits
- Reduce complexity by removing a wrapper method. · 690d43e1
  Guus der Kinderen authored Nov 28, 2015
  
  690d43e1
- Removed a temporary work-around used during development. · a1c7f9cb
  Guus der Kinderen authored Nov 28, 2015
  
  a1c7f9cb
- Allow for more types of connection acceptors than just NIO/MINA based ones. · 81111e99
  Guus der Kinderen authored Nov 28, 2015
  
  81111e99