cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update from 1.1.3 to 1.1.4.

Browse Source 
Remove third-party upstream_keepalive module, in the base now.
Update third-party http_redis module from 0.3.4 to 0.3.5.
Update third-party http_gunzip_filter module from 0.3 to 0.4.
Add patch for ngx_postgres module.

Note: nginx-1.1.4 release introduces several API changes which may
affect 3rd party modules.

<ChangeLog>

Changes with nginx 1.1.4

*) Feature: the ngx_http_upstream_keepalive module.

*) Feature: the "proxy_http_version" directive.

*) Feature: the "fastcgi_keep_conn" directive.

*) Feature: the "worker_aio_requests" directive.

*) Bugfix: if nginx was built --with-file-aio it could not be run on
   Linux kernel which did not support AIO.

*) Bugfix: in Linux AIO error processing.
   Thanks to Hagai Avrahami.

*) Bugfix: reduced memory consumption for long-lived requests.

*) Bugfix: the module ngx_http_mp4_module did not support 64-bit MP4
   "co64" atom.

Changes with http_redis 0.3.5

*) Feature: add test for not set $redis_db directive.

*) Feature: keep-alive support merged from original
   memcached module 1.1.4.

Changes with http_gunzip 0.4

*) Feature: support for nginx 1.1.4.

