Date: Wed, 26 Apr 2017 18:18:44 +0200 From: Mathieu Arnold <mat@FreeBSD.org> To: "Sergey A. Osokin" <osa@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r439421 - in head/www/nginx: . files Message-ID: <b836e2e3-8920-538a-a87e-f7a931f1a85f@FreeBSD.org> In-Reply-To: <201704252318.v3PNI9Io032993@repo.freebsd.org> References: <201704252318.v3PNI9Io032993@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --WBTloNuK7saWDclOvSpV0XEW2WflnjvC3 Content-Type: multipart/mixed; boundary="QfQAsBEQpknnIHVudXDf3OLd6r40qxpiI"; protected-headers="v1" From: Mathieu Arnold <mat@FreeBSD.org> To: "Sergey A. Osokin" <osa@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Message-ID: <b836e2e3-8920-538a-a87e-f7a931f1a85f@FreeBSD.org> Subject: Re: svn commit: r439421 - in head/www/nginx: . files References: <201704252318.v3PNI9Io032993@repo.freebsd.org> In-Reply-To: <201704252318.v3PNI9Io032993@repo.freebsd.org> --QfQAsBEQpknnIHVudXDf3OLd6r40qxpiI Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Language: fr Le 26/04/2017 =C3=A0 01:18, Sergey A. Osokin a =C3=A9crit : > Author: osa > Date: Tue Apr 25 23:18:09 2017 > New Revision: 439421 > URL: https://svnweb.freebsd.org/changeset/ports/439421 > > Log: > Upgrade from 1.10.3 to 1.12.0. > =20 > ChangeLog: http://nginx.org/en/CHANGES-1.12 > =20 > Remove IPV6 knob, IPv6 now compiled-in automatically if support is fo= und. This still feels like a very bad idea. > Also, remove third-party modules: > o) udplog > o) statsd > =20 > Enable third_party mod_zip module back by changing upstream. > =20 I think this is what breaks the build: https://pkg.absolight.fr/data/11amd64-pkgng-default/20170426T181224Z/logs= /errors/nginx-1.12.0,2.log cc -c -I/usr/local/include/luajit-2.0 -O2 -pipe -DLIBICONV_PLUG -fstack-= protector -fno-strict-aliasing -I /usr/local/include -DNDK_SET_VAR -Wno-w= rite-strings -DNDK_SET_VAR -I src/core -I src/event -I src/event/modul= es -I src/os/unix -I /wrkdirs/usr/ports/www/nginx/work/nginx-push-strea= m-module-0.5.1/src -I /wrkdirs/usr/ports/www/nginx/work/nginx-push-strea= m-module-0.5.1/include -I /wrkdirs/usr/ports/www/nginx/work/ngx_devel_ki= t-0.3.0/objs -I objs/addon/ndk -I /wrkdirs/usr/ports/www/nginx/work/lua= -nginx-module-0.10.8/src/api -I /usr/local/include/libxml2 -I /usr/loca= l/include -I objs -I src/http -I src/http/modules -I src/http/v2 -I = src/http/modules/perl -I /wrkdirs/usr/ports/www/nginx/work/nchan-0.99.16= /src -I /wrkdirs/usr/ports/www/nginx/work/ngx_devel_kit-0.3.0/src -I /w= rkdirs/usr/ports/www/nginx/work/ngx_devel_kit-0.3.0/src -I /wrkdirs/usr/= ports/www/nginx/work/ngx_devel_kit-0.3.0/objs -I objs/addon/ndk -I /usr= /local/include/luajit-2.0 -I /wrkdirs/usr/ports/www/nginx/work/njs-753eb= e6/nginx/../nxt -I /wrkdirs/usr/ports/www/nginx/work/njs-753ebe6/nginx/.= =2E/njs -I src/mail -I src/stream -I /wrkdirs/usr/ports/www/nginx/work= /njs-753ebe6/nginx/../nxt -I /wrkdirs/usr/ports/www/nginx/work/njs-753eb= e6/nginx/../njs -o objs/addon/mod_zip-74ef235/ngx_http_zip_module.o /wr= kdirs/usr/ports/www/nginx/work/mod_zip-74ef235/ngx_http_zip_module.c /wrkdirs/usr/ports/www/nginx/work/mod_zip-74ef235/ngx_http_zip_module.c:7= 4:4: error: no member named 'charset' in '' offsetof(ngx_http_zip_conf_t, charset), ^ ~~~~~~~ /usr/include/stddef.h:65:32: note: expanded from macro 'offsetof' #define offsetof(type, member) __offsetof(type, member) ^ ~~~~~~ /usr/include/sys/cdefs.h:477:34: note: expanded from macro '__offsetof' #define __offsetof(type, field) __builtin_offsetof(type, field) ^ ~~~~~ 1 error generated. *** Error code 1 > Upgrade third-party modules: > o) lua to 0.10.8 > o) upstream_fair to b5be36f (upstream has been changed) > o) upload to 72ec037 (upstream has been changed). > o) http_auth_krb5 to 0c6ff3f. > o) party njs to 0.1.10. > =20 > Please see this comment in case of the production use of the lua modu= le: > https://github.com/openresty/lua-nginx-module/pull/1017#issuecomment-= 294076002 > =20 > Patches obtained from: > o) https://github.com/openresty/lua-nginx-module/commit/0459a285ca015= 9d45e73da8bd1164edb5c57cde3 > o) https://github.com/SpiderLabs/ModSecurity/pull/1373/commits/d19df1= 59043106a4d6dfd113696900b5b0dae24b > > Added: > head/www/nginx/files/extra-patch-ngx_http_drizzle_upstream.c (conte= nts, props changed) > head/www/nginx/files/extra-patch-ngx_http_echo_request_info.c (cont= ents, props changed) > head/www/nginx/files/extra-patch-ngx_http_lua_common.h (contents, p= rops changed) > head/www/nginx/files/extra-patch-ngx_http_lua_headers.c (contents, = props changed) > head/www/nginx/files/extra-patch-ngx_http_lua_headers.h (contents, = props changed) > head/www/nginx/files/extra-patch-ngx_http_lua_module.c (contents, p= rops changed) > head/www/nginx/files/extra-patch-ngx_http_memc_util.c (contents, pr= ops changed) > head/www/nginx/files/extra-patch-ngx_http_modsecurity.c (contents, = props changed) > head/www/nginx/files/extra-patch-ngx_http_redis2_util.c (contents, = props changed) > head/www/nginx/files/extra-patch-ngx_http_sticky_misc.c (contents, = props changed) > head/www/nginx/files/extra-patch-ngx_http_upstream_fair_module.c.n = (contents, props changed) > head/www/nginx/files/extra-patch-ngx_inet_slab.c (contents, props c= hanged) > head/www/nginx/files/extra-patch-ngx_postgres_module.c (contents, p= rops changed) > head/www/nginx/files/extra-patch-src-c-ngx_http_clojure_socket.c (c= ontents, props changed) > Deleted: > head/www/nginx/files/extra-patch-ngx_http_udplog_module.c > Modified: > head/www/nginx/Makefile > head/www/nginx/distinfo > head/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config= > head/www/nginx/files/extra-patch-src-http-ngx_http_upstream_round_rob= in.h > > Modified: head/www/nginx/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/nginx/Makefile Tue Apr 25 21:07:23 2017 (r439420) > +++ head/www/nginx/Makefile Tue Apr 25 23:18:09 2017 (r439421) > @@ -2,8 +2,7 @@ > # $FreeBSD$ > =20 > PORTNAME=3D nginx > -PORTVERSION=3D 1.10.3 > -PORTREVISION=3D 1 > +PORTVERSION=3D 1.12.0 > PORTEPOCH=3D 2 > CATEGORIES=3D www > MASTER_SITES=3D http://nginx.org/download/ > @@ -27,7 +26,6 @@ OPTIONS_DEFINE=3D \ > DEBUG \ > DEBUGLOG \ > FILE_AIO \ > - IPV6 \ > GOOGLE_PERFTOOLS \ > HTTP \ > HTTP_ADDITION \ > @@ -59,6 +57,7 @@ OPTIONS_DEFINE=3D \ > NJS \ > STREAM \ > STREAM_SSL \ > + STREAM_SSL_PREREAD \ > THREADS \ > WWW \ > AJP \ > @@ -122,8 +121,6 @@ OPTIONS_DEFINE=3D \ > SLOWFS_CACHE \ > SMALL_LIGHT \ > SRCACHE \ > - STATSD \ > - UDPLOG \ > X11 \ > XRID_HEADER \ > XSS > @@ -132,7 +129,8 @@ OPTIONS_DEFAULT?=3DDSO FILE_AIO HTTP HTTP_ > HTTP_DAV HTTP_FLV HTTP_GZIP_STATIC HTTP_GUNZIP_FILTER \ > HTTP_MP4 HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK \ > HTTP_SLICE HTTP_REWRITE HTTP_SSL HTTP_STATUS HTTP_SUB \ > - HTTPV2 MAIL MAIL_SSL STREAM STREAM_SSL THREADS WWW > + HTTPV2 MAIL MAIL_SSL STREAM STREAM_SSL STREAM_SSL_PREREAD \ > + THREADS WWW > =20 > DSO_DESC=3D Enable dynamic modules support > DEBUG_DESC=3D Build with debugging support > @@ -169,6 +167,7 @@ HTTPV2_DESC=3D Enable HTTP/2 protocol su > NJS_DESC=3D Enable http_javascript module > STREAM_DESC=3D Enable stream module > STREAM_SSL_DESC=3D Enable stream_ssl module (SSL req.) > +STREAM_SSL_PREREAD_DESC=3D Enable stream_ssl_preread module (SSL req.)= > THREADS_DESC=3D Enable threads support > WWW_DESC=3D Enable html sample files > AJP_DESC=3D 3rd party ajp module > @@ -232,8 +231,6 @@ SHIBBOLETH_DESC=3D 3rd party shibboleth m > SLOWFS_CACHE_DESC=3D 3rd party slowfs_cache module > SMALL_LIGHT_DESC=3D 3rd party small_light module > SRCACHE_DESC=3D 3rd party srcache module > -STATSD_DESC=3D 3rd party statsd module > -UDPLOG_DESC=3D 3rd party udplog (syslog) module > X11_DESC=3D graphics/ImageMagick[-nox11] dependency > XRID_HEADER_DESC=3D 3rd party x-rid header module > XSS_DESC=3D 3rd party xss module > @@ -310,11 +307,6 @@ CONFIGURE_ARGS+=3D--with-debug > CONFIGURE_ARGS+=3D--with-file-aio > .endif > =20 > -.if ${PORT_OPTIONS:MIPV6} > -CONFIGURE_ARGS+=3D--with-ipv6 > -CATEGORIES+=3D ipv6 > -.endif > - > .if ${PORT_OPTIONS:MGOOGLE_PERFTOOLS} > LIB_DEPENDS+=3D libprofiler.so:devel/google-perftools > CONFIGURE_ARGS+=3D--with-google_perftools_module > @@ -341,6 +333,7 @@ NGINX_ACCESSKEY_VERSION=3D 2.0.3 > MASTER_SITES+=3D LOCAL/osa:accesskey > DISTFILES+=3D nginx-accesskey-${NGINX_ACCESSKEY_VERSION}.tar.gz:access= key > CONFIGURE_ARGS+=3D--add-module=3D${WRKDIR}/nginx-accesskey-${NGINX_ACC= ESSKEY_VERSION} > +IGNORE=3D ACCESSKEY: a patch requires > .endif > =20 > .if ${PORT_OPTIONS:MHTTP_ADDITION} > @@ -356,14 +349,16 @@ CONFIGURE_ARGS+=3D--add-module=3D${WRKSRC_au > .endif > =20 > .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5} > -GIT_HTTP_AUTH_KRB5_VERSION=3D c85a38c > +GIT_HTTP_AUTH_KRB5_VERSION=3D 0c6ff3f > GH_ACCOUNT+=3D stnoonan:auth_krb5 > GH_PROJECT+=3D spnego-http-auth-nginx-module:auth_krb5 > GH_TAGNAME+=3D ${GIT_HTTP_AUTH_KRB5_VERSION}:auth_krb5 > CONFIGURE_ARGS+=3D--add-module=3D${WRKSRC_auth_krb5} > -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-modul= e-config > -# TODO: Provide optional dependence on Kerberos implementations from p= orts > -USES+=3D gssapi:base,flags > +#EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-modu= le-config > +#OPTIONS_RADIO+=3D GSSAPI > +#OPTIONS_RADIO_GSSAPI+=3D GSSAPI_HEIMDAL GSSAPI_MIT > +#GSSAPI_HEIMDAL_USES=3D gssapi:heimdal,flags > +#GSSAPI_MIT_USES=3D gssapi:mit > .endif > =20 > .if ${PORT_OPTIONS:MHTTP_AUTH_LDAP} > @@ -432,6 +427,7 @@ GH_PROJECT+=3D nginx-clojure:clojure > GH_TAGNAME+=3D v${NGINX_CLOJURE_VERSION}:clojure > CONFIGURE_ENV+=3D "JNI_INCS=3D-I${LOCALBASE}/openjdk8/include -I${LOCA= LBASE}/openjdk8/include/freebsd" > CONFIGURE_ARGS+=3D--add-module=3D${WRKSRC_clojure}/src/c > +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-src-c-ngx_http_clojure_socke= t.c > .endif > =20 > .if ${PORT_OPTIONS:MCT} > @@ -461,6 +457,7 @@ CONFIGURE_ARGS+=3D--add-dynamic-module=3D${W > .else > CONFIGURE_ARGS+=3D--add-module=3D${WRKSRC_echo} > .endif > +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-ngx_http_echo_request_info.c= > .endif > =20 > .if ${PORT_OPTIONS:MFASTDFS} > @@ -709,8 +706,8 @@ CONFIGURE_ARGS+=3D--with-http_sub_module > .endif > =20 > .if ${PORT_OPTIONS:MHTTP_UPLOAD} > -GIT_UPLOAD_VERSION=3D aba1e3f34c > -GH_ACCOUNT+=3D vkholodkov:upload > +GIT_UPLOAD_VERSION=3D 72ec037 > +GH_ACCOUNT+=3D Austinb:upload > GH_PROJECT+=3D nginx-upload-module:upload > GH_TAGNAME+=3D ${GIT_UPLOAD_VERSION}:upload > CONFIGURE_ARGS+=3D--add-module=3D${WRKSRC_upload} > @@ -739,13 +736,14 @@ EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch- > .endif > =20 > .if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR) > -NGINX_UPSTREAM_FAIR_VERSION=3D 20090923 > -MASTER_SITES+=3D LOCAL/osa:upstreamfair > -DISTFILES+=3D nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}.tar.g= z:upstreamfair > -CONFIGURE_ARGS+=3D--add-module=3D${WRKDIR}/nginx_upstream_fair-${NGINX= _UPSTREAM_FAIR_VERSION} > -.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_CHECK) > -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-ngx_http_upstream_fair_modul= e.c > -.endif > +NGINX_UPSTREAM_FAIR_VERSION=3D b5be36f > +GH_ACCOUNT+=3D cryptofuture:upstreamfair > +GH_PROJECT+=3D nginx-upstream-fair:upstreamfair > +GH_TAGNAME+=3D ${NGINX_UPSTREAM_FAIR_VERSION}:upstreamfair > +CONFIGURE_ARGS+=3D--add-module=3D${WRKSRC_upstreamfair} > +#.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_CHECK) > +#EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-ngx_http_upstream_fair_modu= le.c > +#.endif > .endif > =20 > .if ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY} > @@ -754,6 +752,7 @@ NGINX_UPSTREAM_STICKY_VERSION=3D 08a395c66 > MASTER_SITES+=3D https://bitbucket.org/nginx-goodies/nginx-sticky-modu= le-ng/get/:upstreamsticky > DISTFILES+=3D ${NGINX_UPSTREAM_STICKY_VERSION}.tar.gz:upstreamsticky > CONFIGURE_ARGS+=3D--add-module=3D${WRKDIR}/nginx-goodies-nginx-sticky-= module-ng-${NGINX_UPSTREAM_STICKY_VERSION}/ > +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-ngx_http_sticky_misc.c > .endif > =20 > .if ${PORT_OPTIONS:MHTTP_VIDEO_THUMBEXTRACTOR} > @@ -779,8 +778,8 @@ CONFIGURE_ARGS+=3D--with-http_xslt_module > .endif > =20 > .if ${PORT_OPTIONS:MHTTP_ZIP} > -NGINX_ZIP_VERSION=3D ca0b345 > -GH_ACCOUNT+=3D evanmiller:mod_zip > +NGINX_ZIP_VERSION=3D 74ef235 > +GH_ACCOUNT+=3D anthonyryan1:mod_zip > GH_PROJECT+=3D mod_zip:mod_zip > GH_TAGNAME+=3D ${NGINX_ZIP_VERSION}:mod_zip > CONFIGURE_ARGS+=3D--add-module=3D${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION= } > @@ -795,7 +794,8 @@ GH_ACCOUNT+=3D openresty:drizzle > GH_PROJECT+=3D drizzle-nginx-module:drizzle > GH_TAGNAME+=3D v${NGINX_DRIZZLE_VERSION}:drizzle > CONFIGURE_ARGS+=3D--add-module=3D${WRKSRC_drizzle} > -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-modu= le-config > +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-modu= le-config \ > + ${PATCHDIR}/extra-patch-ngx_http_drizzle_upstream.c > .endif > =20 > .if ${PORT_OPTIONS:MDYNAMIC_UPSTREAM} > @@ -808,6 +808,7 @@ CONFIGURE_ARGS+=3D--add-dynamic-module=3D${W > .else > CONFIGURE_ARGS+=3D--add-module=3D${WRKSRC_dyn_upstream} > .endif > +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-ngx_inet_slab.c > .endif > =20 > .if ${PORT_OPTIONS:MARRAYVAR} || ${PORT_OPTIONS:MENCRYPTSESSION} || ${= PORT_OPTIONS:MFORMINPUT} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MLUA= } || ${PORT_OPTIONS:MSET_MISC} > @@ -847,7 +848,7 @@ CONFIGURE_ARGS+=3D--add-module=3D${WRKSRC_le > LIB_DEPENDS+=3D libluajit-5.1.so:lang/luajit > CONFIGURE_ENV+=3D "LUAJIT_INC=3D${LOCALBASE}/include/luajit-2.0" > CONFIGURE_ENV+=3D "LUAJIT_LIB=3D${LOCALBASE}/lib" > -NGINX_LUA_VERSION=3D 0.10.7 > +NGINX_LUA_VERSION=3D 0.10.8 > GH_ACCOUNT+=3D openresty:lua > GH_PROJECT+=3D lua-nginx-module:lua > GH_TAGNAME+=3D v${NGINX_LUA_VERSION}:lua > @@ -856,6 +857,10 @@ CONFIGURE_ARGS+=3D--add-dynamic-module=3D${W > .else > CONFIGURE_ARGS+=3D--add-module=3D${WRKSRC_lua} > .endif > +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-ngx_http_lua_common.h \ > + ${PATCHDIR}/extra-patch-ngx_http_lua_headers.c \ > + ${PATCHDIR}/extra-patch-ngx_http_lua_headers.h \ > + ${PATCHDIR}/extra-patch-ngx_http_lua_module.c > .endif > =20 > .if ${PORT_OPTIONS:MMEMC} > @@ -864,6 +869,7 @@ GH_ACCOUNT+=3D openresty:memc > GH_PROJECT+=3D memc-nginx-module:memc > GH_TAGNAME+=3D v${NGINX_MEMC_VERSION}:memc > CONFIGURE_ARGS+=3D--add-module=3D${WRKSRC_memc} > +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-ngx_http_memc_util.c > .endif > =20 > .if ${PORT_OPTIONS:MMODSECURITY} > @@ -879,7 +885,8 @@ USES+=3D pkgconfig shebangfix > MASTER_SITES+=3D http://www.modsecurity.org/tarball/${NGINX_MODSECURIT= Y_VERSION:S/RC/rc/}/:modsecurity > DISTFILES+=3D modsecurity-${NGINX_MODSECURITY_VERSION}.tar.gz:modsecur= ity > CONFIGURE_ARGS+=3D--add-module=3D${WRKDIR}/modsecurity-${NGINX_MODSECU= RITY_VERSION}/nginx/modsecurity > -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-nginx-modsecurity-configure > +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-nginx-modsecurity-configure = \ > + ${PATCHDIR}/extra-patch-ngx_http_modsecurity.c > .endif > =20 > .if ${PORT_OPTIONS:MNAXSI} > @@ -922,7 +929,8 @@ GH_ACCOUNT+=3D FRiCKLE:postgres > GH_PROJECT+=3D ngx_postgres:postgres > GH_TAGNAME+=3D ${NGINX_POSTGRES_VERSION}:postgres > CONFIGURE_ARGS+=3D--add-module=3D${WRKSRC_postgres} > -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-ngx_postgres-config > +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-ngx_postgres-config \ > + ${PATCHDIR}/extra-patch-ngx_postgres_module.c > .endif > =20 > .if ${PORT_OPTIONS:MRDS_CSV} > @@ -947,6 +955,7 @@ GH_ACCOUNT+=3D openresty:redis2 > GH_PROJECT+=3D redis2-nginx-module:redis2 > GH_TAGNAME+=3D v${NGINX_REDIS2_VERSION}:redis2 > CONFIGURE_ARGS+=3D--add-module=3D${WRKSRC_redis2} > +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-ngx_http_redis2_util.c > .endif > =20 > .if ${PORT_OPTIONS:MRTMP} > @@ -1016,22 +1025,6 @@ GH_TAGNAME+=3D v${NGINX_SRCACHE_VERSION}:s > CONFIGURE_ARGS+=3D--add-module=3D${WRKSRC_srcache} > .endif > =20 > -.if ${PORT_OPTIONS:MSTATSD} > -NGINX_STATSD_VERSION=3D b756a12 > -GH_ACCOUNT+=3D zebrafishlabs:statsd > -GH_PROJECT+=3D nginx-statsd:statsd > -GH_TAGNAME+=3D ${NGINX_STATSD_VERSION}:statsd > -CONFIGURE_ARGS+=3D--add-module=3D${WRKSRC_statsd} > -.endif > - > -.if ${PORT_OPTIONS:MUDPLOG} > -NGINX_UDPLOG_VERSION=3D 1.0.0 > -MASTER_SITES+=3D http://www.grid.net.ru/nginx/download/:udplog > -DISTFILES+=3D nginx_udplog_module-${NGINX_UDPLOG_VERSION}.tar.gz:udplo= g > -CONFIGURE_ARGS+=3D--add-module=3D${WRKDIR}/nginx_udplog_module-${NGINX= _UDPLOG_VERSION} > -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-ngx_http_udplog_module.c > -.endif > - > .if ${PORT_OPTIONS:MXRID_HEADER} > GIT_XRID_VERSION=3D 0daa3cc > GH_ACCOUNT+=3D gabor:xrid > @@ -1057,7 +1050,7 @@ CONFIGURE_ARGS+=3D--with-http_v2_module > .if ${PORT_OPTIONS:MNJS} > GH_ACCOUNT+=3D nginx:njs > GH_PROJECT+=3D njs:njs > -GH_TAGNAME+=3D f7d2d6f:njs > +GH_TAGNAME+=3D 753ebe6:njs > .if !empty(PORT_OPTIONS:MDSO) > CONFIGURE_ARGS+=3D--add-dynamic-module=3D${WRKSRC_njs}/nginx > .else > @@ -1075,6 +1068,9 @@ CONFIGURE_ARGS+=3D--with-stream > NGINX_OPENSSL=3D yes > USE_HTTP_SSL=3D yes > CONFIGURE_ARGS+=3D--with-stream_ssl_module > +.if ${PORT_OPTIONS:MSTREAM_SSL_PREREAD} > +CONFIGURE_ARGS+=3D--with-stream_ssl_preread_module > +.endif > .endif > .endif > =20 > @@ -1166,9 +1162,6 @@ GROUPS?=3D${WWWGRP} > =20 > .if defined(NGINX_OPENSSL) > USES+=3D ssl > -.if ${SSL_DEFAULT:Mopenssl-devel} > -BROKEN=3D Does not build with openssl-devel > -.endif > .endif > =20 > pre-everything:: > @@ -1253,20 +1246,6 @@ post-patch: > 's!%%PREFIX%%!${LOCALBASE}!g' \ > ${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION}/ngx_http_sflow_c= onfig.h > .endif > -.if ${PORT_OPTIONS:MSTATSD} > - @${REINPLACE_CMD} \ > - 's!ngx_udp_connection_t!ngx_resolver_connection_t!g; \ > - s!uc->connection!uc->udp!g; \ > - s!e->udp_connection->connection!e->udp_connection->udp!g' \ > - ${WRKSRC_statsd}/ngx_http_statsd.c > -.endif > -.if ${PORT_OPTIONS:MUDPLOG} > - @${REINPLACE_CMD} \ > - 's!ngx_udp_connection_t!ngx_resolver_connection_t!g; \ > - s!uc->connection!uc->udp!g; \ > - s!e->udp_connection->connection!e->udp_connection->udp!g' \ > - ${WRKDIR}/nginx_udplog_module-${NGINX_UDPLOG_VERSION}/ngx_http_udplo= g_module.c > -.endif > .if ${PORT_OPTIONS:MICONV} > @${REINPLACE_CMD} \ > 's!%%PREFIX%%!${LOCALBASE}!g' \ > > Modified: head/www/nginx/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/nginx/distinfo Tue Apr 25 21:07:23 2017 (r439420) > +++ head/www/nginx/distinfo Tue Apr 25 23:18:09 2017 (r439421) > @@ -1,6 +1,6 @@ > -TIMESTAMP =3D 1487041847 > -SHA256 (nginx-1.10.3.tar.gz) =3D 75020f1364cac459cb733c4e1caed2d00376e= 40ea05588fb8793076a4c69dd90 > -SIZE (nginx-1.10.3.tar.gz) =3D 911509 > +TIMESTAMP =3D 1492353399 > +SHA256 (nginx-1.12.0.tar.gz) =3D b4222e26fdb620a8d3c3a3a8b955e08b71367= 2e1bc5198d1e4f462308a795b30 > +SIZE (nginx-1.12.0.tar.gz) =3D 980831 > SHA256 (nginx-accesskey-2.0.3.tar.gz) =3D d9e94321e78a02de16c57f3e048f= d31059fd8116ed03d6de7180f435c52502b1 > SIZE (nginx-accesskey-2.0.3.tar.gz) =3D 2632 > SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) =3D 5a85970ba61a99f55a26d= 2536a11d512b39bbd622f5737d25a9a8c10db81efa9 > @@ -15,8 +15,6 @@ SHA256 (ngx_http_redis-0.3.8.tar.gz) =3D 9 > SIZE (ngx_http_redis-0.3.8.tar.gz) =3D 12342 > SHA256 (ngx_http_response-0.3.tar.gz) =3D 0835584029f053051c624adbe33a= 826ab0205c9d85a02af6019e6b57607e9045 > SIZE (ngx_http_response-0.3.tar.gz) =3D 2244 > -SHA256 (nginx_upstream_fair-20090923.tar.gz) =3D ec9ed7f856263e17faade= e3dc7209932364ded4e546b829841c2454aa432450b > -SIZE (nginx_upstream_fair-20090923.tar.gz) =3D 10024 > SHA256 (08a395c66e42.tar.gz) =3D 53e440737ed1aff1f09fae150219a45f16add= 0c8d6e84546cb7d80f73ebffd90 > SIZE (08a395c66e42.tar.gz) =3D 120603 > SHA256 (modsecurity-2.9.1.tar.gz) =3D 958cc5a7a7430f93fac0fd6f8b9aa92f= c1801efce0cda797d6029d44080a9b24 > @@ -25,14 +23,12 @@ SHA256 (passenger-5.1.2.tar.gz) =3D 7fb03a > SIZE (passenger-5.1.2.tar.gz) =3D 5646103 > SHA256 (ngx_slowfs_cache-1.10.tar.gz) =3D 1e81453942e5b0877de1f1f06c56= ae82918ea9818255cb935bcb673c95a758a1 > SIZE (ngx_slowfs_cache-1.10.tar.gz) =3D 11809 > -SHA256 (nginx_udplog_module-1.0.0.tar.gz) =3D e0c0bfa524c3a675ad6c08b9= 16d08e57ef45f9818cb8a0d848c2c83785c6e659 > -SIZE (nginx_udplog_module-1.0.0.tar.gz) =3D 6284 > SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) =3D 5534= ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0 > SIZE (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) =3D 3393 > SHA256 (atomx-nginx-http-auth-digest-cc61b4a_GH0.tar.gz) =3D e68b34e03= 516a4ab43006eb4c481d6bc5e813e0d40876359c606a26c5c68ccf6 > SIZE (atomx-nginx-http-auth-digest-cc61b4a_GH0.tar.gz) =3D 16060 > -SHA256 (stnoonan-spnego-http-auth-nginx-module-c85a38c_GH0.tar.gz) =3D= b47b23a362aa338c377d6163d15abee6f33ff16bac5f86ee4d9543293fe8c4d1 > -SIZE (stnoonan-spnego-http-auth-nginx-module-c85a38c_GH0.tar.gz) =3D 1= 8120 > +SHA256 (stnoonan-spnego-http-auth-nginx-module-0c6ff3f_GH0.tar.gz) =3D= 3d3fed1e19a532cdd2a37726953f2b2d4e20891a44119ff6075a6b5891324d2d > +SIZE (stnoonan-spnego-http-auth-nginx-module-0c6ff3f_GH0.tar.gz) =3D 1= 8212 > SHA256 (kvspb-nginx-auth-ldap-dbcef31_GH0.tar.gz) =3D 0ec4f099e50cc12a= 6319e37700e71540498d354831d1f09e113ee046ee0bb7b2 > SIZE (kvspb-nginx-auth-ldap-dbcef31_GH0.tar.gz) =3D 17001 > SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) =3D 9e3f78ea73e= 2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316 > @@ -71,16 +67,18 @@ SHA256 (yaoweibin-ngx_http_substitutions > SIZE (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz= ) =3D 92230 > SHA256 (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) =3D 34d51a= fcd464582e6011a5d3abe6829c5690ddb9b50c993dfdafb4c725a4803a > SIZE (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) =3D 48378 > -SHA256 (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) =3D 62a2= c4388585aec463a1cee30bc84953593a93f341dc1df61b42b452594d2a05 > -SIZE (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) =3D 28296 > +SHA256 (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) =3D c6d4e38ad0= 712c898cc53721f492f8f73acf2753cc0a0769fa34d4d6ba4e8efd > +SIZE (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) =3D 28303 > SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) =3D = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1 > SIZE (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) =3D 16= 990 > SHA256 (yaoweibin-nginx_upstream_check_module-10782ea_GH0.tar.gz) =3D = 52e6acd8c0264a59c5c948271015a59acd3cbcf91377456b7c8dc6f9feecef4a > SIZE (yaoweibin-nginx_upstream_check_module-10782ea_GH0.tar.gz) =3D 12= 8281 > +SHA256 (cryptofuture-nginx-upstream-fair-b5be36f_GH0.tar.gz) =3D e765a= fcaab6cd1601e914039a8d00ab18eb6fe01180c58e0e4e098bc5b4d8233 > +SIZE (cryptofuture-nginx-upstream-fair-b5be36f_GH0.tar.gz) =3D 10174 > SHA256 (wandenberg-nginx-video-thumbextractor-module-0.7.0_GH0.tar.gz)= =3D 382bb41fa739f471fdab9fbabc5384d8ec7f25b5bb0c45c153f5cc01d428abe2 > SIZE (wandenberg-nginx-video-thumbextractor-module-0.7.0_GH0.tar.gz) =3D= 2709351 > -SHA256 (evanmiller-mod_zip-ca0b345_GH0.tar.gz) =3D babab586ebde83d3cf1= 28eabdc3a66f922db740a43c943ffd9cd8b055acf3a5b > -SIZE (evanmiller-mod_zip-ca0b345_GH0.tar.gz) =3D 26035 > +SHA256 (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) =3D 0d780e6fef91814fb= aa577c9f7cfb7b78f6898e50c34d63f3c5d101eb45afd44 > +SIZE (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) =3D 26125 > SHA256 (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) =3D aafb79d8= 7273eec023025333c34d6d0108026a1ce2e09b20a53e8e2d9bf65080 > SIZE (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) =3D 59024 > SHA256 (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) =3D bf60cf1= 96c86193376d11f8c7a3826994b24a48bb36943bab8a25af6e776af3b > @@ -95,8 +93,8 @@ SHA256 (mongodb-mongo-c-driver-v0.3.1_GH > SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) =3D 53024 > SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) =3D cbf6fcddc00a7e302= 89134bdeace12565e000cc7d4efee2d2ebb8799d0b88270 > SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) =3D 20534 > -SHA256 (openresty-lua-nginx-module-v0.10.7_GH0.tar.gz) =3D c21c8937dcd= d6fc2b6a955f929e3f4d1388610f47180e60126e6dcab06786f77 > -SIZE (openresty-lua-nginx-module-v0.10.7_GH0.tar.gz) =3D 605171 > +SHA256 (openresty-lua-nginx-module-v0.10.8_GH0.tar.gz) =3D d67449c7105= 1b3cc2d6dd60df0ae0d21fca08aa19c9b30c5b95ee21ff38ef8dd > +SIZE (openresty-lua-nginx-module-v0.10.8_GH0.tar.gz) =3D 606643 > SHA256 (openresty-memc-nginx-module-v0.17_GH0.tar.gz) =3D 25cbe3ff4931= 283a681260607bc91ae4a922075345d5770b293c6cd7f1e3bdcc > SIZE (openresty-memc-nginx-module-v0.17_GH0.tar.gz) =3D 36369 > SHA256 (nbs-system-naxsi-0.54_GH0.tar.gz) =3D 9cc2c09405bc71f78ef26a8b= 6d70afcea3fccbe8125df70cb0cfc480133daba5 > @@ -121,14 +119,12 @@ SHA256 (cubicdaiya-ngx_small_light-v0.8. > SIZE (cubicdaiya-ngx_small_light-v0.8.0_GH0.tar.gz) =3D 55918 > SHA256 (openresty-srcache-nginx-module-v0.30_GH0.tar.gz) =3D e34b1ab5f= 5007661f73819f9c20fd6c2a46ed3e53364e9449b02ef2bd3628633 > SIZE (openresty-srcache-nginx-module-v0.30_GH0.tar.gz) =3D 58777 > -SHA256 (zebrafishlabs-nginx-statsd-b756a12_GH0.tar.gz) =3D 4c5886edb1f= beb0b9a83c879b4be4b15a620627a18978aef636da3feafb284fe > -SIZE (zebrafishlabs-nginx-statsd-b756a12_GH0.tar.gz) =3D 6636 > SHA256 (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) =3D de784142d867a= 35ecc5443fa347c2903af0935669cdf2eaa9274f5253aac2267 > SIZE (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) =3D 2711 > SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) =3D 958bd8de77360= 1d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf > SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) =3D 11477 > -SHA256 (nginx-njs-f7d2d6f_GH0.tar.gz) =3D 67291a3ae4b98f17335f12951984= bc9b1bf4f6367e4beff40638cd832d2fb281 > -SIZE (nginx-njs-f7d2d6f_GH0.tar.gz) =3D 167815 > +SHA256 (nginx-njs-753ebe6_GH0.tar.gz) =3D 43fc7a307ee98b9c55283374b36f= 1f4576cbf529a4101176cb94ab73f3110f67 > +SIZE (nginx-njs-753ebe6_GH0.tar.gz) =3D 191124 > SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) =3D c949d4b= e6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80 > SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) =3D 11280 > SHA256 (google-ngx_brotli-ada972b_GH0.tar.gz) =3D d3d0e22a2629cd017280= e05bd3bf05aa7b5c820ebe8c79932ce161243911e776 > > Added: head/www/nginx/files/extra-patch-ngx_http_drizzle_upstream.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/nginx/files/extra-patch-ngx_http_drizzle_upstream.c Tue Ap= r 25 23:18:09 2017 (r439421) > @@ -0,0 +1,17 @@ > +--- ../drizzle-nginx-module-0.1.9/src/ngx_http_drizzle_upstream.c.orig= 2016-11-20 15:32:37.264746000 -0500 > ++++ ../drizzle-nginx-module-0.1.9/src/ngx_http_drizzle_upstream.c 2016= -11-20 15:33:20.909836000 -0500 > +@@ -1027,12 +1027,14 @@ > + continue; > + } > +=20 > ++#if (nginx_version < 1011006) > + if (uscfp[i]->default_port && url->default_port > + && uscfp[i]->default_port !=3D url->default_port) > + { > + dd("upstream_add: default_port not match"); > + continue; > + } > ++#endif > +=20 > + return uscfp[i]; > + } > > Added: head/www/nginx/files/extra-patch-ngx_http_echo_request_info.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/nginx/files/extra-patch-ngx_http_echo_request_info.c Tue A= pr 25 23:18:09 2017 (r439421) > @@ -0,0 +1,43 @@ > +--- ../echo-nginx-module-46334b3/src/ngx_http_echo_request_info.c.orig= 2017-04-15 10:03:29.616243000 -0400 > ++++ ../echo-nginx-module-46334b3/src/ngx_http_echo_request_info.c 2017= -04-15 10:07:41.329695000 -0400 > +@@ -179,6 +179,9 @@ > + ngx_int_t i, j; > + ngx_buf_t *b, *first =3D NULL; > + unsigned found; > ++#if defined(nginx_version) && nginx_version >=3D 1011011 > ++ ngx_chain_t *cl; > ++#endif=20 > + ngx_connection_t *c; > + ngx_http_request_t *mr; > + ngx_http_connection_t *hc; > +@@ -215,8 +218,15 @@ > +=20 > + if (hc->nbusy) { > + b =3D NULL; > ++ > ++#if defined(nginx_version) && nginx_version >=3D 1011011 > ++ for (cl =3D hc->busy; cl; /* void */) { > ++ b =3D cl->buf; > ++ cl =3D cl->next; > ++#else > + for (i =3D 0; i < hc->nbusy; i++) { > + b =3D hc->busy[i]; > ++#endif > +=20 > + if (first =3D=3D NULL) { > + if (mr->request_line.data >=3D b->pos > +@@ -280,8 +290,14 @@ > + } > +=20 > + if (hc->nbusy) { > ++#if defined(nginx_version) && nginx_version >=3D 1011011 > ++ for (cl =3D hc->busy; cl; /* void */) { > ++ b =3D cl->buf; > ++ cl =3D cl->next; > ++#else > + for (i =3D 0; i < hc->nbusy; i++) { > + b =3D hc->busy[i]; > ++#endif > +=20 > + if (!found) { > + if (b !=3D first) { > > Added: head/www/nginx/files/extra-patch-ngx_http_lua_common.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/nginx/files/extra-patch-ngx_http_lua_common.h Tue Apr 25 2= 3:18:09 2017 (r439421) > @@ -0,0 +1,15 @@ > +--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_common.h.orig 2017-04-= 15 10:55:20.591680000 -0400 > ++++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_common.h 2017-04-15 10= :55:50.449108000 -0400 > +@@ -199,6 +199,12 @@ > + of reqeusts */ > + ngx_uint_t malloc_trim_req_count; > +=20 > ++#if nginx_version >=3D 1011011 > ++ /* the following 2 fields are only used by ngx.req.raw_headers() = for now */ > ++ ngx_buf_t **busy_buf_ptrs; > ++ ngx_int_t busy_buf_ptr_count; > ++#endif > ++ > + unsigned requires_header_filter:1; > + unsigned requires_body_filter:1; > + unsigned requires_capture_filter:1; > > Added: head/www/nginx/files/extra-patch-ngx_http_lua_headers.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/nginx/files/extra-patch-ngx_http_lua_headers.c Tue Apr 25 = 23:18:09 2017 (r439421) > @@ -0,0 +1,124 @@ > +--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.c.orig 2017-04= -15 10:57:48.875770000 -0400 > ++++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.c 2017-04-15 1= 1:02:00.492564000 -0400 > +@@ -26,6 +26,9 @@ > + static int ngx_http_lua_ngx_req_header_clear(lua_State *L); > + static int ngx_http_lua_ngx_req_header_set(lua_State *L); > + static int ngx_http_lua_ngx_resp_get_headers(lua_State *L); > ++#if nginx_version >=3D 1011011 > ++void ngx_http_lua_ngx_raw_header_cleanup(void *data); > ++#endif > +=20 > +=20 > + static int > +@@ -77,6 +80,11 @@ > + size_t size; > + ngx_buf_t *b, *first =3D NULL; > + ngx_int_t i, j; > ++#if nginx_version >=3D 1011011 > ++ ngx_buf_t **bb; > ++ ngx_chain_t *cl; > ++ ngx_http_lua_main_conf_t *lmcf; > ++#endif > + ngx_connection_t *c; > + ngx_http_request_t *r, *mr; > + ngx_http_connection_t *hc; > +@@ -93,6 +101,10 @@ > + return luaL_error(L, "no request object found"); > + } > +=20 > ++#if nginx_version >=3D 1011011 > ++ lmcf =3D ngx_http_get_module_main_conf(r, ngx_http_lua_module); > ++#endif > ++ > + ngx_http_lua_check_fake_request(L, r); > +=20 > + mr =3D r->main; > +@@ -109,8 +121,13 @@ > + dd("hc->nbusy: %d", (int) hc->nbusy); > +=20 > + if (hc->nbusy) { > ++#if nginx_version >=3D 1011011 > ++ dd("hc->busy: %p %p %p %p", hc->busy->buf->start, hc->busy->b= uf->pos, > ++ hc->busy->buf->last, hc->busy->buf->end); > ++#else > + dd("hc->busy: %p %p %p %p", hc->busy[0]->start, hc->busy[0]->= pos, > + hc->busy[0]->last, hc->busy[0]->end); > ++#endif > + } > +=20 > + dd("request line: %p %p", mr->request_line.data, > +@@ -146,9 +163,37 @@ > + dd("size: %d", (int) size); > +=20 > + if (hc->nbusy) { > ++#if nginx_version >=3D 1011011 > ++ if (hc->nbusy > lmcf->busy_buf_ptr_count) { > ++ if (lmcf->busy_buf_ptrs) { > ++ ngx_free(lmcf->busy_buf_ptrs); > ++ } > ++ > ++ lmcf->busy_buf_ptrs =3D ngx_alloc(hc->nbusy * sizeof(ngx_= buf_t *), > ++ r->connection->log); > ++ > ++ if (lmcf->busy_buf_ptrs =3D=3D NULL) { > ++ return luaL_error(L, "no memory"); > ++ } > ++ > ++ lmcf->busy_buf_ptr_count =3D hc->nbusy; > ++ } > ++ > ++ bb =3D lmcf->busy_buf_ptrs; > ++ for (cl =3D hc->busy; cl; cl =3D cl->next) { > ++ *bb++ =3D cl->buf; > ++ } > ++#endif > + b =3D NULL; > ++ > ++#if nginx_version >=3D 1011011 > ++ bb =3D lmcf->busy_buf_ptrs; > ++ for (i =3D hc->nbusy; i > 0; i--) { > ++ b =3D bb[i - 1]; > ++#else > + for (i =3D 0; i < hc->nbusy; i++) { > + b =3D hc->busy[i]; > ++#endif > +=20 > + dd("busy buf: %d: [%.*s]", (int) i, (int) (b->pos - b->st= art), > + b->start); > +@@ -223,8 +268,15 @@ > + } > +=20 > + if (hc->nbusy) { > ++ > ++#if nginx_version >=3D 1011011 > ++ bb =3D lmcf->busy_buf_ptrs; > ++ for (i =3D hc->nbusy - 1; i >=3D 0; i--) { > ++ b =3D bb[i]; > ++#else > + for (i =3D 0; i < hc->nbusy; i++) { > + b =3D hc->busy[i]; > ++#endif > +=20 > + if (!found) { > + if (b !=3D first) { > +@@ -1431,4 +1483,20 @@ > + #endif /* NGX_LUA_NO_FFI_API */ > +=20 > +=20 > ++#if nginx_version >=3D 1011011 > ++void > ++ngx_http_lua_ngx_raw_header_cleanup(void *data) > ++{ > ++ ngx_http_lua_main_conf_t *lmcf; > ++ > ++ lmcf =3D (ngx_http_lua_main_conf_t *) data; > ++ > ++ if (lmcf->busy_buf_ptrs) { > ++ ngx_free(lmcf->busy_buf_ptrs); > ++ lmcf->busy_buf_ptrs =3D NULL; > ++ } > ++} > ++#endif > ++ > ++ > + /* vi:set ft=3Dc ts=3D4 sw=3D4 et fdm=3Dmarker: */ > > Added: head/www/nginx/files/extra-patch-ngx_http_lua_headers.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/nginx/files/extra-patch-ngx_http_lua_headers.h Tue Apr 25 = 23:18:09 2017 (r439421) > @@ -0,0 +1,12 @@ > +--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.h.orig 2017-04= -15 11:05:40.649209000 -0400 > ++++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.h 2017-04-15 1= 1:06:01.658936000 -0400 > +@@ -15,6 +15,9 @@ > + void ngx_http_lua_inject_resp_header_api(lua_State *L); > + void ngx_http_lua_inject_req_header_api(lua_State *L); > + void ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State = *L); > ++#if nginx_version >=3D 1011011 > ++void ngx_http_lua_ngx_raw_header_cleanup(void *data); > ++#endif > +=20 > +=20 > + #endif /* _NGX_HTTP_LUA_HEADERS_H_INCLUDED_ */ > > Added: head/www/nginx/files/extra-patch-ngx_http_lua_module.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/nginx/files/extra-patch-ngx_http_lua_module.c Tue Apr 25 2= 3:18:09 2017 (r439421) > @@ -0,0 +1,36 @@ > +--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_module.c.orig 2017-04-= 15 11:07:10.366543000 -0400 > ++++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_module.c 2017-04-15 11= :08:25.640520000 -0400 > +@@ -28,6 +28,7 @@ > + #include "ngx_http_lua_ssl_certby.h" > + #include "ngx_http_lua_ssl_session_storeby.h" > + #include "ngx_http_lua_ssl_session_fetchby.h" > ++#include "ngx_http_lua_headers.h" > +=20 > +=20 > + static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf); > +@@ -624,7 +625,7 @@ > + volatile ngx_cycle_t *saved_cycle; > + ngx_http_core_main_conf_t *cmcf; > + ngx_http_lua_main_conf_t *lmcf; > +-#ifndef NGX_LUA_NO_FFI_API > ++#if !defined(NGX_LUA_NO_FFI_API) || nginx_version >=3D 1011011 > + ngx_pool_cleanup_t *cln; > + #endif > +=20 > +@@ -716,6 +717,16 @@ > + cln->handler =3D ngx_http_lua_sema_mm_cleanup; > + #endif > +=20 > ++#if nginx_version >=3D 1011011 > ++ cln =3D ngx_pool_cleanup_add(cf->pool, 0); > ++ if (cln =3D=3D NULL) { > ++ return NGX_ERROR; > ++ } > ++ > ++ cln->data =3D lmcf; > ++ cln->handler =3D ngx_http_lua_ngx_raw_header_cleanup; > ++#endif > ++ > + if (lmcf->lua =3D=3D NULL) { > + dd("initializing lua vm"); > +=20 > > Added: head/www/nginx/files/extra-patch-ngx_http_memc_util.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/nginx/files/extra-patch-ngx_http_memc_util.c Tue Apr 25 23= :18:09 2017 (r439421) > @@ -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:5= 4:34.579764000 -0500 > +@@ -141,12 +141,14 @@ > + continue; > + } > +=20 > ++#if (nginx_version < 1011006) > + if (uscfp[i]->default_port && url->default_port > + && uscfp[i]->default_port !=3D url->default_port) > + { > + dd("upstream_add: default_port not match"); > + continue; > + } > ++#endif > +=20 > + return uscfp[i]; > + } > > Added: head/www/nginx/files/extra-patch-ngx_http_modsecurity.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/nginx/files/extra-patch-ngx_http_modsecurity.c Tue Apr 25 = 23:18:09 2017 (r439421) > @@ -0,0 +1,18 @@ > +--- ../modsecurity-2.9.1/nginx/modsecurity/ngx_http_modsecurity.c.orig= 2017-04-15 10:45:12.886736000 -0400 > ++++ ../modsecurity-2.9.1/nginx/modsecurity/ngx_http_modsecurity.c 2017= -04-15 10:45:59.921529000 -0400 > +@@ -528,9 +528,15 @@ > +=20 > + hc =3D r->http_connection; > +=20 > ++#if defined(nginx_version) && nginx_version >=3D 1011011 > ++ if (hc->free && size =3D=3D cscf->large_client_header_buffers= =2Esize) { > ++ > ++ buf =3D hc->free->buf; > ++#else > + if (hc->nfree && size =3D=3D cscf->large_client_header_buffer= s.size) { > +=20 > + buf =3D hc->free[--hc->nfree]; > ++#endif > +=20 > + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,= > + "ModSecurity: use http free large header b= uffer: %p %uz", > > Added: head/www/nginx/files/extra-patch-ngx_http_redis2_util.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/nginx/files/extra-patch-ngx_http_redis2_util.c Tue Apr 25 = 23:18:09 2017 (r439421) > @@ -0,0 +1,18 @@ > +--- ../redis2-nginx-module-0.12/src/ngx_http_redis2_util.c.orig 2016-1= 1-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; > + } > +=20 > ++#if (nginx_version < 1011006) > + if (uscfp[i]->default_port > + && url->default_port > + && uscfp[i]->default_port !=3D url->default_port) > +@@ -84,6 +85,7 @@ > + dd("upstream_add: default_port not match"); > + continue; > + } > ++#endif > +=20 > + return uscfp[i]; > + } > > Added: head/www/nginx/files/extra-patch-ngx_http_sticky_misc.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/nginx/files/extra-patch-ngx_http_sticky_misc.c Tue Apr 25 = 23:18:09 2017 (r439421) > @@ -0,0 +1,17 @@ > +--- ../nginx-goodies-nginx-sticky-module-ng-08a395c66e42/ngx_http_stic= ky_misc.c.orig 2016-07-10 11:39:07.943834000 -0400 > ++++ ../nginx-goodies-nginx-sticky-module-ng-08a395c66e42/ngx_http_stic= ky_misc.c 2016-07-10 11:43:05.601078000 -0400 > +@@ -12,6 +12,14 @@ > +=20 > + #include "ngx_http_sticky_misc.h" > +=20 > ++#ifndef MD5_DIGEST_LENGTH > ++ #define MD5_DIGEST_LENGTH 16 > ++#endif > ++#ifndef MD5_CBLOCK > ++ #define MD5_CBLOCK 64 > ++#endif > ++ > ++ > + #ifndef ngx_str_set > + #define ngx_str_set(str, text) (str)->len =3D sizeof(text) - 1; (st= r)->data =3D (u_char *) text > + #endif > > Added: head/www/nginx/files/extra-patch-ngx_http_upstream_fair_module.c= =2En > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/nginx/files/extra-patch-ngx_http_upstream_fair_module.c.n = Tue Apr 25 23:18:09 2017 (r439421) > @@ -0,0 +1,21 @@ > +--- ../nginx_upstream_fair-20090923/ngx_http_upstream_fair_module.c.or= ig 2016-11-20 15:42:48.550372000 -0500 > ++++ ../nginx_upstream_fair-20090923/ngx_http_upstream_fair_module.c 20= 16-11-20 15:45:24.507554000 -0500 > +@@ -565,8 +565,7 @@ > +=20 > +=20 > + /* an upstream implicitly defined by proxy_pass, etc. */ > +- > +- if (us->port =3D=3D 0 && us->default_port =3D=3D 0) { > ++ if (us->port =3D=3D 0) { > + ngx_log_error(NGX_LOG_EMERG, cf->log, 0, > + "no port in upstream \"%V\" in %s:%ui", > + &us->host, us->file_name, us->line); > +@@ -576,7 +575,7 @@ > + ngx_memzero(&u, sizeof(ngx_url_t)); > +=20 > + u.host =3D us->host; > +- u.port =3D (in_port_t) (us->port ? us->port : us->default_port); > ++ u.port =3D (in_port_t) us->port; > +=20 > + if (ngx_inet_resolve_host(cf->pool, &u) !=3D NGX_OK) { > + if (u.err) { > > Added: head/www/nginx/files/extra-patch-ngx_inet_slab.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/nginx/files/extra-patch-ngx_inet_slab.c Tue Apr 25 23:18:0= 9 2017 (r439421) > @@ -0,0 +1,29 @@ > +--- ../ngx_dynamic_upstream-0.1.3/src/ngx_inet_slab.c.orig 2016-05-25 = 19:27:27.204200000 -0400 > ++++ ../ngx_dynamic_upstream-0.1.3/src/ngx_inet_slab.c 2016-05-25 19:28= :07.177622000 -0400 > +@@ -250,7 +250,7 @@ > + return NGX_ERROR; > + } > +=20 > +- ngx_memcpy(sin, u->sockaddr, sizeof(struct sockaddr_in)); > ++ ngx_memcpy(sin, &u->sockaddr, sizeof(struct sockaddr_in)); > +=20 > + u->addrs[0].sockaddr =3D (struct sockaddr *) sin; > + u->addrs[0].socklen =3D sizeof(struct sockaddr_in); > +@@ -277,7 +277,7 @@ > +=20 > + u->family =3D u->addrs[0].sockaddr->sa_family; > + u->socklen =3D u->addrs[0].socklen; > +- ngx_memcpy(u->sockaddr, u->addrs[0].sockaddr, u->addrs[0].socklen= ); > ++ ngx_memcpy(&u->sockaddr, u->addrs[0].sockaddr, u->addrs[0].sockle= n); > +=20 > + switch (u->family) { > +=20 > +@@ -405,7 +405,7 @@ > + return NGX_ERROR; > + } > +=20 > +- ngx_memcpy(sin6, u->sockaddr, sizeof(struct sockaddr_in6)); > ++ ngx_memcpy(sin6, &u->sockaddr, sizeof(struct sockaddr_in6)); > +=20 > + u->addrs[0].sockaddr =3D (struct sockaddr *) sin6; > + u->addrs[0].socklen =3D sizeof(struct sockaddr_in6); > > Added: head/www/nginx/files/extra-patch-ngx_postgres_module.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/nginx/files/extra-patch-ngx_postgres_module.c Tue Apr 25 2= 3:18:09 2017 (r439421) > @@ -0,0 +1,17 @@ > +--- ../ngx_postgres-1.0rc7/src/ngx_postgres_module.c.orig 2016-11-20 1= 5:34:25.763542000 -0500 > ++++ ../ngx_postgres-1.0rc7/src/ngx_postgres_module.c 2016-11-20 15:34:= 41.023867000 -0500 > +@@ -1320,12 +1320,14 @@ > + continue; > + } > +=20 > ++#if (nginx_version < 1011006) > + if (uscfp[i]->default_port && url->default_port > + && (uscfp[i]->default_port !=3D url->default_port)) > + { > + dd("default_port doesn't match"); > + continue; > + } > ++#endif > +=20 > + dd("returning"); > + return uscfp[i]; > > Modified: head/www/nginx/files/extra-patch-spnego-http-auth-nginx-modul= e-config > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-conf= ig Tue Apr 25 21:07:23 2017 (r439420) > +++ head/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-conf= ig Tue Apr 25 23:18:09 2017 (r439421) > @@ -1,8 +1,9 @@ > ---- ../spnego-http-auth-nginx-module-c85a38c/config.orig 2015-06-13 20= :49:15.590751000 +0300 > -+++ ../spnego-http-auth-nginx-module-c85a38c/config 2015-06-13 20:49:3= 1.024936000 +0300 > -@@ -1,4 +1,4 @@ > +--- ../spnego-http-auth-nginx-module-0c6ff3f/config.orig 2017-04-15 13= :07:01.159506000 -0400 > ++++ ../spnego-http-auth-nginx-module-0c6ff3f/config 2017-04-15 13:07:3= 6.283398000 -0400 > +@@ -1,5 +1,5 @@ > ngx_addon_name=3Dngx_http_auth_spnego_module > - HTTP_MODULES=3D"$HTTP_MODULES ngx_http_auth_spnego_module" > - NGX_ADDON_SRCS=3D"$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego= _module.c" > --CORE_LIBS=3D"$CORE_LIBS -lgssapi_krb5 -lkrb5 -lcom_err" > -+CORE_LIBS=3D"$CORE_LIBS %%GSSAPILIBS%% -lcom_err" > +-ngx_feature_libs=3D"-lgssapi_krb5 -lkrb5 -lcom_err" > ++ngx_feature_libs=3D"%%GSSAPILIBS%% -lcom_err" > +=20 > + if uname -o | grep -q FreeBSD; then > + ngx_feature_libs=3D"$ngx_feature_libs -lgssapi" > > Added: head/www/nginx/files/extra-patch-src-c-ngx_http_clojure_socket.c= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/nginx/files/extra-patch-src-c-ngx_http_clojure_socket.c Tu= e Apr 25 23:18:09 2017 (r439421) > @@ -0,0 +1,11 @@ > +--- ../nginx-clojure-0.4.4/src/c/ngx_http_clojure_socket.c.orig 2016-0= 5-24 17:39:48.898351000 -0400 > ++++ ../nginx-clojure-0.4.4/src/c/ngx_http_clojure_socket.c 2016-05-25 = 19:23:44.584704000 -0400 > +@@ -317,7 +317,7 @@ > + } > + u->resolved->host.data =3D url->host.data; > + u->resolved->host.len =3D url->host.len; > +- ngx_http_clojure_socket_upstream_connect(u, (struct sockaddr *)url->= sockaddr, url->socklen); > ++ ngx_http_clojure_socket_upstream_connect(u, &url->sockaddr, url->soc= klen); > + } > +=20 > + static void ngx_http_clojure_socket_upstream_connect_inner(ngx_http_c= lojure_socket_upstream_t *u) { > > Modified: head/www/nginx/files/extra-patch-src-http-ngx_http_upstream_r= ound_robin.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/nginx/files/extra-patch-src-http-ngx_http_upstream_round_r= obin.h Tue Apr 25 21:07:23 2017 (r439420) > +++ head/www/nginx/files/extra-patch-src-http-ngx_http_upstream_round_r= obin.h Tue Apr 25 23:18:09 2017 (r439421) > @@ -1,13 +1,14 @@ > ---- src/http/ngx_http_upstream_round_robin.h.orig 2016-02-24 14:53:24 = UTC > -+++ src/http/ngx_http_upstream_round_robin.h > -@@ -35,6 +35,10 @@ struct ngx_http_upstream_rr_peer_s { > +--- src/http/ngx_http_upstream_round_robin.h.orig 2016-10-11 11:03:02.= 000000000 -0400 > ++++ src/http/ngx_http_upstream_round_robin.h 2016-10-11 19:56:33.26230= 7000 -0400 > +@@ -35,6 +35,11 @@ > +=20 > ngx_uint_t max_fails; > time_t fail_timeout; > -=20 > ++ > +#if (NGX_HTTP_UPSTREAM_CHECK) > + ngx_uint_t check_index; > +#endif > + > - ngx_uint_t down; /* unsigned down:= 1; */ > + ngx_msec_t slow_start; > + ngx_msec_t start_time; > =20 > - #if (NGX_HTTP_SSL) > > > --=20 Mathieu Arnold --QfQAsBEQpknnIHVudXDf3OLd6r40qxpiI-- --WBTloNuK7saWDclOvSpV0XEW2WflnjvC3 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJZAMiRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQUI2OTc4OUQyRUQxMjEwNjQ0MEJBNUIz QTQ1MTZGMzUxODNDRTQ4AAoJEDpFFvNRg85IFj0QAJ/XUnmnnnjovkoGGBK7D1im vFlHnqAPdRXDv3UFM5y7CP8phuha8/ETv5pv5VD0xSZ0wwxczM1+p+mmd400g04m 2fg9lV89c5MeFfPFvqkyQCuqNFxpTMLh47Rcluh+03o1cOW9+4YZz63bizOJxyIF ylldzyONZ/CsO4EisSXmtUB3ijhJXoP2TgGT2rGCpr/D/sxdXPJewHMw5qRTjwe3 2G5N0ks4KpBVV5fjQvUuBhv00Lg7/Hdmy5YP4Tg8ZvHBcQNm4ytyKbkx0EFlSBcK cWz+niNT4grmoe1SMnj0KBUZlO14y3/7Wg/grPw2Nw3M5NpV/915HzGX+a1pXHHp 7BCRnlj8yyBhZL1Mo1JjTtclqrfLdN6m01Ny5Aw3oW9Pafd1FCUNypCXL8XVOZ+b TCgAemIddRT7anBU2DAtK9V6i8nhRqRO62BF7Kju1PgoKdcf7USB07lZnIUZHfKR T9O7dCJYEEUCE98bhE+LICwA0iv6FaWe6AIGGYzclSu74fcN2KVibZXVE17dgH6n Ddcw7L0C67DkJLItERjWAdgzkjoN1mFkFqxkheYbjqbJzYwmHcNcrJab7eQNLyfr H2CzCoP0Pz2W47hAiNdIIxZTuH1XPmMG6iDlWqgFDIFt/P99hP1PJbH1zbDseSjk yxNAa6LzEH/UUbX7Byie =VOaW -----END PGP SIGNATURE----- --WBTloNuK7saWDclOvSpV0XEW2WflnjvC3--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b836e2e3-8920-538a-a87e-f7a931f1a85f>