This is an automated email from the ASF dual-hosted git repository.
mhamann pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-openwhisk-apigateway.git
The following commit(s) were added to refs/heads/master by this push:
new 3616abf Decode empty JSON arrays correctly (#324)
3616abf is described below
commit 3616abfe8197e1d4335abe7f8a10915de0c3643a
Author: Alex Song <alexson...@gmail.com>
AuthorDate: Wed Oct 10 18:22:03 2018 -0400
Decode empty JSON arrays correctly (#324)
---
Dockerfile | 2 +-
scripts/lua/routing.lua | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 124e2e1..15e5cae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ RUN apk --update add \
&& rm -rf /var/cache/apk/*
# openresty build
-ENV OPENRESTY_VERSION=1.13.6.1 \
+ENV OPENRESTY_VERSION=1.13.6.2 \
PCRE_VERSION=8.37 \
TEST_NGINX_VERSION=0.24 \
OPM_VERSION=0.0.3 \
diff --git a/scripts/lua/routing.lua b/scripts/lua/routing.lua
index 445d08e..fd10026 100644
--- a/scripts/lua/routing.lua
+++ b/scripts/lua/routing.lua
@@ -19,6 +19,9 @@
-- Used to dynamically handle nginx routing based on an object containing
implementation details
local cjson = require "cjson"
+if (cjson.decode_array_with_array_mt ~= nil) then
+ cjson.decode_array_with_array_mt(true)
+end
local url = require "url"
local utils = require "lib/utils"
local request = require "lib/request"
