From 0dbfa202fe954725b3c30d35d97ebd6ddb4cdd2b Mon Sep 17 00:00:00 2001
From: chronolaw <chrono_cpp@me.com>
Date: Thu, 20 Apr 2023 08:44:42 +0800
Subject: [PATCH] test with 1.21.4.1

---
 .github/workflows/setup_env.sh          |  1 -
 .github/workflows/tests.yml             |  2 +-
 stream/config                           | 17 -----------------
 stream/src/ngx_stream_lua_kong_module.h |  2 +-
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/setup_env.sh b/.github/workflows/setup_env.sh
index adb59e56..427fdddf 100644
--- a/.github/workflows/setup_env.sh
+++ b/.github/workflows/setup_env.sh
@@ -28,7 +28,6 @@ kong-ngx-build \
     --luarocks $LUAROCKS \
     --openssl $OPENSSL \
     --debug \
-    --no-openresty-patches \
     -j $JOBS
 
 export PATH=$OPENSSL_INSTALL/bin:$OPENRESTY_INSTALL/nginx/sbin:$OPENRESTY_INSTALL/bin:$LUAROCKS_INSTALL/bin:$PATH
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0197fcc6..5d87b78b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,7 +17,7 @@ jobs:
         - openresty: "1.19.9.1"
           luarocks: "3.8.0"
           openssl: "1.1.1m"
-        - openresty: "1.21.4.2rc1"
+        - openresty: "1.21.4.1"
           luarocks: "3.9.1"
           openssl: "1.1.1q"
 
diff --git a/stream/config b/stream/config
index b1d745c7..08c4a810 100644
--- a/stream/config
+++ b/stream/config
@@ -1,20 +1,3 @@
-# search stream_lua's src path
-for inc in $CORE_INCS
-do
-  stream_lua_path=${inc%/api}
-
-  if [ "$inc" != "$stream_lua_path" ]; then
-
-    stream_lua_header="$stream_lua_path/ngx_stream_lua_common.h"
-
-    if [ -f "$stream_lua_header" ]; then
-      CORE_INCS="$CORE_INCS $stream_lua_path"
-      break
-    fi
-
-  fi
-done
-
 ngx_module_type=STREAM
 ngx_module_name=ngx_stream_lua_kong_module
 ngx_module_srcs="$ngx_addon_dir/src/ngx_stream_lua_kong_module.c"
diff --git a/stream/src/ngx_stream_lua_kong_module.h b/stream/src/ngx_stream_lua_kong_module.h
index 261b3f10..c1630222 100644
--- a/stream/src/ngx_stream_lua_kong_module.h
+++ b/stream/src/ngx_stream_lua_kong_module.h
@@ -5,7 +5,7 @@
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_stream.h>
-#include <ngx_stream_lua_request.h>
+#include <ngx_stream_lua_api.h>
 #include "../../src/ssl/ngx_lua_kong_ssl.h"
 
 typedef struct {