mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-11 02:50:24 +00:00
Code Issues Releases Activity

Be more correct after latest changes in ngx_regex_t.

Browse Source
This commit is contained in:
Sergey A. Osokin 2012-06-07 01:24:03 +00:00
parent d6a4b1f5e6
commit 23b6c12cd8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=298656
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c
View File

@ -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,

6
www/nginx-devel/files/extra-patch-ngx_http_subs_filter_module.c
View File

@ -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);