summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2016-05-14 02:03:41 -0700
committerZac Medico <zmedico@gentoo.org>2016-05-14 02:05:51 -0700
commit88fd6990872130f6e6f60fdbac4fe6d53c0afbd9 (patch)
treea2db8aaaade57fb627170adabdfa5ca69ec56143 /www-servers/nginx/files
parentx11-plugins/wmcube: DESTTREE -> /usr, #582986 (diff)
downloadgentoo-88fd6990872130f6e6f60fdbac4fe6d53c0afbd9.tar.gz
gentoo-88fd6990872130f6e6f60fdbac4fe6d53c0afbd9.tar.bz2
gentoo-88fd6990872130f6e6f60fdbac4fe6d53c0afbd9.zip
www-servers/nginx: fix upstream check module segfault for bug 582992
* update module snapshot to fix upstream issue 49, a segfault which occurs in the ngx_http_upstream_check_find_shm_peer function * remove check-0.3.0-segfault-on-reload.patch which is included in the new snapshot Package-Manager: portage-2.2.28
Diffstat (limited to 'www-servers/nginx/files')
-rw-r--r--www-servers/nginx/files/check-0.3.0-segfault-on-reload.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/www-servers/nginx/files/check-0.3.0-segfault-on-reload.patch b/www-servers/nginx/files/check-0.3.0-segfault-on-reload.patch
deleted file mode 100644
index f556aab6fc61..000000000000
--- a/www-servers/nginx/files/check-0.3.0-segfault-on-reload.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2a52fbf565d0d5bdc9f25382b5af6e952216831f Mon Sep 17 00:00:00 2001
-From: Dmitry Saprykin <saprykin.dmitry@gmail.com>
-Date: Fri, 5 Dec 2014 11:46:18 +0300
-Subject: [PATCH] * serfault on reload fix
-
----
- ngx_http_upstream_check_module.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ngx_http_upstream_check_module.c b/ngx_http_upstream_check_module.c
-index e2a4030..41aa63a 100644
---- a/ngx_http_upstream_check_module.c
-+++ b/ngx_http_upstream_check_module.c
-@@ -3991,9 +3991,9 @@ ngx_http_upstream_check_find_shm_peer(ngx_http_upstream_check_peers_shm_t *p,
- continue;
- }
-
-- if ((ngx_memcmp(addr->sockaddr, peer_shm->sockaddr, addr->socklen) == 0)
-- && (ngx_strncmp(upstream_name->data, peer_shm->upstream_name->data,
-- upstream_name->len) == 0)) {
-+ if (ngx_memcmp(addr->sockaddr, peer_shm->sockaddr, addr->socklen) == 0
-+ && upstream_name->len == peer_shm->upstream_name->len
-+ && ngx_strncmp(upstream_name->data, peer_shm->upstream_name->data, upstream_name->len) == 0) {
- return peer_shm;
- }
- }