</ChangeLog>
This commit is contained in:
Sergey A. Osokin 2011-09-28 17:03:44 +00:00
parent eee40438cf
commit 36cfdea852
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=282571
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
www/nginx-devel/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= nginx
PORTVERSION= 1.1.3
PORTVERSION= 1.1.4
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/
MASTER_SITES+= ${MASTER_SITE_LOCAL}
@ -69,7 +69,6 @@ OPTIONS= DEBUG "Enable nginx debugging" off \
HTTP_UPLOAD_PROGRESS "3rd party uploadprogress module" off \
HTTP_UPSTREAM_FAIR "3rd party upstream fair module" off \
HTTP_UPSTREAM_HASH "3rd party upstream hash module" off \
HTTP_UPSTREAM_KEEPALIVE "3rd party upstream keepalive module" off \
HTTP_ZIP_MODULE "3rd party http_zip module" off \
CHUNKIN_MODULE "3rd party chunkin module" off \
DEVEL_KIT_MODULE "3rd party devel_kit module" off \
@ -244,7 +243,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx-fancyindex-${NGINX_FANCYINDEX_MODULE_
.endif
.if defined(WITH_HTTP_GUNZIP_FILTER)
NGINX_GUNZIP_FILTER_MODULE_VERSION= 0.3
NGINX_GUNZIP_FILTER_MODULE_VERSION= 0.4
MASTER_SITES+= http://mdounin.ru/files/:gunzipfilter
DISTFILES+= ngx_http_gunzip_filter_module-${NGINX_GUNZIP_FILTER_MODULE_VERSION}.tar.gz:gunzipfilter
CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_gunzip_filter_module-${NGINX_GUNZIP_FILTER_MODULE_VERSION}
@ -320,7 +319,7 @@ CONFIGURE_ARGS+=--with-http_realip_module
.endif
.if defined(WITH_HTTP_REDIS_MODULE)
NGINX_REDIS_MODULE_VERSION= 0.3.4
NGINX_REDIS_MODULE_VERSION= 0.3.5
MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:redis/}
MASTER_SITE_SUBDIR+= osa/:redis
DISTFILES+= ngx_http_redis-${NGINX_REDIS_MODULE_VERSION}.tar.gz:redis
@ -390,13 +389,6 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_hash-${NGINX_UPSTREAM_HASH
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_upstream.h
.endif
.if defined(WITH_HTTP_UPSTREAM_KEEPALIVE)
NGINX_UPSTREAM_KEEPALIVE_VERSION= 0.4
MASTER_SITES+= http://mdounin.ru/files/:upstream
DISTFILES+= ngx_http_upstream_keepalive-${NGINX_UPSTREAM_KEEPALIVE_VERSION}.tar.gz:upstream
CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_upstream_keepalive-${NGINX_UPSTREAM_KEEPALIVE_VERSION}
.endif
.if defined(WITH_HTTP_XSLT_MODULE)
USE_GNOME= libxml2 libxslt
CONFIGURE_ARGS+=--with-http_xslt_module
@ -491,7 +483,8 @@ NGINX_POSTGRES_MODULE_VERSION= 0.8
MASTER_SITES+= http://labs.frickle.com/files/:postgres
DISTFILES+= ngx_postgres-${NGINX_POSTGRES_MODULE_VERSION}.tar.gz:postgres
CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_postgres-${NGINX_POSTGRES_MODULE_VERSION}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_postgres::config
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_postgres::config \
${PATCHDIR}/extra-patch-ngx_postgres_output.c
.endif
.if defined(WITH_REDIS2_MODULE)

14
www/nginx-devel/distinfo
View File

@ -1,5 +1,5 @@
SHA256 (nginx-1.1.3.tar.gz) = b058563eb271eec2257cffd5ae88c4c0942231d5eec6035fc31b6e2d0b50a602
SIZE (nginx-1.1.3.tar.gz) = 685151
SHA256 (nginx-1.1.4.tar.gz) = a5fc829bc4296ce49953a772c27891aa5be649a19f7f101221c684898fe75a63
SIZE (nginx-1.1.4.tar.gz) = 692544
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
@ -18,8 +18,8 @@ SHA256 (vkholodkov-nginx-eval-module-1.0.3-0-g125fa2e.tar.gz) = 945046c42d973be9
SIZE (vkholodkov-nginx-eval-module-1.0.3-0-g125fa2e.tar.gz) = 5727
SHA256 (ngx-fancyindex-0.3.1.tar.gz) = 877e383c6bc06be92abb88f5ac251a165b63feb5f4828d52a554efc19a3f7c7d
SIZE (ngx-fancyindex-0.3.1.tar.gz) = 13071
SHA256 (ngx_http_gunzip_filter_module-0.3.tar.gz) = c1860befc868970dce4085631e7717c749329883d8b05a2a64bd2850f346cd39
SIZE (ngx_http_gunzip_filter_module-0.3.tar.gz) = 7361
SHA256 (ngx_http_gunzip_filter_module-0.4.tar.gz) = d2bcef58612d1f66f92c7160fc05695b540ffdee45936b1e86a0d4981e09114a
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
@ -28,8 +28,8 @@ SHA256 (nginx-notice-2.tar.gz) = 682824a9f5187831ee49e5828bafebde5c25706e681d361
SIZE (nginx-notice-2.tar.gz) = 3253
SHA256 (nginx_http_push_module-0.692.tar.gz) = 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe
SIZE (nginx_http_push_module-0.692.tar.gz) = 29119
SHA256 (ngx_http_redis-0.3.4.tar.gz) = aedf72c3d954db0c2ffea2d99cbca7489a4f80be792eadbd50e7c5f2d1fc5970
SIZE (ngx_http_redis-0.3.4.tar.gz) = 11105
SHA256 (ngx_http_redis-0.3.5.tar.gz) = 5398805bbc790b8ae5ddb5079cf726df63c8c206bbf9a3a4b035412194aac82e
SIZE (ngx_http_redis-0.3.5.tar.gz) = 11373
SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045
SIZE (ngx_http_response-0.3.tar.gz) = 2244
SHA256 (ngx_http_subs_filter_module-0.5.2.r45.tar.gz) = fbbb38bb3ffa92059b1920cfd00bc8b2b8b081ba4b18975a20d7af436138887e
@ -42,8 +42,6 @@ SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc72099323
SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024
SHA256 (Nginx_upstream_hash-0.3.1.tar.gz) = 51929c5352d4c2608b3f852987830be08b6946baf20da346fe520d9b12e39968
SIZE (Nginx_upstream_hash-0.3.1.tar.gz) = 5049
SHA256 (ngx_http_upstream_keepalive-0.4.tar.gz) = 47c751380deba98c57747d711157eda22a4da18bc89783722eac89c923bd2e67
SIZE (ngx_http_upstream_keepalive-0.4.tar.gz) = 8267
SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1
SIZE (mod_zip-1.1.6.tar.gz) = 21991
SHA256 (agentzh-chunkin-nginx-module-v0.22rc1-0-gb0a3ee3.tar.gz) = 23c41a6743803f8521c55b9c76d5c35b20e9870576478ce9152d2ecddffbf2ca

11
www/nginx-devel/files/extra-patch-ngx_postgres_output.c Normal file
View File

@ -0,0 +1,11 @@
--- ../ngx_postgres-0.8/src/ngx_postgres_output.c.orig 2011-09-20 13:00:59.000000000 +0400
+++ ../ngx_postgres-0.8/src/ngx_postgres_output.c 2011-09-20 13:05:09.000000000 +0400
@@ -624,7 +624,7 @@
return rc;
}
- ngx_chain_update_chains(&u->free_bufs, &u->busy_bufs, &cl, u->output.tag);
+ ngx_chain_update_chains(r->pool, &u->free_bufs, &u->busy_bufs, &cl, u->output.tag);
dd("returning rc:%d", (int) rc);
return rc;