Bug in get_conn_type since SVN r1194 crashes http-bind and http-poll (thanks to Brian Cully) (EJAB-526)
SVN Revision: 1197
This commit is contained in:
parent
c72082d798
commit
327b4406db
|
@ -1,3 +1,8 @@
|
|||
2008-02-18 Christophe Romain <christophe.romain@process-one.net>
|
||||
|
||||
* src/ejabberd_c2s.erl: Bug in get_conn_type since SVN r1194 crashes
|
||||
http-bind and http-poll (thanks to Brian Cully) (EJAB-526)
|
||||
|
||||
2008-02-16 Badlop <badlop@process-one.net>
|
||||
|
||||
* src/mod_muc/mod_muc_room.erl: Merge SVN r1164, and fix the merge
|
||||
|
|
|
@ -1374,15 +1374,13 @@ get_auth_tags([], U, P, D, R) ->
|
|||
{U, P, D, R}.
|
||||
|
||||
get_conn_type(StateData) ->
|
||||
case StateData#state.sockmod of
|
||||
case (StateData#state.sockmod):get_sockmod(StateData#state.socket) of
|
||||
gen_tcp -> c2s;
|
||||
tls -> c2s_tls;
|
||||
ejabberd_zlib -> c2s_compressed;
|
||||
ejabberd_http_poll -> http_poll;
|
||||
ejabberd_http_bind -> http_bind;
|
||||
_ ->
|
||||
case (StateData#state.sockmod):get_sockmod(StateData#state.socket) of
|
||||
ejabberd_zlib -> c2s_compressed;
|
||||
tls -> c2s_tls;
|
||||
gen_tcp -> c2s
|
||||
end
|
||||
_ -> unknown
|
||||
end.
|
||||
|
||||
process_presence_probe(From, To, StateData) ->
|
||||
|
|
Loading…
Reference in New Issue