diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c | 4 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-ngx_http_subs_filter_module.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c b/www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c index fd5228fb6556..e06d1b4cdfd4 100644 --- a/www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c +++ b/www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c @@ -7,10 +7,10 @@ -#if defined nginx_version && (nginx_version > 1001011) +#if defined nginx_version && (nginx_version >= 1003001) + (tmp_idx < len && -+ (match = pcre_exec(rl->br->rx->regex, 0, ++ (match = pcre_exec(rl->br->rx->regex->code, 0, + (const char *) str->data, str->len, tmp_idx, 0, + captures, 6)) >= 0) -+#elif nginx_version > 1001011 && nginx_version < 1003001 ++#elif (nginx_version > 1001011) && (nginx_version < 1003001) (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->pcre, 0, (const char *) str->data, str->len, tmp_idx, 0, diff --git a/www/nginx-devel/files/extra-patch-ngx_http_subs_filter_module.c b/www/nginx-devel/files/extra-patch-ngx_http_subs_filter_module.c index a3b1bdcc88e5..2739db922ca6 100644 --- a/www/nginx-devel/files/extra-patch-ngx_http_subs_filter_module.c +++ b/www/nginx-devel/files/extra-patch-ngx_http_subs_filter_module.c @@ -5,9 +5,9 @@ n = 0; -#if defined(nginx_version) && nginx_version >= 1001012 -+#if defined(nginx_version) && nginx_version >= 1003001 -+ rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, &n); -+#elif nginx_version >= 1001012 && nginx_version < 1003001 ++#if defined(nginx_version) && (nginx_version >= 1003001) ++ rc = pcre_fullinfo(re->code, NULL, PCRE_INFO_CAPTURECOUNT, &n); ++#elif (nginx_version >= 1001012) && (nginx_version < 1003001) rc = pcre_fullinfo(re->pcre, NULL, PCRE_INFO_CAPTURECOUNT, &n); #else rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, &n); |