Software /
code /
prosody
Changeset
2926:fc96d439453b
Merge 0.7->trunk
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Mon, 22 Mar 2010 17:26:12 +0000 |
parents | 2921:f0ddfd7739ea (current diff) 2925:692b3c6c5bd2 (diff) |
children | 2938:07f3b14d38d1 |
files | plugins/muc/muc.lib.lua prosody util/xmppstream.lua |
diffstat | 98 files changed, 260 insertions(+), 240 deletions(-) [+] |
line wrap: on
line diff
--- a/core/componentmanager.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/core/componentmanager.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/core/configmanager.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/core/configmanager.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/core/eventmanager.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/core/eventmanager.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/core/hostmanager.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/core/hostmanager.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/core/loggingmanager.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/core/loggingmanager.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. @@ -35,7 +35,7 @@ -- The log config used if none specified in the config file local default_logging = { { to = "console" } }; local default_file_logging = { { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } }; -local default_timestamp = "%b %d %T"; +local default_timestamp = "%b %d %H:%M:%S"; -- The actual config loggingmanager is using local logging_config = config.get("*", "core", "log") or default_logging;
--- a/core/modulemanager.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/core/modulemanager.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/core/offlinemanager.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/core/offlinemanager.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/core/rostermanager.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/core/rostermanager.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/core/s2smanager.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/core/s2smanager.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/core/sessionmanager.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/core/sessionmanager.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/core/stanza_router.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/core/stanza_router.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/core/usermanager.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/core/usermanager.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/core/xmlhandlers.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/core/xmlhandlers.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/fallbacks/bit.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/fallbacks/bit.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/net/adns.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/net/adns.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/net/connlisteners.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/net/connlisteners.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/net/http.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/net/http.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/net/httpclient_listener.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/net/httpclient_listener.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/net/httpserver.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/net/httpserver.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/net/httpserver_listener.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/net/httpserver_listener.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/net/server.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/net/server.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,3 +1,10 @@ +-- Prosody IM +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain +-- +-- This project is MIT/X11 licensed. Please see the +-- COPYING file in the source package for more information. +-- local use_luaevent = require "core.configmanager".get("*", "core", "use_libevent");
--- a/net/server_select.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/net/server_select.lua Mon Mar 22 17:26:12 2010 +0000 @@ -2,7 +2,7 @@ -- server.lua by blastbeat of the luadch project -- Re-used here under the MIT/X Consortium License -- --- Modifications (C) 2008-2009 Matthew Wild, Waqas Hussain +-- Modifications (C) 2008-2010 Matthew Wild, Waqas Hussain -- -- // wrapping luadch stuff // --
--- a/net/xmppclient_listener.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/net/xmppclient_listener.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/net/xmppcomponent_listener.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/net/xmppcomponent_listener.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/net/xmppserver_listener.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/net/xmppserver_listener.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_announce.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_announce.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_bosh.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_bosh.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_component.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_component.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_console.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_console.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_dialback.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_dialback.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_disco.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_disco.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_groups.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_groups.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_httpserver.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_httpserver.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_iq.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_iq.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_lastactivity.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_lastactivity.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_legacyauth.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_legacyauth.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_message.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_message.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_pep.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_pep.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_ping.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_ping.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_posix.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_posix.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_presence.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_presence.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_privacy.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_privacy.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2009-2010 Matthew Wild +-- Copyright (C) 2009-2010 Waqas Hussain -- Copyright (C) 2009 Thilo Cestonaro -- -- This project is MIT/X11 licensed. Please see the
--- a/plugins/mod_private.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_private.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_register.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_register.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_roster.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_roster.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_saslauth.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_saslauth.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,7 +1,7 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain --- +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain +-- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. --
--- a/plugins/mod_time.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_time.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_tls.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_tls.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_uptime.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_uptime.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_vcard.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_vcard.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_version.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_version.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_watchregistrations.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_watchregistrations.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/mod_welcome.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/mod_welcome.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/muc/mod_muc.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/muc/mod_muc.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/plugins/muc/muc.lib.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/plugins/muc/muc.lib.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/prosody Mon Mar 22 16:55:10 2010 +0000 +++ b/prosody Mon Mar 22 17:26:12 2010 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/env lua -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/tests/test.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/tests/test.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/tests/test_core_configmanager.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/tests/test_core_configmanager.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/tests/test_core_modulemanager.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/tests/test_core_modulemanager.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/tests/test_core_s2smanager.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/tests/test_core_s2smanager.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/tests/test_core_stanza_router.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/tests/test_core_stanza_router.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/tests/test_sasl.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/tests/test_sasl.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/tests/test_util_jid.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/tests/test_util_jid.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/tests/test_util_multitable.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/tests/test_util_multitable.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/tests/test_util_stanza.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/tests/test_util_stanza.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/tests/util/logger.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/tests/util/logger.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/tools/ejabberd2prosody.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/tools/ejabberd2prosody.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/env lua -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/tools/ejabberdsql2prosody.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/tools/ejabberdsql2prosody.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/env lua -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/tools/erlparse.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/tools/erlparse.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util-src/encodings.c Mon Mar 22 16:55:10 2010 +0000 +++ b/util-src/encodings.c Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -/* Prosody IM v0.4 --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +/* Prosody IM +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util-src/hashes.c Mon Mar 22 16:55:10 2010 +0000 +++ b/util-src/hashes.c Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -/* Prosody IM v0.4 --- Copyright (C) 2008 Matthew Wild --- Copyright (C) 2008 Waqas Hussain +/* Prosody IM +-- Copyright (C) 2009-2010 Matthew Wild +-- Copyright (C) 2009-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util-src/pposix.c Mon Mar 22 16:55:10 2010 +0000 +++ b/util-src/pposix.c Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -/* Prosody IM v0.4 --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +/* Prosody IM +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- Copyright (C) 2009 Tobias Markmann -- -- This project is MIT/X11 licensed. Please see the
--- a/util-src/windows.c Mon Mar 22 16:55:10 2010 +0000 +++ b/util-src/windows.c Mon Mar 22 17:26:12 2010 +0000 @@ -1,45 +1,58 @@ - -#include <stdio.h> -#include <windows.h> -#include <windns.h> - -#include "lua.h" -#include "lauxlib.h" - -static int Lget_nameservers(lua_State *L) { - char stack_buffer[1024]; // stack allocated buffer - IP4_ARRAY* ips = (IP4_ARRAY*) stack_buffer; - DWORD len = sizeof(stack_buffer); - DNS_STATUS status; - - status = DnsQueryConfig(DnsConfigDnsServerList, FALSE, NULL, NULL, ips, &len); - if (status == 0) { - DWORD i; - lua_createtable(L, ips->AddrCount, 0); - for (i = 0; i < ips->AddrCount; i++) { - DWORD ip = ips->AddrArray[i]; - char ip_str[16] = ""; - sprintf_s(ip_str, sizeof(ip_str), "%d.%d.%d.%d", (ip >> 0) & 255, (ip >> 8) & 255, (ip >> 16) & 255, (ip >> 24) & 255); - lua_pushstring(L, ip_str); - lua_rawseti(L, -2, i+1); - } - return 1; - } else { - luaL_error(L, "DnsQueryConfig returned %d", status); - return 0; // unreachable, but prevents a compiler warning - } -} - -static const luaL_Reg Reg[] = -{ - { "get_nameservers", Lget_nameservers }, - { NULL, NULL } -}; - -LUALIB_API int luaopen_util_windows(lua_State *L) { - luaL_register(L, "windows", Reg); - lua_pushliteral(L, "version"); /** version */ - lua_pushliteral(L, "-3.14"); - lua_settable(L,-3); - return 1; -} +/* Prosody IM +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain +-- +-- This project is MIT/X11 licensed. Please see the +-- COPYING file in the source package for more information. +-- +*/ + +/* +* windows.c +* Windows support functions for Lua +*/ + +#include <stdio.h> +#include <windows.h> +#include <windns.h> + +#include "lua.h" +#include "lauxlib.h" + +static int Lget_nameservers(lua_State *L) { + char stack_buffer[1024]; // stack allocated buffer + IP4_ARRAY* ips = (IP4_ARRAY*) stack_buffer; + DWORD len = sizeof(stack_buffer); + DNS_STATUS status; + + status = DnsQueryConfig(DnsConfigDnsServerList, FALSE, NULL, NULL, ips, &len); + if (status == 0) { + DWORD i; + lua_createtable(L, ips->AddrCount, 0); + for (i = 0; i < ips->AddrCount; i++) { + DWORD ip = ips->AddrArray[i]; + char ip_str[16] = ""; + sprintf_s(ip_str, sizeof(ip_str), "%d.%d.%d.%d", (ip >> 0) & 255, (ip >> 8) & 255, (ip >> 16) & 255, (ip >> 24) & 255); + lua_pushstring(L, ip_str); + lua_rawseti(L, -2, i+1); + } + return 1; + } else { + luaL_error(L, "DnsQueryConfig returned %d", status); + return 0; // unreachable, but prevents a compiler warning + } +} + +static const luaL_Reg Reg[] = +{ + { "get_nameservers", Lget_nameservers }, + { NULL, NULL } +}; + +LUALIB_API int luaopen_util_windows(lua_State *L) { + luaL_register(L, "windows", Reg); + lua_pushliteral(L, "version"); /** version */ + lua_pushliteral(L, "-3.14"); + lua_settable(L,-3); + return 1; +}
--- a/util/array.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/array.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/broadcast.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/broadcast.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/dataforms.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/dataforms.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/datamanager.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/datamanager.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/datetime.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/datetime.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/dependencies.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/dependencies.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/events.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/events.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/helpers.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/helpers.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/hmac.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/hmac.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/import.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/import.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/iterators.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/iterators.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/jid.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/jid.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/logger.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/logger.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/multitable.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/multitable.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/pluginloader.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/pluginloader.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/prosodyctl.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/prosodyctl.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/sasl.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/sasl.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,5 +1,5 @@ -- sasl.lua v0.4 --- Copyright (C) 2008-2009 Tobias Markmann +-- Copyright (C) 2008-2010 Tobias Markmann -- -- All rights reserved. --
--- a/util/serialization.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/serialization.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/set.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/set.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/stanza.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/stanza.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/termcolours.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/termcolours.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/timer.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/timer.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/uuid.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/uuid.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/xmlrpc.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/xmlrpc.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.
--- a/util/xmppstream.lua Mon Mar 22 16:55:10 2010 +0000 +++ b/util/xmppstream.lua Mon Mar 22 17:26:12 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.