# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1244130503 -18000
# Node ID 802630868d7029aea0444b76e2ab0345ec7f07bf
# Parent  37657578ea85d20a133f3d973a47ea09d564aa5b# Parent  954973fd293942824653b3d86e6a80e8def7a53b
Merge with trunk

diff -r 37657578ea85 -r 802630868d70 .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Thu Jun 04 20:48:23 2009 +0500
@@ -0,0 +1,22 @@
+syntax: glob
+.hgignore
+data
+local
+www_files
+html/*
+prosody.lua
+prosody.cfg.lua
+config.unix
+*.patch
+*.orig
+*.rej
+*.save
+*~
+*.report
+*.o
+*.so
+*.install
+*.pid
+*.log
+*.err
+*.debug
diff -r 37657578ea85 -r 802630868d70 Makefile
--- a/Makefile	Thu Jun 04 20:27:53 2009 +0500
+++ b/Makefile	Thu Jun 04 20:48:23 2009 +0500
@@ -16,11 +16,12 @@
 	$(MAKE) -C util-src install
 
 install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so
-	install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) $(DATA)
+	install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
+	install -m750 -d $(DATA)
 	install -d $(CONFIG)/certs
 	install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
-	install ./prosody.install $(BIN)/prosody
-	install ./prosodyctl.install $(BIN)/prosodyctl
+	install -m755 ./prosody.install $(BIN)/prosody
+	install -m755 ./prosodyctl.install $(BIN)/prosodyctl
 	install -m644 core/* $(SOURCE)/core
 	install -m644 net/* $(SOURCE)/net
 	install -m644 util/* $(SOURCE)/util
diff -r 37657578ea85 -r 802630868d70 net/server.lua
--- a/net/server.lua	Thu Jun 04 20:27:53 2009 +0500
+++ b/net/server.lua	Thu Jun 04 20:48:23 2009 +0500
@@ -653,13 +653,13 @@
         err = "luasec not found"
     end
     if err then
-        out_error( "server.lua: ", err )
+        out_error( "server.lua, port ", port, ": ", err )
         return nil, err
     end
     addr = addr or "*"
     local server, err = socket_bind( addr, port )
     if err then
-        out_error( "server.lua: ", err )
+        out_error( "server.lua, port ", port, ": ", err )
         return nil, err
     end
     local handler, err = wrapserver( listeners, server, addr, port, pattern, sslctx, maxconnections, startssl )    -- wrap new server socket
diff -r 37657578ea85 -r 802630868d70 prosody
--- a/prosody	Thu Jun 04 20:27:53 2009 +0500
+++ b/prosody	Thu Jun 04 20:48:23 2009 +0500
@@ -179,7 +179,9 @@
 				cl.start(listener, { 
 					ssl = conntype ~= "tcp" and global_ssl_ctx,
 					port = port,
-					interface = config.get("*", "core", option.."_interface"),
+					interface = config.get("*", "core", option.."_interface") 
+						or cl.get(listener).default_interface 
+						or config.get("*", "core", "interface"),
 					type = conntype
 				});
 			end