small refactor

- skip_https_connect as request attribute
- http_proxy not used attribute http_backend removed

gateway/src/apicast/http_proxy.lua

@@ -26,7 +26,6 @@ local DEFAULT_CHUNKSIZE = 32 * 1024
 
 function _M.reset()
     _M.resolver = resty_resolver
-    _M.http_backend = require('resty.http_ng.backend.resty')
     _M.dns_resolution = 'apicast' -- can be set to 'proxy' to let proxy do the name resolution
 
     return _M
@@ -157,10 +156,11 @@ local function forward_https_request(proxy_uri, uri, proxy_opts)
         body = body,
         proxy_uri = proxy_uri,
         proxy_auth = opts.proxy_auth,
-        upstream_connection_opts = opts.upstream_connection_opts
+        upstream_connection_opts = opts.upstream_connection_opts,
+        skip_https_connect = opts.skip_https_connect
     }
 
-    local httpc, err = http_proxy.new(request, opts.skip_https_connect)
+    local httpc, err = http_proxy.new(request)
 
     if not httpc then
         ngx.log(ngx.ERR, 'could not connect to proxy: ',  proxy_uri, ' err: ', err)

gateway/src/resty/http/proxy.lua

@@ -76,11 +76,12 @@ local function _connect_proxy_https(httpc, request, host, port)
     return httpc
 end
 
-local function connect_proxy(httpc, request, skip_https_connect)
+local function connect_proxy(httpc, request)
     -- target server requires hostname not IP and DNS resolution is left to the proxy itself as specified in the RFC #7231
     -- https://httpwg.org/specs/rfc7231.html#CONNECT
     local uri = request.uri
     local proxy_uri = request.proxy
+    local skip_https_connect = request.skip_https_connect
 
     if proxy_uri.scheme ~= 'http' then
         return nil, 'proxy connection supports only http'
@@ -109,7 +110,6 @@ local function connect_proxy(httpc, request, skip_https_connect)
         return _connect_tls_direct(httpc, request, uri.host, uri.port)
     elseif uri.scheme == 'https' then
         return _connect_proxy_https(httpc, request, uri.host, uri.port)
-
     else
         return nil, 'invalid scheme'
     end
@@ -130,7 +130,7 @@ local function find_proxy_url(request)
     return request.proxy_uri or _M.find(uri)
 end
 
-local function connect(request, skip_https_connect)
+local function connect(request)
     request = request or { }
     local opts = { timeouts = request.upstream_connection_opts }
     local httpc = http.new(opts)
@@ -140,7 +140,7 @@ local function connect(request, skip_https_connect)
     request.proxy = proxy_uri
 
     if proxy_uri then
-        return connect_proxy(httpc, request, skip_https_connect)
+        return connect_proxy(httpc, request)
     else
         return connect_direct(httpc, request)
     end