aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2009-06-16 17:47:41 +0000
committerBadlop <badlop@process-one.net>2009-06-16 17:47:41 +0000
commit67570668b6d921cd112307600e98a556535c6a99 (patch)
tree7fdf46282e64525aa33b70807c7381fb255d5541
parentNew option max_inactivity to configure maximum inactivity period (EJAB-512) (diff)
Fix remote-stream-error stanzas
SVN Revision: 2248
-rw-r--r--src/web/ejabberd_http_bind.erl9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/web/ejabberd_http_bind.erl b/src/web/ejabberd_http_bind.erl
index 59e58ecaa..cdb8ecac9 100644
--- 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;