projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
a10b6e5
)
prosody: Fixed a possible nil concatenation.
author
Waqas Hussain
<waqas20@gmail.com>
Tue, 15 Dec 2009 19:11:54 +0000
(
00:11
+0500)
committer
Waqas Hussain
<waqas20@gmail.com>
Tue, 15 Dec 2009 19:11:54 +0000
(
00:11
+0500)
prosody
patch
|
blob
|
history
diff --git
a/prosody
b/prosody
index c3dd979a31654ae8578791e46946aa536d744f76..4900349ddf11a7b495b95dbc88ae145f9b036097 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-198,8
+198,8
@@
function init_global_state()
cl.start(listener, {
ssl = conntype ~= "tcp" and global_ssl_ctx,
port = port,
- interface =
config.get("*", "core", option.."_interface")
- or cl.get(listener).default_interface
+ interface =
(option and config.get("*", "core", option.."_interface"))
+ or cl.get(listener).default_interface
or config.get("*", "core", "interface"),
type = conntype
});