Merge branch 'master' of https://github.com/gglamenace/FrameworkBenchmarks into 690

openresty/nginx.conf

@@ -1,4 +1,4 @@
-#worker_processes  1;
+worker_processes  auto;
 pid        /tmp/nginx.pid;
 error_log stderr error;
 
@@ -10,7 +10,7 @@ http {
     resolver 127.0.0.1;
     access_log off;
     lua_package_path 'CWD/openresty/?.lua;;';
-    init_by_lua 'encode = require("cjson").encode mysql = require("resty.mysql")';
+    init_by_lua 'require "resty.core" encode = require("cjson").encode mysql = require("resty.mysql")';
     server {
         listen       8080;
         location /plaintext {