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

Conflicts:
	src/ejabberd_c2s.erl

diff --cc src/ejabberd_c2s.erl
index f3201ed0e2bb6ab2d5d799dfb98d13e2f35a7a16,f29559e67386a51d1567d27132f4b6284eed3ff9..5d0cc9c08825e571915b0f388de8f45af17b6a3d
--- 1/src/ejabberd_c2s.erl
--- 2/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]),