Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-14 22:00:16 +02:00
Code Releases Activity

Partially revert "Fix more HTTP-Bind", add proper fix: c2s works again, BOSH not yet

Browse Source
This commit is contained in:
Badlop 2010-05-10 13:56:58 +02:00
parent 3f6579ffbc
commit 110819525f
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ejabberd_c2s.erl
View File

@ -265,8 +265,8 @@ wait_for_stream({xmlstreamstart, #xmlel{ns = NS} = Opening}, StateData) ->
end, end,
Header = exmpp_stream:opening_reply(Opening, Header = exmpp_stream:opening_reply(Opening,
StateData#state.streamid, DefaultLang), StateData#state.streamid, DefaultLang),
case exmpp_xml:get_attribute_as_binary(Opening, 'xmlns:stream', undefined_stream_namespace) of case NS of
?NS_XMPP_b -> ?NS_XMPP ->
ServerB = exmpp_stringprep:nameprep( ServerB = exmpp_stringprep:nameprep(
exmpp_stream:get_receiving_entity(Opening)), exmpp_stream:get_receiving_entity(Opening)),
Server = binary_to_list(ServerB), Server = binary_to_list(ServerB),

16
src/web/ejabberd_http_bind.erl
View File

@ -684,17 +684,21 @@ process_http_put(#http_put{rid = Rid, attrs = Attrs, payload = Payload,
C2SPid -> C2SPid ->
case StreamTo of case StreamTo of
{To, ""} -> {To, ""} ->
StreamAttrs = [#xmlattr{name = 'to', value = list_to_binary(To)}, DecNs = [{?NS_XMPP, "stream"},
#xmlattr{name = 'xmlns:stream', value = ?NS_XMPP_b}], {?NS_JABBER_CLIENT, none}],
StreamEl = #xmlel{name = 'stream:stream', ns = ?NS_JABBER_CLIENT_b, attrs = StreamAttrs}, StreamAttrs = [#xmlattr{name = 'to', value = list_to_binary(To)}],
StreamEl = #xmlel{name = stream, ns = ?NS_XMPP, declared_ns = DecNs,
attrs = StreamAttrs},
gen_fsm:send_event( gen_fsm:send_event(
C2SPid, C2SPid,
{xmlstreamstart, StreamEl}); {xmlstreamstart, StreamEl});
{To, Version} -> {To, Version} ->
DecNs = [{?NS_XMPP, "stream"},
{?NS_JABBER_CLIENT, none}],
StreamAttrs = [#xmlattr{name = 'to', value = list_to_binary(To)}, StreamAttrs = [#xmlattr{name = 'to', value = list_to_binary(To)},
#xmlattr{name = 'version', value = list_to_binary(Version)}, #xmlattr{name = 'version', value = list_to_binary(Version)}],
#xmlattr{name = 'xmlns:stream', value = ?NS_XMPP_b}], StreamEl = #xmlel{name = stream, ns = ?NS_XMPP, declared_ns = DecNs,
StreamEl = #xmlel{name = 'stream:stream', ns = ?NS_JABBER_CLIENT_b, attrs = StreamAttrs}, attrs = StreamAttrs},
gen_fsm:send_event( gen_fsm:send_event(
C2SPid, C2SPid,
{xmlstreamstart, StreamEl}); {xmlstreamstart, StreamEl});