You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/10/10 22:22:05 UTC

[GitHub] mhamann closed pull request #324: Decode empty JSON arrays correctly

mhamann closed pull request #324: Decode empty JSON arrays correctly
URL: https://github.com/apache/incubator-openwhisk-apigateway/pull/324
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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"


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services