gentoo resync : 09.06.2018

1 files changed, 42 insertions, 0 deletions

diff --git a/www-servers/nginx/files/http_vhost_traffic_status-0.1.15-allow-compilation-without-HTTP-cache.patch b/www-servers/nginx/files/http_vhost_traffic_status-0.1.15-allow-compilation-without-HTTP-cache.patch
new file mode 100644
index 000000000000..e3ac786a62e6
--- /dev/null
+++ b/www-servers/nginx/files/http_vhost_traffic_status-0.1.15-allow-compilation-without-HTTP-cache.patch
@@ -0,0 +1,42 @@
+From 75118e8998d876b5cd0f285a1fa184c3b6ba7fd6 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@whissi.de>
+Date: Fri, 16 Feb 2018 20:59:07 +0100
+Subject: [PATCH] Fix compilation without HTTP cache.
+
+---
+ src/ngx_http_vhost_traffic_status_control.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/ngx_http_vhost_traffic_status_control.c b/src/ngx_http_vhost_traffic_status_control.c
+index ade1475..ee5fd3c 100644
+--- a/src/ngx_http_vhost_traffic_status_control.c
++++ b/src/ngx_http_vhost_traffic_status_control.c
+@@ -196,6 +196,7 @@ ngx_http_vhost_traffic_status_node_status_group(
+                             control->r, *control->buf);
+         break;
+ 
++#if (NGX_HTTP_CACHE)
+     case NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAM_CC:
+         *control->buf = ngx_sprintf(*control->buf,
+                                     NGX_HTTP_VHOST_TRAFFIC_STATUS_JSON_FMT_CACHE_S);
+@@ -203,6 +204,7 @@ ngx_http_vhost_traffic_status_node_status_group(
+         *control->buf = ngx_http_vhost_traffic_status_display_set_cache(
+                             control->r, *control->buf, node);
+         break;
++#endif
+ 
+     case NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAM_FG:
+         *control->buf = ngx_sprintf(*control->buf,
+@@ -317,10 +319,12 @@ ngx_http_vhost_traffic_status_node_status_zone(
+         }
+         break;
+ 
++#if (NGX_HTTP_CACHE)
+     case NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAM_CC:
+         *control->buf = ngx_http_vhost_traffic_status_display_set_cache_node(control->r,
+                             *control->buf, vtsn);
+         break;
++#endif
+ 
+     case NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAM_FG:
+         (void) ngx_http_vhost_traffic_status_node_position_key(&dst, 2);