diff options
| author |   Thomas Deutschmann <whissi@whissi.de> | 2016-08-02 14:43:42 +0200 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2016-08-09 09:22:04 +0200 |
| commit | 8e825c84541e7d88387a864b9aefe3a30c7f2b8b (patch) | |
| tree | 723e53cc10b77eddc13fcafc837f2217c6a96d00 /www-servers/nginx/files | |
| parent | dev-util/jenkins-bin: version bump 2.12. (diff) | |
| download | gentoo-8e825c84541e7d88387a864b9aefe3a30c7f2b8b.tar.gz gentoo-8e825c84541e7d88387a864b9aefe3a30c7f2b8b.tar.bz2 gentoo-8e825c84541e7d88387a864b9aefe3a30c7f2b8b.zip | |
www-servers/nginx: version bump to v1.11.3.
* Upstream added 3 new STREAM modules:
- geo
- geoip
- split_clients
* Each HTTP/STREAM upstream module can now be enabled/disabled using a
dedicated USE flag
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/1999
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'www-servers/nginx/files')
| -rw-r--r-- | www-servers/nginx/files/nginx-1.11.3-fix-build-without-stream_ssl_module.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/www-servers/nginx/files/nginx-1.11.3-fix-build-without-stream_ssl_module.patch b/www-servers/nginx/files/nginx-1.11.3-fix-build-without-stream_ssl_module.patch new file mode 100644 index 000000000000..61637308742b --- /dev/null +++ b/www-servers/nginx/files/nginx-1.11.3-fix-build-without-stream_ssl_module.patch @@ -0,0 +1,30 @@ + +# HG changeset patch +# User Vladimir Homutov <vl@nginx.com> +# Date 1469550852 -10800 +# Node ID d43ee392e825186545d81e683b88cc58ef8479bc +# Parent 0b4249f975eba48c17b69c5e225fd12b470c0184 +Stream: fixed build without stream_ssl_module (ticket #1032). + +diff -r 0b4249f975eb -r d43ee392e825 src/stream/ngx_stream_proxy_module.c +--- a/src/stream/ngx_stream_proxy_module.c Tue Jul 26 19:07:18 2016 +0300 ++++ b/src/stream/ngx_stream_proxy_module.c Tue Jul 26 19:34:12 2016 +0300 +@@ -538,7 +538,7 @@ + return; + } + +-#if (NGX_HTTP_SSL) ++#if (NGX_STREAM_SSL) + u->ssl_name = uscf->host; + #endif + +@@ -1157,7 +1157,7 @@ + u = s->upstream; + ur = u->resolved; + +- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, s->connection->log, 0, ++ ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0, + "stream upstream resolve"); + + if (ctx->state) { + |