bugfix: ensured resty.core can be loaded in binaries without PCRE support.

Author: thibaultcha

lib/resty/core/regex.lua

@@ -35,11 +35,35 @@ local ngx_log = ngx.log
 local ngx_NOTICE = ngx.NOTICE
 
 
+local _M = {
+    version = base.version
+}
+
+
 if not ngx.re then
     ngx.re = {}
 end
 
 
+ffi.cdef[[
+    const char *pcre_version(void);
+]]
+
+
+local pcre_ver
+
+if not pcall(function() pcre_ver = ffi_string(C.pcre_version()) end) then
+    setmetatable(ngx.re, {
+        __index = function(_, key)
+            error("no support for 'ngx.re." .. key .. "': OpenResty was " ..
+                  "compiled without PCRE support", 2)
+        end
+    })
+
+    return _M
+end
+
+
 local MAX_ERR_MSG_LEN = 128
 
 
@@ -95,12 +119,6 @@ local ngx_lua_ffi_script_eval_data
 local no_jit_in_init
 
 if jit.os == "OSX" then
-    ffi.cdef[[
-        const char *pcre_version(void);
-    ]]
-
-    local pcre_ver = ffi_string(C.pcre_version())
-
     local maj, min = string.match(pcre_ver, "^(%d+)%.(%d+)")
     if maj and min then
         local pcre_ver_num = tonumber(maj .. min)
@@ -278,11 +296,6 @@ local c_str_type = ffi.typeof("const char *")
 
 local cached_re_opts = new_tab(0, 4)
 
-local _M = {
-    version = base.version
-}
-
-
 local buf_grow_ratio = 2
 
 

lib/resty/core/request.lua

@@ -16,7 +16,7 @@ local ffi_str = ffi.string
 local get_string_buf = base.get_string_buf
 local get_size_ptr = base.get_size_ptr
 local setmetatable = setmetatable
-local gsub = ngx.re.gsub
+local re = ngx.re
 local lower = string.lower
 local rawget = rawget
 local ngx = ngx
@@ -68,7 +68,7 @@ local truncated = ffi.new("int[1]")
 
 local req_headers_mt = {
     __index = function (tb, key)
-        return rawget(tb, (gsub(lower(key), '_', '-', "jo")))
+        return rawget(tb, (re.gsub(lower(key), '_', '-', "jo")))
     end
 }