aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-22 17:26:12 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-22 17:26:12 +0000
commite9210ce2e777ed966cc4e80df96582e84d0d2ae8 (patch)
tree9a36c6329eb70d4e655dc88742cea8419f06f9c3 /net
parent2c597f0fa443131956fd7e9d3ad86774f1dd7c7b (diff)
parent46c0b8c7f9adeeef3e0a22204879d82230ce3d5b (diff)
downloadprosody-e9210ce2e777ed966cc4e80df96582e84d0d2ae8.tar.gz
prosody-e9210ce2e777ed966cc4e80df96582e84d0d2ae8.zip
Merge 0.7->trunk
Diffstat (limited to 'net')
-rw-r--r--net/adns.lua4
-rw-r--r--net/connlisteners.lua4
-rw-r--r--net/http.lua4
-rw-r--r--net/httpclient_listener.lua4
-rw-r--r--net/httpserver.lua4
-rw-r--r--net/httpserver_listener.lua4
-rw-r--r--net/server.lua7
-rw-r--r--net/server_select.lua2
-rw-r--r--net/xmppclient_listener.lua4
-rw-r--r--net/xmppcomponent_listener.lua4
-rw-r--r--net/xmppserver_listener.lua4
11 files changed, 26 insertions, 19 deletions
diff --git a/net/adns.lua b/net/adns.lua
index 0121881a..88d4b4b3 100644
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -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.
diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index ee54f049..93dce8b3 100644
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -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.
diff --git a/net/http.lua b/net/http.lua
index cd969209..0634d773 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -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.
diff --git a/net/httpclient_listener.lua b/net/httpclient_listener.lua
index 5bed461d..dfa25062 100644
--- a/net/httpclient_listener.lua
+++ b/net/httpclient_listener.lua
@@ -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.
diff --git a/net/httpserver.lua b/net/httpserver.lua
index 79705e6f..59ddbb12 100644
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -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.
diff --git a/net/httpserver_listener.lua b/net/httpserver_listener.lua
index 6933b4fe..84016033 100644
--- a/net/httpserver_listener.lua
+++ b/net/httpserver_listener.lua
@@ -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.
diff --git a/net/server.lua b/net/server.lua
index 971e1766..e0d4b85a 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -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");
diff --git a/net/server_select.lua b/net/server_select.lua
index 49cbe25d..0aad924d 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -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 // --
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index 0d0e92ce..94daa2b2 100644
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -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.
diff --git a/net/xmppcomponent_listener.lua b/net/xmppcomponent_listener.lua
index 568d947c..b87f7c96 100644
--- a/net/xmppcomponent_listener.lua
+++ b/net/xmppcomponent_listener.lua
@@ -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.
diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index 8a3886ad..d63f5c23 100644
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -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.