You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by me...@apache.org on 2020/08/04 16:20:15 UTC

[apisix] branch master updated: revert: enable proxy-cache and proxy-mirror plugins by default. (#1992)

This is an automated email from the ASF dual-hosted git repository.

membphis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new 77dfeca  revert: enable proxy-cache and proxy-mirror plugins by default. (#1992)
77dfeca is described below

commit 77dfecaab6d93cf9bfea03630d73e5bd57b08ebc
Author: dabue <53...@users.noreply.github.com>
AuthorDate: Wed Aug 5 00:20:04 2020 +0800

    revert: enable proxy-cache and proxy-mirror plugins by default. (#1992)
    
    fixed #1987
---
 conf/config.yaml     | 4 ++--
 t/APISIX.pm          | 2 --
 t/debug/debug-mode.t | 3 ---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/conf/config.yaml b/conf/config.yaml
index 869c26a..f8673ad 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -175,8 +175,8 @@ plugins:                          # plugin list
   - authz-keycloak
   - uri-blocker
   - request-validation
-  # - proxy-cache
-  # - proxy-mirror
+  - proxy-cache
+  - proxy-mirror
 
 stream_plugins:
   - mqtt-proxy
diff --git a/t/APISIX.pm b/t/APISIX.pm
index 5c78b37..d0e7e3b 100644
--- a/t/APISIX.pm
+++ b/t/APISIX.pm
@@ -77,8 +77,6 @@ my $test2_key = read_file("conf/cert/test2.key");
 $yaml_config =~ s/node_listen: 9080/node_listen: 1984/;
 $yaml_config =~ s/  # stream_proxy:/  stream_proxy:\n    tcp:\n      - 9100/;
 $yaml_config =~ s/admin_key:/disable_admin_key:/;
-$yaml_config =~ s/  # - proxy-cache/  - proxy-cache/;
-$yaml_config =~ s/  # - proxy-mirror/  - proxy-mirror/;
 
 my $etcd_enable_auth = $ENV{"ETCD_ENABLE_AUTH"} || "false";
 
diff --git a/t/debug/debug-mode.t b/t/debug/debug-mode.t
index 858c063..0b81bad 100644
--- a/t/debug/debug-mode.t
+++ b/t/debug/debug-mode.t
@@ -32,9 +32,6 @@ sub read_file($) {
 our $yaml_config = read_file("conf/config.yaml");
 $yaml_config =~ s/node_listen: 9080/node_listen: 1984/;
 $yaml_config =~ s/enable_debug: false/enable_debug: true/;
-$yaml_config =~ s/  # - proxy-cache/  - proxy-cache/;
-$yaml_config =~ s/  # - proxy-mirror/  - proxy-mirror/;
-
 
 run_tests;