From 625cce713d1bdd58df6dbbad47f2193efa83c99e Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 5 Jun 2011 01:51:06 +0500 Subject: COPYING: Update copyright year; it's 2011 already. --- COPYING | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/COPYING b/COPYING index da29f8c8..b25ed4c9 100644 --- a/COPYING +++ b/COPYING @@ -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 -- cgit v1.2.3 From 90aba51b65afbbcbcd261b4b6bf0fe4f98b44df2 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 5 Jun 2011 01:52:48 +0500 Subject: COPYING: Reflow the all-caps text. It was wrapping really badly in the Windows installer. --- COPYING | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/COPYING b/COPYING index b25ed4c9..14850bfe 100644 --- a/COPYING +++ b/COPYING @@ -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. -- cgit v1.2.3 From 57683f24cf25eb604c3a585c1fe46bd3065a31e7 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 5 Jun 2011 01:57:43 +0500 Subject: util.xmppstream: Check to make sure parser.stop is present before calling it. --- util/xmppstream.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/xmppstream.lua b/util/xmppstream.lua index 69e7690d..ac4d77af 100644 --- a/util/xmppstream.lua +++ b/util/xmppstream.lua @@ -162,7 +162,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 -- cgit v1.2.3