aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-10-26 18:55:06 -0400
committerMatthew Wild <mwild1@gmail.com>2011-10-26 18:55:06 -0400
commitcf1c72ddedf8eac847d444c14b935733c762e05d (patch)
treef3a943a7d491a6f38cd7e90c6879d225b77bb42e
parent83906b6a82534a51f75a6263d558c4675cd96de2 (diff)
downloadprosody-cf1c72ddedf8eac847d444c14b935733c762e05d.tar.gz
prosody-cf1c72ddedf8eac847d444c14b935733c762e05d.zip
util.json: Fix for single-line comments (thanks Norbert Kiesel)
-rw-r--r--util/json.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/json.lua b/util/json.lua
index cfa84a4b..5d0b0876 100644
--- a/util/json.lua
+++ b/util/json.lua
@@ -168,7 +168,7 @@ function json.decode(json)
skipwhitespace();
if ch == "/" and peek == "*" then
skipstarcomment();
- elseif ch == "/" and peek == "*" then
+ elseif ch == "/" and peek == "/" then
skiplinecomment();
else
return;