diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-06-05 01:54:06 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-06-05 01:54:06 +0100 |
| commit | 8b41860d443cb1c27accd9f3081a76cd0fd3f9cd (patch) | |
| tree | 949ef392212ec51c48b50c501b5de3a61b6da791 | |
| parent | 8b31cde5a9ac088d76e286a16a32d5bc97d8cffa (diff) | |
| parent | 57683f24cf25eb604c3a585c1fe46bd3065a31e7 (diff) | |
| download | prosody-8b41860d443cb1c27accd9f3081a76cd0fd3f9cd.tar.gz prosody-8b41860d443cb1c27accd9f3081a76cd0fd3f9cd.zip | |
Merge 0.8->trunk
| -rw-r--r-- | COPYING | 18 | ||||
| -rw-r--r-- | util/xmppstream.lua | 2 |
2 files changed, 10 insertions, 10 deletions
@@ -1,5 +1,5 @@ -Copyright (c) 2008-2009 Matthew Wild -Copyright (c) 2008-2009 Waqas Hussain +Copyright (c) 2008-2011 Matthew Wild +Copyright (c) 2008-2011 Waqas Hussain Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -11,10 +11,10 @@ furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/util/xmppstream.lua b/util/xmppstream.lua index 70420424..e5271b72 100644 --- a/util/xmppstream.lua +++ b/util/xmppstream.lua @@ -170,7 +170,7 @@ function new_sax_handlers(session, stream_callbacks) local function restricted_handler(parser) cb_error(session, "parse-error", "restricted-xml", "Restricted XML, see RFC 6120 section 11.1."); - if not parser:stop() then + if not parser.stop or not parser:stop() then error("Failed to abort parsing"); end end |