diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2016-11-20 20:19:51 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2016-11-20 20:19:51 +0000 |
| commit | e4c340379706fc886b958638d65e2bc435300777 (patch) | |
| tree | 643eeca32d22fac11944a5d0e0356ab4ae7c53f5 /www | |
| parent | ad073471c9b5377e736860b5b87233e7b5ae64c1 (diff) | |
Notes
Diffstat (limited to 'www')
| -rw-r--r-- | www/nginx-devel/Makefile | 4 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-ngx_http_memc_util.c | 17 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-ngx_http_redis2_util.c | 18 |
3 files changed, 37 insertions, 2 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index a9503ee6f210..08fb57388947 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -859,7 +859,7 @@ GH_ACCOUNT+= openresty:memc GH_PROJECT+= memc-nginx-module:memc GH_TAGNAME+= v${NGINX_MEMC_VERSION}:memc CONFIGURE_ARGS+=--add-module=${WRKSRC_memc} -IGNORE= MEMC: a patch requires +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_memc_util.c .endif .if ${PORT_OPTIONS:MMODSECURITY} @@ -943,7 +943,7 @@ GH_ACCOUNT+= openresty:redis2 GH_PROJECT+= redis2-nginx-module:redis2 GH_TAGNAME+= v${NGINX_REDIS2_VERSION}:redis2 CONFIGURE_ARGS+=--add-module=${WRKSRC_redis2} -IGNORE= REDIS2: a patch requires +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_redis2_util.c .endif .if ${PORT_OPTIONS:MRTMP} diff --git a/www/nginx-devel/files/extra-patch-ngx_http_memc_util.c b/www/nginx-devel/files/extra-patch-ngx_http_memc_util.c new file mode 100644 index 000000000000..8537d72142cb --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_http_memc_util.c @@ -0,0 +1,17 @@ +--- ../memc-nginx-module-0.17/src/ngx_http_memc_util.c.orig 2016-11-20 14:54:02.640140000 -0500 ++++ ../memc-nginx-module-0.17/src/ngx_http_memc_util.c 2016-11-20 14:54:34.579764000 -0500 +@@ -141,12 +141,14 @@ + continue; + } + ++#if (nginx_version < 1011006) + if (uscfp[i]->default_port && url->default_port + && uscfp[i]->default_port != url->default_port) + { + dd("upstream_add: default_port not match"); + continue; + } ++#endif + + return uscfp[i]; + } diff --git a/www/nginx-devel/files/extra-patch-ngx_http_redis2_util.c b/www/nginx-devel/files/extra-patch-ngx_http_redis2_util.c new file mode 100644 index 000000000000..9e71d98e6409 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_http_redis2_util.c @@ -0,0 +1,18 @@ +--- ../redis2-nginx-module-0.12/src/ngx_http_redis2_util.c.orig 2016-11-20 15:00:28.997903000 -0500 ++++ ../redis2-nginx-module-0.12/src/ngx_http_redis2_util.c 2016-11-20 15:00:44.173323000 -0500 +@@ -77,6 +77,7 @@ + continue; + } + ++#if (nginx_version < 1011006) + if (uscfp[i]->default_port + && url->default_port + && uscfp[i]->default_port != url->default_port) +@@ -84,6 +85,7 @@ + dd("upstream_add: default_port not match"); + continue; + } ++#endif + + return uscfp[i]; + } |