Mercurial > prosody-hg
comparison util/xmppstream.lua @ 6367:769a3577dd85
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 Aug 2014 09:23:24 +0100 |
| parents | c2d144d3f8dd ec446efc15e1 |
| children | 5de6b93d0190 |
comparison
equal
deleted
inserted
replaced
| 6355:c2d144d3f8dd | 6367:769a3577dd85 |
|---|---|
| 107 end | 107 end |
| 108 cb_streamopened(session, attr); | 108 cb_streamopened(session, attr); |
| 109 end | 109 end |
| 110 else | 110 else |
| 111 -- Garbage before stream? | 111 -- Garbage before stream? |
| 112 cb_error(session, "no-stream"); | 112 cb_error(session, "no-stream", tagname); |
| 113 end | 113 end |
| 114 return; | 114 return; |
| 115 end | 115 end |
| 116 if curr_ns == "jabber:client" and name ~= "iq" and name ~= "presence" and name ~= "message" then | 116 if curr_ns == "jabber:client" and name ~= "iq" and name ~= "presence" and name ~= "message" then |
| 117 cb_error(session, "invalid-top-level-element"); | 117 cb_error(session, "invalid-top-level-element"); |
