diff options
| author | Badlop <badlop@process-one.net> | 2011-09-16 01:14:29 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2011-09-16 01:17:26 +0200 |
| commit | 8b45ee520889e52ef656655e09c1704a236eabb2 (patch) | |
| tree | fdc36b318efa571b52f8173c366a92934633305c /src | |
| parent | Update http_bind module to latest XEP-0124 and XEP-0206 (diff) | |
Use NS_XBOSH instead of NS_BOSH (thanks to Janusz Dziemidowicz)
There are two, exactly the same defines for urn:xmpp:xbosh
namespace: NS_BOSH and NS_XBOSH. Both are used in http_bind
module. Stick with NS_XBOSH everywhere.
Diffstat (limited to 'src')
| -rw-r--r-- | src/web/ejabberd_http_bind.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/web/ejabberd_http_bind.erl b/src/web/ejabberd_http_bind.erl index 7f27f1ad7..12d1c2b61 100644 --- a/src/web/ejabberd_http_bind.erl +++ b/src/web/ejabberd_http_bind.erl @@ -232,7 +232,7 @@ process_request(Data, IP) -> %% Existing session {ok, {Sid, Rid, Attrs, Payload1}} -> StreamStart = - case exmpp_xml:get_attribute_from_list_as_list(Attrs, ?NS_BOSH, <<"restart">>, "") of + case exmpp_xml:get_attribute_from_list_as_list(Attrs, ?NS_XBOSH, <<"restart">>, "") of "true" -> true; _ -> @@ -303,7 +303,7 @@ handle_session_start(Pid, XmppDomain, Sid, Rid, Attrs, {'EXIT', _} -> 0.0; V -> V end, - XmppVersion = exmpp_xml:get_attribute_from_list_as_list(Attrs, ?NS_BOSH, <<"version">>, ""), + XmppVersion = exmpp_xml:get_attribute_from_list_as_list(Attrs, ?NS_XBOSH, <<"version">>, ""), ?DEBUG("Create session: ~p", [Sid]), mnesia:async_dirty( fun() -> @@ -1049,8 +1049,8 @@ prepare_outpacket_response(#http_bind{id=Sid, wait=Wait, BOSH_attribs = [#xmlattr{name = <<"authid">>, value = list_to_binary(AuthID)}, #xmlattr{name = <<"xmlns:stream">>, value = ?NS_XMPP_b}] ++ - [#xmlattr{name = <<"version">>, ns = ?NS_BOSH_s, value = list_to_binary(Version)}, - #xmlattr{name = <<"restartlogic">>, ns = ?NS_BOSH_s, value = <<"true">>}], + [#xmlattr{name = <<"version">>, ns = ?NS_XBOSH_s, value = list_to_binary(Version)}, + #xmlattr{name = <<"restartlogic">>, ns = ?NS_XBOSH_s, value = <<"true">>}], MaxInactivity = get_max_inactivity(To, ?MAX_INACTIVITY), MaxPause = get_max_pause(To), {200, ?HEADER, |