]> granicus.if.org Git - ejabberd/commitdiff
projects / ejabberd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5fc16bc)
Fix remote-stream-error stanzas
authorBadlop <badlop@process-one.net>
Tue, 16 Jun 2009 17:47:41 +0000 (17:47 +0000)
committerBadlop <badlop@process-one.net>
Tue, 16 Jun 2009 17:47:41 +0000 (17:47 +0000)
SVN Revision: 2248

src/web/ejabberd_http_bind.erl patch | blob | history

diff --git a/src/web/ejabberd_http_bind.erl b/src/web/ejabberd_http_bind.erl
index 59e58ecaa2301c5dcad748fa3db1b44c1fbc0fa5..cdb8ecac978c3273a0534463b1b49b46c6ff00c2 100644 (file)
--- a/src/web/ejabberd_http_bind.erl
+++ b/src/web/ejabberd_http_bind.erl
@@ -4,7 +4,7 @@
 %%% Purpose : Implements XMPP over BOSH (XEP-0205) (formerly known as 
 %%%           HTTP Binding)
 %%% Created : 21 Sep 2005 by Stefan Strigler <steve@zeank.in-berlin.de>
-%%% Id      : $Id: ejabberd_http_bind.erl 885 2009-02-14 09:01:54Z badlop $
+%%% Id      : $Id: ejabberd_http_bind.erl 917 2009-03-13 16:27:30Z badlop $
 %%%----------------------------------------------------------------------
 
 -module(ejabberd_http_bind).
@@ -976,8 +976,8 @@ send_outpacket(#http_bind{pid = FsmRef}, OutPacket) ->
                                        case xml:get_subtag(El, "stream:error") of
                                            false ->
                                                null;
-                                           {xmlelement, _, _, Cond} ->
-                                               Cond
+                                           {xmlelement, _, _, _Cond} = StreamErrorTag ->
+                                               [StreamErrorTag]
                                        end;
                                     {error, _E} ->
                                         null
@@ -994,7 +994,8 @@ send_outpacket(#http_bind{pid = FsmRef}, OutPacket) ->
                                     {200, ?HEADER,
                                      "<body type='terminate' "
                                      "condition='remote-stream-error' "
-                                     "xmlns='"++?NS_HTTP_BIND++"'>" ++
+                                     "xmlns='"++?NS_HTTP_BIND++"' " ++
+                                     "xmlns:stream='"++?NS_STREAM++"'>" ++
                                      elements_to_string(StreamErrCond) ++
                                      "</body>"}
                             end;
Unnamed repository; edit this file 'description' to name the repository.