diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2014-06-19 23:42:05 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2014-06-19 23:42:05 +0000 |
| commit | 2b98678c7bd37b6b272a8cd3beebbde298f9a396 (patch) | |
| tree | b31f82a197fb2f71abecfaabc4b7916275d0f81d /www/nginx-devel | |
| parent | - Update to checkin 81baf7e90d (diff) | |
Update from 1.7.1 to 1.7.2.
Remove nginx_upstream_hash third-party module support, please use
http_upstream_hash_module instead.
<ChangeLog>
*) Feature: the "hash" directive inside the "upstream" block.
*) Feature: defragmentation of free shared memory blocks.
Thanks to Wandenberg Peixoto and Yichun Zhang.
*) Bugfix: a segmentation fault might occur in a worker process if the
default value of the "access_log" directive was used; the bug had
appeared in 1.7.0.
Thanks to Piotr Sikora.
*) Bugfix: trailing slash was mistakenly removed from the last parameter
of the "try_files" directive.
*) Bugfix: nginx could not be built on OS X in some cases.
*) Bugfix: in the ngx_http_spdy_module.
</ChangeLog>
Diffstat (limited to 'www/nginx-devel')
| -rw-r--r-- | www/nginx-devel/Makefile | 12 | ||||
| -rw-r--r-- | www/nginx-devel/distinfo | 4 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-ngx_http_upstream.h | 13 |
3 files changed, 3 insertions, 26 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 45de37f5d88f..4defa556f517 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nginx -PORTVERSION= 1.7.1 +PORTVERSION= 1.7.2 PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ @@ -72,7 +72,6 @@ OPTIONS_DEFINE= \ HTTP_UPLOAD \ HTTP_UPLOAD_PROGRESS \ HTTP_UPSTREAM_FAIR \ - HTTP_UPSTREAM_HASH \ HTTP_UPSTREAM_STICKY \ HTTP_ZIP \ ARRAYVAR \ @@ -162,7 +161,6 @@ HTTP_SUBS_FILTER_DESC= 3rd party subs filter module HTTP_UPLOAD_DESC= 3rd party upload module HTTP_UPLOAD_PROGRESS_DESC= 3rd party uploadprogress module HTTP_UPSTREAM_FAIR_DESC= 3rd party upstream fair module -HTTP_UPSTREAM_HASH_DESC= 3rd party upstream hash module HTTP_UPSTREAM_STICKY_DESC= 3rd party upstream sticky module HTTP_ZIP_DESC= 3rd party http_zip module ARRAYVAR_DESC= 3rd party array_var module @@ -523,14 +521,6 @@ DISTFILES+= nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}.tar.gz:upstreamfa CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} .endif -.if ${PORT_OPTIONS:MHTTP_UPSTREAM_HASH} -NGINX_UPSTREAM_HASH_VERSION= 0.3.1 -MASTER_SITES+= http://wiki.nginx.org/images/1/11/:upstreamhash -DISTFILES+= Nginx_upstream_hash-${NGINX_UPSTREAM_HASH_VERSION}.tar.gz:upstreamhash -CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_hash-${NGINX_UPSTREAM_HASH_VERSION} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_upstream.h -.endif - .if ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY} IGNORE= HTTP_UPSTREAM_STICKY: update require USE_HTTP_SSL= yes diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 5c61b9f4c773..5976c2cc252c 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,5 +1,5 @@ -SHA256 (nginx-1.7.1.tar.gz) = a47de66dc2a1526c7cba2aa7c1defbc9e0a4ff3c68226f195874c010797b011e -SIZE (nginx-1.7.1.tar.gz) = 811015 +SHA256 (nginx-1.7.2.tar.gz) = 693508fcad31c6b64b69edf6839299eb4e4fe44dcb145e75deb90959cd880f75 +SIZE (nginx-1.7.1.tar.gz) = 814079 SHA256 (giom-nginx_accept_language_module-2f69842.tar.gz) = fbcdf792160a1eff7b9549aeb5209d6e76716ff8e86b05e42c90b2d2f858e011 SIZE (giom-nginx_accept_language_module-2f69842.tar.gz) = 3399 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1 diff --git a/www/nginx-devel/files/extra-patch-ngx_http_upstream.h b/www/nginx-devel/files/extra-patch-ngx_http_upstream.h deleted file mode 100644 index f4c1f7ada782..000000000000 --- a/www/nginx-devel/files/extra-patch-ngx_http_upstream.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/http/ngx_http_upstream.h.orig 2010-01-14 04:20:57.000000000 +0300 -+++ src/http/ngx_http_upstream.h 2010-01-14 04:22:00.000000000 +0300 -@@ -105,6 +105,10 @@ - - ngx_array_t *servers; /* ngx_http_upstream_server_t */ - -+ ngx_array_t *values; -+ ngx_array_t *lengths; -+ ngx_uint_t retries; -+ - ngx_uint_t flags; - ngx_str_t host; - u_char *file_name; |