summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2018-06-05 18:22:24 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-06-05 18:25:34 +0200
commit9484e13a40320a485a8c5b07fb082e504f61693e (patch)
tree3c2475345ef668b977d30dd1056e1f4678960d85 /www-servers/nginx/files
parentsys-apps/osinfo-db: bump to 20180531 (diff)
downloadgentoo-9484e13a40320a485a8c5b07fb082e504f61693e.tar.gz
gentoo-9484e13a40320a485a8c5b07fb082e504f61693e.tar.bz2
gentoo-9484e13a40320a485a8c5b07fb082e504f61693e.zip
www-servers/nginx: bump to v1.15.0 mainline
- HTTP LUA module bumped to v0.10.13 - HTTP VHost Traffic Status module bumped to v0.1.16 - HTTP memc module bumped to v0.19 - nginScript module bumped to v0.2.1 Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'www-servers/nginx/files')
-rw-r--r--www-servers/nginx/files/http_vhost_traffic_status-0.1.15-allow-compilation-without-HTTP-cache.patch42
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);