From: Badlop <badlop@process-one.net>
Date: Wed, 21 May 2014 16:45:28 +0000 (+0200)
Subject: Merge branch 'check-packet-type' of git://github.com/weiss/ejabberd into weiss-check... 
X-Git-Tag: 14.07~109^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=735bd956591ad437bc49d01468753616ddf9c56c;p=ejabberd

Merge branch 'check-packet-type' of git://github.com/weiss/ejabberd into weiss-check-packet-type

Conflicts:
	src/ejabberd_c2s.erl
---

735bd956591ad437bc49d01468753616ddf9c56c
diff --cc src/ejabberd_c2s.erl
index f3201ed0e,f29559e67..5d0cc9c08
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@@ -1647,7 -1657,7 +1641,7 @@@ handle_info({route, From, To
  	       jlib:replace_from_to_attrs(jlib:jid_to_string(From),
  					  jlib:jid_to_string(To), NewAttrs),
  	    FixedPacket = #xmlel{name = Name, attrs = Attrs2, children = Els},
- 	    SentStateData = send_stanza(NewState, FixedPacket),
 -	    SentStateData = send_packet(StateData, FixedPacket),
++	    SentStateData = send_packet(NewState, FixedPacket),
  	    ejabberd_hooks:run(user_receive_packet,
  			       SentStateData#state.server,
  			       [SentStateData#state.jid, From, To, FixedPacket]),