diff options
Diffstat (limited to 'src/ejabberd_c2s.erl')
| -rw-r--r-- | src/ejabberd_c2s.erl | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 996a3c81d..43bce7d0d 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -1170,8 +1170,7 @@ session_established({xmlstreamerror, _}, StateData) -> {stop, normal, StateData}; session_established(closed, StateData) when StateData#state.mgmt_timeout > 0, - StateData#state.mgmt_state == active orelse - StateData#state.mgmt_state == pending -> + StateData#state.mgmt_state == active -> log_pending_state(StateData), fsm_next_state(wait_for_resume, StateData#state{mgmt_state = pending}); session_established(closed, StateData) -> @@ -1376,7 +1375,6 @@ handle_info({route, _From, _To, {broadcast, Data}}, fsm_next_state(StateName, StateData); NewPL -> PrivPushIQ = #iq{type = set, - xmlns = ?NS_PRIVACY, id = <<"push", (randoms:get_string())/binary>>, sub_el = @@ -2544,8 +2542,7 @@ route_blocking(What, StateData) -> #xmlel{name = <<"unblock">>, attrs = [{<<"xmlns">>, ?NS_BLOCKING}], children = []} end, - PrivPushIQ = #iq{type = set, xmlns = ?NS_BLOCKING, - id = <<"push">>, sub_el = [SubEl]}, + PrivPushIQ = #iq{type = set, id = <<"push">>, sub_el = [SubEl]}, PrivPushEl = jlib:replace_from_to(jlib:jid_remove_resource(StateData#state.jid), StateData#state.jid, jlib:iq_to_xml(PrivPushIQ)), |