bugfix: prevented loading HTTP subsystem only modules in non-HTTP subsystem.

Also removed modules loaded repeatly both in global and in HTTP subsystem
from resty/core.lua.

Author: spacewander

lib/resty/core.lua

@@ -9,20 +9,18 @@ require "resty.core.time"
 
 
 if subsystem == 'http' then
-    require "resty.core.uri"
-    require "resty.core.hash"
     require "resty.core.base64"
-    require "resty.core.regex"
-    require "resty.core.exit"
-    require "resty.core.var"
     require "resty.core.ctx"
+    require "resty.core.exit"
+    require "resty.core.hash"
     require "resty.core.misc"
+    require "resty.core.ndk"
+    require "resty.core.phase"
     require "resty.core.request"
     require "resty.core.response"
-    require "resty.core.time"
+    require "resty.core.uri"
+    require "resty.core.var"
     require "resty.core.worker"
-    require "resty.core.phase"
-    require "resty.core.ndk"
 end
 
 

lib/resty/core/base64.lua

@@ -1,9 +1,11 @@
 -- Copyright (C) Yichun Zhang (agentzh)
 
 
-local ffi = require 'ffi'
 local base = require "resty.core.base"
+base.allows_subsystem('http')
+
 
+local ffi = require 'ffi'
 local ffi_string = ffi.string
 local C = ffi.C
 local ngx = ngx

lib/resty/core/ctx.lua

@@ -1,9 +1,12 @@
 -- Copyright (C) Yichun Zhang (agentzh)
 
 
+local base = require "resty.core.base"
+base.allows_subsystem('http')
+
+
 local ffi = require 'ffi'
 local debug = require 'debug'
-local base = require "resty.core.base"
 local misc = require "resty.core.misc"
 
 

lib/resty/core/exit.lua

@@ -1,12 +1,15 @@
 -- Copyright (C) Yichun Zhang (agentzh)
 
 
+local base = require "resty.core.base"
+base.allows_subsystem('http')
+
+
 local ffi = require 'ffi'
 local ffi_string = ffi.string
 local C = ffi.C
 local ngx = ngx
 local error = error
-local base = require "resty.core.base"
 local get_string_buf = base.get_string_buf
 local get_size_ptr = base.get_size_ptr
 local get_request = base.get_request

lib/resty/core/hash.lua

@@ -1,6 +1,10 @@
 -- Copyright (C) Yichun Zhang (agentzh)
 
 
+local base = require "resty.core.base"
+base.allows_subsystem('http')
+
+
 local ffi = require 'ffi'
 local ffi_string = ffi.string
 local ffi_new = ffi.new
@@ -9,7 +13,6 @@ local ngx = ngx
 local type = type
 local tostring = tostring
 local error = error
-local base = require "resty.core.base"
 
 
 ffi.cdef[[

lib/resty/core/misc.lua

@@ -2,9 +2,10 @@
 
 
 local base = require "resty.core.base"
-local ffi = require "ffi"
+base.allows_subsystem('http')
 
 
+local ffi = require "ffi"
 local FFI_NO_REQ_CTX = base.FFI_NO_REQ_CTX
 local FFI_BAD_CONTEXT = base.FFI_BAD_CONTEXT
 local new_tab = base.new_tab

lib/resty/core/phase.lua

@@ -1,6 +1,8 @@
-local ffi = require 'ffi'
 local base = require "resty.core.base"
+base.allows_subsystem('http')
+
 
+local ffi = require 'ffi'
 local C = ffi.C
 local FFI_ERROR = base.FFI_ERROR
 local get_request = base.get_request

lib/resty/core/request.lua

@@ -1,10 +1,11 @@
 -- Copyright (C) Yichun Zhang (agentzh)
 
 
-local ffi = require 'ffi'
 local base = require "resty.core.base"
+base.allows_subsystem('http')
 
 
+local ffi = require 'ffi'
 local FFI_BAD_CONTEXT = base.FFI_BAD_CONTEXT
 local FFI_DECLINED = base.FFI_DECLINED
 local FFI_OK = base.FFI_OK

lib/resty/core/response.lua

@@ -1,10 +1,11 @@
 -- Copyright (C) Yichun Zhang (agentzh)
 
 
-local ffi = require 'ffi'
 local base = require "resty.core.base"
+base.allows_subsystem('http')
 
 
+local ffi = require 'ffi'
 local C = ffi.C
 local ffi_cast = ffi.cast
 local ffi_str = ffi.string

lib/resty/core/uri.lua

@@ -1,13 +1,16 @@
 -- Copyright (C) Yichun Zhang (agentzh)
 
 
+local base = require "resty.core.base"
+base.allows_subsystem('http')
+
+
 local ffi = require 'ffi'
 local ffi_string = ffi.string
 local C = ffi.C
 local ngx = ngx
 local type = type
 local tostring = tostring
-local base = require "resty.core.base"
 local get_string_buf = base.get_string_buf
 
 

lib/resty/core/var.lua

@@ -1,9 +1,11 @@
 -- Copyright (C) Yichun Zhang (agentzh)
 
 
-local ffi = require 'ffi'
 local base = require "resty.core.base"
+base.allows_subsystem('http')
+
 
+local ffi = require 'ffi'
 local ffi_new = ffi.new
 local ffi_str = ffi.string
 local C = ffi.C

lib/resty/core/worker.lua

@@ -1,10 +1,11 @@
 -- Copyright (C) Yichun Zhang (agentzh)
 
 
-local ffi = require 'ffi'
 local base = require "resty.core.base"
+base.allows_subsystem('http')
 
 
+local ffi = require 'ffi'
 local C = ffi.C