diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-10-26 18:55:06 -0400 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-10-26 18:55:06 -0400 |
| commit | 383eb2f3bf25a401ccc4266f9d74eb32aa6e13bb (patch) | |
| tree | f3a943a7d491a6f38cd7e90c6879d225b77bb42e /util/json.lua | |
| parent | 7eae765921d5d7149074efd8f30c8b06bc2c1a6e (diff) | |
| download | prosody-383eb2f3bf25a401ccc4266f9d74eb32aa6e13bb.tar.gz prosody-383eb2f3bf25a401ccc4266f9d74eb32aa6e13bb.zip | |
util.json: Fix for single-line comments (thanks Norbert Kiesel)
Diffstat (limited to 'util/json.lua')
| -rw-r--r-- | util/json.lua | 2 |
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; |