mirror of
https://github.com/processone/ejabberd.git
synced 2024-09-17 13:58:38 +02:00
* src/ejabberd_c2s.erl: Send new id for each new stream inside one
session (thanks to Maxim Ryazanov) * src/tls/tls_drv.c: Now reads all certificates from certificate file instead of reading only first one (thanks to Karl-Johan Karlsson) * examples/transport-configs/init-scripts/jabber-gg-transport: Fixed typo (thanks to Sander Devrieze) SVN Revision: 304
This commit is contained in:
parent
3bba1ba4a6
commit
e23e473012
@ -414,7 +414,8 @@ wait_for_feature_request({xmlstreamelement, El}, StateData) ->
|
||||
?INFO_MSG("(~w) Accepted authentication for ~s",
|
||||
[StateData#state.socket, U]),
|
||||
{next_state, wait_for_stream,
|
||||
StateData#state{authentificated = true,
|
||||
StateData#state{streamid = new_id(),
|
||||
authentificated = true,
|
||||
user = U
|
||||
}};
|
||||
{continue, ServerOut, NewSASLState} ->
|
||||
@ -444,6 +445,7 @@ wait_for_feature_request({xmlstreamelement, El}, StateData) ->
|
||||
{next_state, wait_for_stream,
|
||||
StateData#state{sockmod = tls,
|
||||
socket = TLSSocket,
|
||||
streamid = new_id(),
|
||||
tls_enabled = true
|
||||
}};
|
||||
_ ->
|
||||
@ -500,7 +502,8 @@ wait_for_sasl_response({xmlstreamelement, El}, StateData) ->
|
||||
?INFO_MSG("(~w) Accepted authentication for ~s",
|
||||
[StateData#state.socket, U]),
|
||||
{next_state, wait_for_stream,
|
||||
StateData#state{authentificated = true,
|
||||
StateData#state{streamid = new_id(),
|
||||
authentificated = true,
|
||||
user = U
|
||||
}};
|
||||
{continue, ServerOut, NewSASLState} ->
|
||||
|
Loading…
Reference in New Issue
Block a user