apache · tokers · May 11, 2021 · Apr 29, 2021 · Apr 29, 2021 · Apr 30, 2021
diff --git a/html/50x.html → apisix/cli/html_page.lua b/html/50x.html → apisix/cli/html_page.lua
@@ -1,3 +1,21 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements.  See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+return [=[
 <!--
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,7 +39,7 @@
 <head>
 <meta content="text/html;charset=utf-8" http-equiv="Content-Type">
 <meta content="utf-8" http-equiv="encoding">
-<title>Error</title>
+<title>500 Internal Server Error</title>
 <style>
     body {
         width: 35em;
@@ -36,3 +54,4 @@ <h1>An error occurred.</h1>
 <p><em>Faithfully yours, <a href="https://apisix.apache.org/">APISIX</a>.</em></p>
 </body>
 </html>
+]=]
diff --git a/apisix/cli/ngx_tpl.lua b/apisix/cli/ngx_tpl.lua
@@ -220,7 +220,7 @@ http {
     charset utf-8;
 
     # error_page
-    error_page 500 502 503 504 @50x.html;
+    error_page 500 @50x.html;
 
     {% if real_ip_header then %}
     real_ip_header {* real_ip_header *};

diff --git a/apisix/cli/ops.lua b/apisix/cli/ops.lua
@@ -19,6 +19,7 @@ local etcd = require("apisix.cli.etcd")
 local util = require("apisix.cli.util")
 local file = require("apisix.cli.file")
 local ngx_tpl = require("apisix.cli.ngx_tpl")
+local html_page = require("apisix.cli.html_page")
 local profile = require("apisix.core.profile")
 local template = require("resty.template")
 local argparse = require("argparse")
@@ -586,6 +587,11 @@ Please modify "admin_key" in conf/config.yaml .
     if not ok then
         util.die("failed to update nginx.conf: ", err, "\n")
     end
+
+    local ok, err = util.write_file(env.apisix_home .. "/html/50x.html", html_page)
+    if not ok then
+        util.die("failed to write 50x.html: ", err, "\n")
+    end
 end
 
 
@@ -605,6 +611,9 @@ local function start(env, ...)
     local cmd_logs = "mkdir -p " .. env.apisix_home .. "/logs"
     util.execute_cmd(cmd_logs)
 
+    local cmd_html = "mkdir -p " .. env.apisix_home .. "/html"
 conf/nginx.conf 
 conf/nginx.conf 
+    util.execute_cmd(cmd_html)
+
     -- check running
     local pid_path = env.apisix_home .. "/logs/nginx.pid"
     local pid = util.read_file(pid_path)

diff --git a/apisix/init.lua b/apisix/init.lua
@@ -533,7 +533,7 @@ end
 
 
 function _M.http_header_filter_phase()
-    if not ngx.ctx then
+    if not ngx.ctx or not ngx.ctx.api_ctx then
         ngx.ctx = ctxdump.apply_ngx_ctx(ngx_var.ctx_ref)
     end
 

diff --git a/t/APISIX.pm b/t/APISIX.pm
@@ -89,7 +89,6 @@ my $ssl_ecc_crt = read_file("t/certs/apisix_ecc.crt");
 my $ssl_ecc_key = read_file("t/certs/apisix_ecc.key");
 my $test2_crt = read_file("t/certs/test2.crt");
 my $test2_key = read_file("t/certs/test2.key");
-my $test_50x_html = read_file("html/50x.html");
 $user_yaml_config = <<_EOC_;
 apisix:
   node_listen: 1984
@@ -375,7 +374,7 @@ _EOC_
     lua_socket_log_errors off;
     client_body_buffer_size 8k;
 
-    error_page 500 502 503 504 \@50x.html;
+    error_page 500 \@50x.html;
 
     upstream apisix_backend {
         server 0.0.0.1;
@@ -650,8 +649,6 @@ $ssl_ecc_key
 $test2_crt
 >>> ../conf/cert/test2.key
 $test2_key
->>> 50x.html
-$test_50x_html
 $user_apisix_yaml
 _EOC_
 

diff --git a/t/error_page/error_page.t b/t/error_page/error_page.t
@@ -80,8 +80,8 @@ GET /hello
 --- more_headers
 X-Test-Status: 502
 --- error_code: 502
---- response_body_like
-.*apisix.apache.org.*
+--- response_body eval
+qr/502 Bad Gateway/
 
 
 
@@ -91,8 +91,8 @@ GET /hello
 --- more_headers
 X-Test-Status: 503
 --- error_code: 503
---- response_body_like
-.*apisix.apache.org.*
+--- response_body eval
+qr/503 Service Unavailable/
 
 
 
@@ -102,8 +102,8 @@ GET /hello
 --- more_headers
 X-Test-Status: 504
 --- error_code: 504
---- response_body_like
-.*apisix.apache.org.*
+--- response_body eval
+qr/504 Gateway Time-out/
 
 
 

diff --git a/t/node/not-exist-upstream.t b/t/node/not-exist-upstream.t
@@ -78,8 +78,8 @@ GET /not_found
 --- request
 GET /hello
 --- error_code_like: ^(?:50\d)$
---- response_body_like
-.*apisix.apache.org.*
+--- response_body eval
+qr/502 Bad Gateway|500 Internal Server Error/
 --- grep_error_log eval
 qr/\[error\].*/
 --- grep_error_log_out eval

diff --git a/t/node/timeout-upstream.t b/t/node/timeout-upstream.t
@@ -69,8 +69,8 @@ passed
 --- request
 GET /sleep1
 --- error_code: 504
---- response_body_like
-.*apisix.apache.org.*
+--- response_body eval
+qr/504 Gateway Time-out/
 
 --- error_log
 timed out) while reading response header from upstream
diff --git a/t/node/upstream-status-5xx.t b/t/node/upstream-status-5xx.t
@@ -116,8 +116,8 @@ passed
 --- request
 GET /sleep1
 --- error_code: 504
---- response_body_like
-.*apisix.apache.org.*
+--- response_body eval
+qr/504 Gateway Time-out/
 --- error_log
 X-APISIX-Upstream-Status: 504
 
@@ -161,8 +161,8 @@ passed
 --- request
 GET /hello
 --- error_code: 502
---- response_body_like
-.*apisix.apache.org.*
+--- response_body eval
+qr/502 Bad Gateway/
 --- error_log
 X-APISIX-Upstream-Status: 502
 

diff --git a/t/plugin/grpc-transcode.t b/t/plugin/grpc-transcode.t
@@ -304,8 +304,8 @@ passed
 === TEST 10: hit route (Connection refused)
 --- request
 GET /grpctest
---- response_body_like
-.*apisix.apache.org.*
+--- response_body eval
+qr/502 Bad Gateway/
 --- error_log
 Connection refused) while connecting to upstream
 --- error_code: 502