diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2008-02-18 09:55:06 +0000 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2008-02-18 09:55:06 +0000 |
| commit | 327b4406db8c8bc4f680aebd1793d96d1578c9ac (patch) | |
| tree | fab51a94b838ecb040cff64be241f3d21c66cd50 /src | |
| parent | * src/mod_muc/mod_muc_room.erl: Merge SVN r1164, and fix the merge (diff) | |
Bug in get_conn_type since SVN r1194 crashes http-bind and http-poll (thanks to Brian Cully) (EJAB-526)
SVN Revision: 1197
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_c2s.erl | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index ab8b23f0e..7239829e5 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -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) -> |