diff options
author | Sergey A. Osokin <osa@FreeBSD.org> | 2012-06-06 13:21:26 +0000 |
---|---|---|
committer | Sergey A. Osokin <osa@FreeBSD.org> | 2012-06-06 13:21:26 +0000 |
commit | 4b7dcd941ebffe7189ef5488e7c865be36cc14b5 (patch) | |
tree | d7411dca241df81babff9b53f4ca722f8cea71ca | |
parent | Fix my previous commit by adding a accidentally removed <p>. (diff) |
Update from 1.3.0 to 1.3.1.
<ChangeLog>
*) Security: now nginx/Windows ignores trailing dot in URI path
component, and does not allow URIs with ":$" in it.
Thanks to Vladimir Kochetkov, Positive Research Center.
*) Feature: the "proxy_pass", "fastcgi_pass", "scgi_pass", "uwsgi_pass"
directives, and the "server" directive inside the "upstream" block,
now support IPv6 addresses.
*) Feature: the "resolver" directive now support IPv6 addresses and an
optional port specification.
*) Feature: the "least_conn" directive inside the "upstream" block.
*) Feature: it is now possible to specify a weight for servers while
using the "ip_hash" directive.
*) Bugfix: a segmentation fault might occur in a worker process if the
"image_filter" directive was used; the bug had appeared in 1.3.0.
*) Bugfix: nginx could not be built with ngx_cpp_test_module; the bug
had appeared in 1.1.12.
*) Bugfix: access to variables from SSI and embedded perl module might
not work after reconfiguration.
Thanks to Yichun Zhang.
*) Bugfix: in the ngx_http_xslt_filter_module.
Thanks to Kuramoto Eiji.
*) Bugfix: memory leak if $geoip_org variable was used.
Thanks to Denis F. Latypoff.
*) Bugfix: in the "proxy_cookie_domain" and "proxy_cookie_path"
directives.
</ChangeLog>
Notes
Notes:
svn path=/head/; revision=298590
-rw-r--r-- | www/nginx-devel/Makefile | 4 | ||||
-rw-r--r-- | www/nginx-devel/distinfo | 8 | ||||
-rw-r--r-- | www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c | 16 | ||||
-rw-r--r-- | www/nginx-devel/files/extra-patch-ngx_http_subs_filter_module.c | 13 |
4 files changed, 34 insertions, 7 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 22e69567e931..a85aaaf60b49 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nginx -PORTVERSION= 1.3.0 +PORTVERSION= 1.3.1 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= ${MASTER_SITE_LOCAL} @@ -452,6 +452,7 @@ MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:subs_filter/} MASTER_SITE_SUBDIR+= osa/:subs_filter DISTFILES+= ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_VERSION}.tar.gz:subs_filter CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_VERSION} +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_subs_filter_module.c .endif .if ${PORT_OPTIONS:MHTTP_SECURE_LINK} @@ -598,6 +599,7 @@ NGINX_NAXSI_VERSION= 0.46-1 MASTER_SITES+= http://naxsi.googlecode.com/files/:naxsi DISTFILES+= naxsi-${NGINX_NAXSI_VERSION}.tgz:naxsi CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_src +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-naxsi_src::naxsi_runtime.c .endif .if ${PORT_OPTIONS:MHTTP_REWRITE} diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 218e811b54b5..8a093b75d74e 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,5 +1,5 @@ -SHA256 (nginx-1.3.0.tar.gz) = e95d4e5f840afe0e85f95689a10ffa8acaf5a4a1372fe285b175fbc807a5f409 -SIZE (nginx-1.3.0.tar.gz) = 717795 +SHA256 (nginx-1.3.1.tar.gz) = 9b30a6f67f0a9eda7db026e12d4f09656f9254cddbb66ff9c0c01d8963dc1d73 +SIZE (nginx-1.3.1.tar.gz) = 721002 SHA256 (giom-nginx_accept_language_module-02262ce.tar.gz) = 3191f4caa70d9a8942c4f10b6abaaa96af451991d4b5e1e3d7b991376b00bf0c SIZE (giom-nginx_accept_language_module-02262ce.tar.gz) = 3398 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1 @@ -26,8 +26,6 @@ SHA256 (ngx_http_gunzip_filter_module-0.4.tar.gz) = d2bcef58612d1f66f92c7160fc05 SIZE (ngx_http_gunzip_filter_module-0.4.tar.gz) = 7432 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 -SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19 -SIZE (nginx_mod_h264_streaming-2.2.7.tar.gz) = 44012 SHA256 (kr-nginx-notice-0-g3c95966.tar.gz) = bb0b8c603b2df206aeb13100fb60c1328aa6a69d0ac7f411e5dabe8fdb2affce SIZE (kr-nginx-notice-0-g3c95966.tar.gz) = 3348 SHA256 (nginx_http_push_module-0.692.tar.gz) = 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe @@ -92,8 +90,6 @@ SHA256 (nginx_udplog_module-1.0.0.tar.gz) = e0c0bfa524c3a675ad6c08b916d08e57ef45 SIZE (nginx_udplog_module-1.0.0.tar.gz) = 6284 SHA256 (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 136239b8f9ab2fbefb2aabc6897d3f12cc8063ce817901f9b8a624e12fbc6035 SIZE (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 2714 -SHA256 (agentzh-xss-nginx-module-v0.03rc9-0-gbeddbe1.tar.gz) = 444d7e319bb2af4c7892815407f53e4ffe21183f3e6711eafe86ed7523a3531b -SIZE (agentzh-xss-nginx-module-v0.03rc9-0-gbeddbe1.tar.gz) = 9891 SHA256 (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = bf5540d76d1867b4411091f16c6c786fd66759099c59483c76c68434020fdb02 SIZE (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = 64964 SHA256 (agentzh-array-var-nginx-module-v0.03rc1-0-gfed751a.tar.gz) = 345e60d7a479409b7a7aba933a042629d59fd4fbfaed1d0f7fe43cc688e48ced 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 new file mode 100644 index 000000000000..fd5228fb6556 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c @@ -0,0 +1,16 @@ +--- ../naxsi-0.46-1/naxsi_src/naxsi_runtime.c.orig 2012-06-06 16:26:30.000000000 +0400 ++++ ../naxsi-0.46-1/naxsi_src/naxsi_runtime.c 2012-06-06 16:29:58.000000000 +0400 +@@ -116,7 +116,12 @@ + tmp_idx = 0; + len = str->len; + while +-#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, ++ (const char *) str->data, str->len, tmp_idx, 0, ++ captures, 6)) >= 0) ++#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 new file mode 100644 index 000000000000..a3b1bdcc88e5 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_http_subs_filter_module.c @@ -0,0 +1,13 @@ +--- ../ngx_http_subs_filter_module-0.5.2.r53/ngx_http_subs_filter_module.c.orig 2012-06-06 16:13:15.000000000 +0400 ++++ ../ngx_http_subs_filter_module-0.5.2.r53/ngx_http_subs_filter_module.c 2012-06-06 16:16:06.000000000 +0400 +@@ -1300,7 +1300,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 + rc = pcre_fullinfo(re->pcre, NULL, PCRE_INFO_CAPTURECOUNT, &n); + #else + rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, &n); |