update nginx to 1.17.1

webcpp · Jun 29, 2019 · 3ed8bc8 · 3ed8bc8
1 parent c9b2a3c
commit 3ed8bc8
Show file tree

Hide file tree

Showing 172 changed files with 172 additions and 103 deletions.
diff --git a/3rd/nchan-1.2.5/src/nchan_version.h b/3rd/nchan-1.2.5/src/nchan_version.h
diff --git a/3rd/nchan-1.2.5/LICENCE → 3rd/nchan-1.2.6/LICENCE b/3rd/nchan-1.2.5/LICENCE → 3rd/nchan-1.2.6/LICENCE
diff --git a/3rd/nchan-1.2.5/NchanSubscriber.js → 3rd/nchan-1.2.6/NchanSubscriber.js b/3rd/nchan-1.2.5/NchanSubscriber.js → 3rd/nchan-1.2.6/NchanSubscriber.js
diff --git a/3rd/nchan-1.2.5/README.md → 3rd/nchan-1.2.6/README.md b/3rd/nchan-1.2.5/README.md → 3rd/nchan-1.2.6/README.md
@@ -22,7 +22,7 @@ In a web browser, you can use Websocket or EventSource natively, or the [NchanSu
 
 ## Status and History
 
-The latest Nchan release is 1.2.5 (March 20, 2019) ([changelog](https://nchan.io/changelog)).
+The latest Nchan release is 1.2.6 (June 18, 2019) ([changelog](https://nchan.io/changelog)).
 
 The first iteration of Nchan was written in 2009-2010 as the [Nginx HTTP Push Module](https://pushmodule.slact.net), and was vastly refactored into its present state in 2014-2016.
 
@@ -1264,10 +1264,10 @@ Additionally, `nchan_stub_status` data is also exposed as variables. These are a
 
 - **nchan_max_channel_id_length** `<number>`  
   arguments: 1  
-  default: `512`  
+  default: `1024`  
   context: http, server, location  
   legacy name: push_max_channel_id_length  
-  > Maximum permissible channel id length (number of characters). Longer ids will be truncated.    
+  > Maximum permissible channel id length (number of characters). This settings applies to ids before they may be split by the `nchan_channel_id_split_delimiter` Requests with a channel id that is too long will receive a `403 Forbidden` response.    
 
 - **nchan_max_channel_subscribers** `<number>`  
   arguments: 1  

diff --git a/3rd/nchan-1.2.5/changelog.txt → 3rd/nchan-1.2.6/changelog.txt b/3rd/nchan-1.2.5/changelog.txt → 3rd/nchan-1.2.6/changelog.txt
@@ -1,3 +1,12 @@
+1.2.6 (Jun. 18 2019)
+ fix: when using Redis, a channel can stop receiving new messages if 
+      they are published faster than they can be sent to subscribers and the 
+      message buffer is sufficiently small
+ fix: websocket PONG response did not contain PING frame data
+ fix: multiplexed channels may stop receiving messages
+ fix (security): specially crafted websocket publisher requests when using Redis
+      may result in use-after-free memory access
+ fix: Nginx config reload may result in crash when using Redis cluster
 1.2.5 (Mar. 20 2019)
  fix: using multiplexed channels with Redis in backup mode may result in worker crash
  fix: nchan_publisher_channel_id could not be set exclusively in a publisher location

diff --git a/3rd/nchan-1.2.5/cloc-exclude.txt → 3rd/nchan-1.2.6/cloc-exclude.txt b/3rd/nchan-1.2.5/cloc-exclude.txt → 3rd/nchan-1.2.6/cloc-exclude.txt
diff --git a/3rd/nchan-1.2.5/config → 3rd/nchan-1.2.6/config b/3rd/nchan-1.2.5/config → 3rd/nchan-1.2.6/config
diff --git a/3rd/nchan-1.2.5/nchan_logo.png → 3rd/nchan-1.2.6/nchan_logo.png b/3rd/nchan-1.2.5/nchan_logo.png → 3rd/nchan-1.2.6/nchan_logo.png
diff --git a/3rd/nchan-1.2.5/src/.gitignore → 3rd/nchan-1.2.6/src/.gitignore b/3rd/nchan-1.2.5/src/.gitignore → 3rd/nchan-1.2.6/src/.gitignore
diff --git a/3rd/nchan-1.2.5/src/nchan_commands.rb → 3rd/nchan-1.2.6/src/nchan_commands.rb b/3rd/nchan-1.2.5/src/nchan_commands.rb → 3rd/nchan-1.2.6/src/nchan_commands.rb
@@ -674,8 +674,8 @@
       group: "security",
       tags: ['publisher', 'subscriber', 'channel-id' ],
       value: "<number>",
-      default: 512,
-      info: "Maximum permissible channel id length (number of characters). Longer ids will be truncated."
+      default: 1024,
+      info: "Maximum permissible channel id length (number of characters). This settings applies to ids before they may be split by the `nchan_channel_id_split_delimiter` Requests with a channel id that is too long will receive a `403 Forbidden` response."
 
   nchan_max_channel_subscribers [:main, :srv, :loc],
       :ngx_conf_set_num_slot,

diff --git a/3rd/nchan-1.2.5/src/nchan_config_commands.c → 3rd/nchan-1.2.6/src/nchan_config_commands.c b/3rd/nchan-1.2.5/src/nchan_config_commands.c → 3rd/nchan-1.2.6/src/nchan_config_commands.c
diff --git a/3rd/nchan-1.2.5/src/nchan_defs.c → 3rd/nchan-1.2.6/src/nchan_defs.c b/3rd/nchan-1.2.5/src/nchan_defs.c → 3rd/nchan-1.2.6/src/nchan_defs.c
diff --git a/3rd/nchan-1.2.5/src/nchan_defs.h → 3rd/nchan-1.2.6/src/nchan_defs.h b/3rd/nchan-1.2.5/src/nchan_defs.h → 3rd/nchan-1.2.6/src/nchan_defs.h
diff --git a/3rd/nchan-1.2.5/src/nchan_module.c → 3rd/nchan-1.2.6/src/nchan_module.c b/3rd/nchan-1.2.5/src/nchan_module.c → 3rd/nchan-1.2.6/src/nchan_module.c
diff --git a/3rd/nchan-1.2.5/src/nchan_module.h → 3rd/nchan-1.2.6/src/nchan_module.h b/3rd/nchan-1.2.5/src/nchan_module.h → 3rd/nchan-1.2.6/src/nchan_module.h
diff --git a/3rd/nchan-1.2.5/src/nchan_setup.c → 3rd/nchan-1.2.6/src/nchan_setup.c b/3rd/nchan-1.2.5/src/nchan_setup.c → 3rd/nchan-1.2.6/src/nchan_setup.c
diff --git a/3rd/nchan-1.2.5/src/nchan_types.h → 3rd/nchan-1.2.6/src/nchan_types.h b/3rd/nchan-1.2.5/src/nchan_types.h → 3rd/nchan-1.2.6/src/nchan_types.h
diff --git a/3rd/nchan-1.2.5/src/nchan_variables.c → 3rd/nchan-1.2.6/src/nchan_variables.c b/3rd/nchan-1.2.5/src/nchan_variables.c → 3rd/nchan-1.2.6/src/nchan_variables.c
diff --git a/3rd/nchan-1.2.5/src/nchan_variables.h → 3rd/nchan-1.2.6/src/nchan_variables.h b/3rd/nchan-1.2.5/src/nchan_variables.h → 3rd/nchan-1.2.6/src/nchan_variables.h
diff --git a/3rd/nchan-1.2.6/src/nchan_version.h b/3rd/nchan-1.2.6/src/nchan_version.h
@@ -0,0 +1 @@
+#define NCHAN_VERSION "1.2.6"
diff --git a/...han-1.2.5/src/nchan_websocket_publisher.c → ...han-1.2.6/src/nchan_websocket_publisher.c b/...han-1.2.5/src/nchan_websocket_publisher.c → ...han-1.2.6/src/nchan_websocket_publisher.c
diff --git a/...han-1.2.5/src/nchan_websocket_publisher.h → ...han-1.2.6/src/nchan_websocket_publisher.h b/...han-1.2.5/src/nchan_websocket_publisher.h → ...han-1.2.6/src/nchan_websocket_publisher.h
diff --git a/3rd/nchan-1.2.5/src/store/memory/groups.c → 3rd/nchan-1.2.6/src/store/memory/groups.c b/3rd/nchan-1.2.5/src/store/memory/groups.c → 3rd/nchan-1.2.6/src/store/memory/groups.c
diff --git a/3rd/nchan-1.2.5/src/store/memory/groups.h → 3rd/nchan-1.2.6/src/store/memory/groups.h b/3rd/nchan-1.2.5/src/store/memory/groups.h → 3rd/nchan-1.2.6/src/store/memory/groups.h
diff --git a/...han-1.2.5/src/store/memory/ipc-handlers.c → ...han-1.2.6/src/store/memory/ipc-handlers.c b/...han-1.2.5/src/store/memory/ipc-handlers.c → ...han-1.2.6/src/store/memory/ipc-handlers.c
diff --git a/...han-1.2.5/src/store/memory/ipc-handlers.h → ...han-1.2.6/src/store/memory/ipc-handlers.h b/...han-1.2.5/src/store/memory/ipc-handlers.h → ...han-1.2.6/src/store/memory/ipc-handlers.h
diff --git a/3rd/nchan-1.2.5/src/store/memory/ipc.c → 3rd/nchan-1.2.6/src/store/memory/ipc.c b/3rd/nchan-1.2.5/src/store/memory/ipc.c → 3rd/nchan-1.2.6/src/store/memory/ipc.c
diff --git a/3rd/nchan-1.2.5/src/store/memory/ipc.h → 3rd/nchan-1.2.6/src/store/memory/ipc.h b/3rd/nchan-1.2.5/src/store/memory/ipc.h → 3rd/nchan-1.2.6/src/store/memory/ipc.h
diff --git a/3rd/nchan-1.2.5/src/store/memory/memstore.c → 3rd/nchan-1.2.6/src/store/memory/memstore.c b/3rd/nchan-1.2.5/src/store/memory/memstore.c → 3rd/nchan-1.2.6/src/store/memory/memstore.c
@@ -1069,7 +1069,7 @@ static memstore_channel_head_t *chanhead_memstore_create(ngx_str_t *channel_id,
 #endif
   head->multi=NULL;
   head->multi_count = 0;
-  head->multi_waiting = 0;
+  head->multi_subscribers_pending = 0;
 
   //set channel
   ngx_memcpy(&head->channel.id, &head->id, sizeof(ngx_str_t));
@@ -1088,7 +1088,6 @@ static memstore_channel_head_t *chanhead_memstore_create(ngx_str_t *channel_id,
 
   head->spooler.running=0;
 
-  head->multi_waiting = 0;
   if((n = parse_multi_id(&head->id, ids)) > 0) {
     memstore_multi_t          *multi;
     int16_t                   *tags_latest, *tags_oldest;
@@ -1127,11 +1126,13 @@ static memstore_channel_head_t *chanhead_memstore_create(ngx_str_t *channel_id,
     }
 
     head->multi_count = n;
+    head->multi_subscribers_pending = n;
     head->multi = multi;
     head->owner = head->slot; //multis are always self-owned
   }
   else {
     head->multi_count = 0;
+    head->multi_subscribers_pending = n;
 
     head->latest_msgid.time = 0;
     head->latest_msgid.tag.fixed[0] = 0;

diff --git a/3rd/nchan-1.2.5/src/store/memory/recycloc.c → 3rd/nchan-1.2.6/src/store/memory/recycloc.c b/3rd/nchan-1.2.5/src/store/memory/recycloc.c → 3rd/nchan-1.2.6/src/store/memory/recycloc.c
diff --git a/...an-1.2.5/src/store/memory/store-private.h → ...an-1.2.6/src/store/memory/store-private.h b/...an-1.2.5/src/store/memory/store-private.h → ...an-1.2.6/src/store/memory/store-private.h
@@ -57,7 +57,7 @@ struct memstore_channel_head_s {
   uint16_t                        reserved;
 #endif
 
-  uint8_t                         multi_waiting;
+  uint8_t                         multi_subscribers_pending;
   uint8_t                         multi_count;
   memstore_multi_t               *multi;
 

diff --git a/3rd/nchan-1.2.5/src/store/memory/store.h → 3rd/nchan-1.2.6/src/store/memory/store.h b/3rd/nchan-1.2.5/src/store/memory/store.h → 3rd/nchan-1.2.6/src/store/memory/store.h
diff --git a/3rd/nchan-1.2.5/src/store/ngx_rwlock.c → 3rd/nchan-1.2.6/src/store/ngx_rwlock.c b/3rd/nchan-1.2.5/src/store/ngx_rwlock.c → 3rd/nchan-1.2.6/src/store/ngx_rwlock.c
diff --git a/3rd/nchan-1.2.5/src/store/ngx_rwlock.h → 3rd/nchan-1.2.6/src/store/ngx_rwlock.h b/3rd/nchan-1.2.5/src/store/ngx_rwlock.h → 3rd/nchan-1.2.6/src/store/ngx_rwlock.h
diff --git a/3rd/nchan-1.2.5/src/store/redis/cmp.c → 3rd/nchan-1.2.6/src/store/redis/cmp.c b/3rd/nchan-1.2.5/src/store/redis/cmp.c → 3rd/nchan-1.2.6/src/store/redis/cmp.c
diff --git a/3rd/nchan-1.2.5/src/store/redis/cmp.h → 3rd/nchan-1.2.6/src/store/redis/cmp.h b/3rd/nchan-1.2.5/src/store/redis/cmp.h → 3rd/nchan-1.2.6/src/store/redis/cmp.h
diff --git a/...-1.2.5/src/store/redis/hiredis/.gitignore → ...-1.2.6/src/store/redis/hiredis/.gitignore b/...-1.2.5/src/store/redis/hiredis/.gitignore → ...-1.2.6/src/store/redis/hiredis/.gitignore
diff --git a/...1.2.5/src/store/redis/hiredis/.travis.yml → ...1.2.6/src/store/redis/hiredis/.travis.yml b/...1.2.5/src/store/redis/hiredis/.travis.yml → ...1.2.6/src/store/redis/hiredis/.travis.yml
diff --git a/....2.5/src/store/redis/hiredis/CHANGELOG.md → ....2.6/src/store/redis/hiredis/CHANGELOG.md b/....2.5/src/store/redis/hiredis/CHANGELOG.md → ....2.6/src/store/redis/hiredis/CHANGELOG.md
diff --git a/...han-1.2.5/src/store/redis/hiredis/COPYING → ...han-1.2.6/src/store/redis/hiredis/COPYING b/...han-1.2.5/src/store/redis/hiredis/COPYING → ...han-1.2.6/src/store/redis/hiredis/COPYING
diff --git a/...an-1.2.5/src/store/redis/hiredis/Makefile → ...an-1.2.6/src/store/redis/hiredis/Makefile b/...an-1.2.5/src/store/redis/hiredis/Makefile → ...an-1.2.6/src/store/redis/hiredis/Makefile
diff --git a/...n-1.2.5/src/store/redis/hiredis/README.md → ...n-1.2.6/src/store/redis/hiredis/README.md b/...n-1.2.5/src/store/redis/hiredis/README.md → ...n-1.2.6/src/store/redis/hiredis/README.md
diff --git a/...2.5/src/store/redis/hiredis/adapters/ae.h → ...2.6/src/store/redis/hiredis/adapters/ae.h b/...2.5/src/store/redis/hiredis/adapters/ae.h → ...2.6/src/store/redis/hiredis/adapters/ae.h
diff --git a/.../src/store/redis/hiredis/adapters/libev.h → .../src/store/redis/hiredis/adapters/libev.h b/.../src/store/redis/hiredis/adapters/libev.h → .../src/store/redis/hiredis/adapters/libev.h
diff --git a/...c/store/redis/hiredis/adapters/libevent.h → ...c/store/redis/hiredis/adapters/libevent.h b/...c/store/redis/hiredis/adapters/libevent.h → ...c/store/redis/hiredis/adapters/libevent.h
diff --git a/.../src/store/redis/hiredis/adapters/libuv.h → .../src/store/redis/hiredis/adapters/libuv.h b/.../src/store/redis/hiredis/adapters/libuv.h → .../src/store/redis/hiredis/adapters/libuv.h
diff --git a/...han-1.2.5/src/store/redis/hiredis/async.c → ...han-1.2.6/src/store/redis/hiredis/async.c b/...han-1.2.5/src/store/redis/hiredis/async.c → ...han-1.2.6/src/store/redis/hiredis/async.c
diff --git a/...han-1.2.5/src/store/redis/hiredis/async.h → ...han-1.2.6/src/store/redis/hiredis/async.h b/...han-1.2.5/src/store/redis/hiredis/async.h → ...han-1.2.6/src/store/redis/hiredis/async.h
diff --git a/...chan-1.2.5/src/store/redis/hiredis/dict.c → ...chan-1.2.6/src/store/redis/hiredis/dict.c b/...chan-1.2.5/src/store/redis/hiredis/dict.c → ...chan-1.2.6/src/store/redis/hiredis/dict.c
diff --git a/...chan-1.2.5/src/store/redis/hiredis/dict.h → ...chan-1.2.6/src/store/redis/hiredis/dict.h b/...chan-1.2.5/src/store/redis/hiredis/dict.h → ...chan-1.2.6/src/store/redis/hiredis/dict.h
diff --git a/...store/redis/hiredis/examples/example-ae.c → ...store/redis/hiredis/examples/example-ae.c b/...store/redis/hiredis/examples/example-ae.c → ...store/redis/hiredis/examples/example-ae.c
diff --git a/...re/redis/hiredis/examples/example-libev.c → ...re/redis/hiredis/examples/example-libev.c b/...re/redis/hiredis/examples/example-libev.c → ...re/redis/hiredis/examples/example-libev.c
diff --git a/...redis/hiredis/examples/example-libevent.c → ...redis/hiredis/examples/example-libevent.c b/...redis/hiredis/examples/example-libevent.c → ...redis/hiredis/examples/example-libevent.c
diff --git a/...re/redis/hiredis/examples/example-libuv.c → ...re/redis/hiredis/examples/example-libuv.c b/...re/redis/hiredis/examples/example-libuv.c → ...re/redis/hiredis/examples/example-libuv.c
diff --git a/...rc/store/redis/hiredis/examples/example.c → ...rc/store/redis/hiredis/examples/example.c b/...rc/store/redis/hiredis/examples/example.c → ...rc/store/redis/hiredis/examples/example.c
diff --git a/...n-1.2.5/src/store/redis/hiredis/fmacros.h → ...n-1.2.6/src/store/redis/hiredis/fmacros.h b/...n-1.2.5/src/store/redis/hiredis/fmacros.h → ...n-1.2.6/src/store/redis/hiredis/fmacros.h
diff --git a/...n-1.2.5/src/store/redis/hiredis/hiredis.c → ...n-1.2.6/src/store/redis/hiredis/hiredis.c b/...n-1.2.5/src/store/redis/hiredis/hiredis.c → ...n-1.2.6/src/store/redis/hiredis/hiredis.c
diff --git a/...n-1.2.5/src/store/redis/hiredis/hiredis.h → ...n-1.2.6/src/store/redis/hiredis/hiredis.h b/...n-1.2.5/src/store/redis/hiredis/hiredis.h → ...n-1.2.6/src/store/redis/hiredis/hiredis.h
diff --git a/...nchan-1.2.5/src/store/redis/hiredis/net.c → ...nchan-1.2.6/src/store/redis/hiredis/net.c b/...nchan-1.2.5/src/store/redis/hiredis/net.c → ...nchan-1.2.6/src/store/redis/hiredis/net.c
diff --git a/...nchan-1.2.5/src/store/redis/hiredis/net.h → ...nchan-1.2.6/src/store/redis/hiredis/net.h b/...nchan-1.2.5/src/store/redis/hiredis/net.h → ...nchan-1.2.6/src/store/redis/hiredis/net.h
diff --git a/...chan-1.2.5/src/store/redis/hiredis/read.c → ...chan-1.2.6/src/store/redis/hiredis/read.c b/...chan-1.2.5/src/store/redis/hiredis/read.c → ...chan-1.2.6/src/store/redis/hiredis/read.c
diff --git a/...chan-1.2.5/src/store/redis/hiredis/read.h → ...chan-1.2.6/src/store/redis/hiredis/read.h b/...chan-1.2.5/src/store/redis/hiredis/read.h → ...chan-1.2.6/src/store/redis/hiredis/read.h
diff --git a/...nchan-1.2.5/src/store/redis/hiredis/sds.c → ...nchan-1.2.6/src/store/redis/hiredis/sds.c b/...nchan-1.2.5/src/store/redis/hiredis/sds.c → ...nchan-1.2.6/src/store/redis/hiredis/sds.c
diff --git a/...nchan-1.2.5/src/store/redis/hiredis/sds.h → ...nchan-1.2.6/src/store/redis/hiredis/sds.h b/...nchan-1.2.5/src/store/redis/hiredis/sds.h → ...nchan-1.2.6/src/store/redis/hiredis/sds.h
diff --git a/...chan-1.2.5/src/store/redis/hiredis/test.c → ...chan-1.2.6/src/store/redis/hiredis/test.c b/...chan-1.2.5/src/store/redis/hiredis/test.c → ...chan-1.2.6/src/store/redis/hiredis/test.c
diff --git a/...han-1.2.5/src/store/redis/hiredis/win32.h → ...han-1.2.6/src/store/redis/hiredis/win32.h b/...han-1.2.5/src/store/redis/hiredis/win32.h → ...han-1.2.6/src/store/redis/hiredis/win32.h
diff --git a/3rd/nchan-1.2.5/src/store/redis/rdsstore.c → 3rd/nchan-1.2.6/src/store/redis/rdsstore.c b/3rd/nchan-1.2.5/src/store/redis/rdsstore.c → 3rd/nchan-1.2.6/src/store/redis/rdsstore.c
@@ -1977,6 +1977,7 @@ static void nchan_store_create_main_conf(ngx_conf_t *cf, nchan_main_conf_t *mcf)
 
   //reset redis_conf_head for reloads
   redis_conf_head = NULL;
+  nodeset_destroy_all(); //reset all nodesets before loading config
 }
 
 void redis_store_prepare_to_exit_worker() {
@@ -2021,7 +2022,6 @@ static void nchan_store_exit_worker(ngx_cycle_t *cycle) {
 
   //OLD
   //rbtree_walk(&redis_data_tree, (rbtree_walk_callback_pt )redis_data_tree_exiter_stage2, &chanheads);
-
   nodeset_destroy_all();
 
   //OLD

diff --git a/.../store/redis/redis-lua-scripts/.gitignore → .../store/redis/redis-lua-scripts/.gitignore b/.../store/redis/redis-lua-scripts/.gitignore → .../store/redis/redis-lua-scripts/.gitignore
diff --git a/...src/store/redis/redis-lua-scripts/Gemfile → ...src/store/redis/redis-lua-scripts/Gemfile b/...src/store/redis/redis-lua-scripts/Gemfile → ...src/store/redis/redis-lua-scripts/Gemfile
diff --git a/...e/redis/redis-lua-scripts/add_fakesub.lua → ...e/redis/redis-lua-scripts/add_fakesub.lua b/...e/redis/redis-lua-scripts/add_fakesub.lua → ...e/redis/redis-lua-scripts/add_fakesub.lua
diff --git a/...s/redis-lua-scripts/channel_keepalive.lua → ...s/redis-lua-scripts/channel_keepalive.lua b/...s/redis-lua-scripts/channel_keepalive.lua → ...s/redis-lua-scripts/channel_keepalive.lua
diff --git a/.../store/redis/redis-lua-scripts/delete.lua → .../store/redis/redis-lua-scripts/delete.lua b/.../store/redis/redis-lua-scripts/delete.lua → .../store/redis/redis-lua-scripts/delete.lua
diff --git a/.../redis/redis-lua-scripts/find_channel.lua → .../redis/redis-lua-scripts/find_channel.lua b/.../redis/redis-lua-scripts/find_channel.lua → .../redis/redis-lua-scripts/find_channel.lua
diff --git a/...e/redis/redis-lua-scripts/get_message.lua → ...e/redis/redis-lua-scripts/get_message.lua b/...e/redis/redis-lua-scripts/get_message.lua → ...e/redis/redis-lua-scripts/get_message.lua
diff --git a/...edis-lua-scripts/get_message_from_key.lua → ...edis-lua-scripts/get_message_from_key.lua b/...edis-lua-scripts/get_message_from_key.lua → ...edis-lua-scripts/get_message_from_key.lua
diff --git a/...store/redis/redis-lua-scripts/publish.lua → ...store/redis/redis-lua-scripts/publish.lua b/...store/redis/redis-lua-scripts/publish.lua → ...store/redis/redis-lua-scripts/publish.lua
diff --git a/...edis/redis-lua-scripts/publish_status.lua → ...edis/redis-lua-scripts/publish_status.lua b/...edis/redis-lua-scripts/publish_status.lua → ...edis/redis-lua-scripts/publish_status.lua
diff --git a/...rc/store/redis/redis-lua-scripts/rsck.lua → ...rc/store/redis/redis-lua-scripts/rsck.lua b/...rc/store/redis/redis-lua-scripts/rsck.lua → ...rc/store/redis/redis-lua-scripts/rsck.lua
diff --git a/...redis-lua-scripts/subscriber_register.lua → ...redis-lua-scripts/subscriber_register.lua b/...redis-lua-scripts/subscriber_register.lua → ...redis-lua-scripts/subscriber_register.lua
diff --git a/...dis-lua-scripts/subscriber_unregister.lua → ...dis-lua-scripts/subscriber_unregister.lua b/...dis-lua-scripts/subscriber_unregister.lua → ...dis-lua-scripts/subscriber_unregister.lua
diff --git a/...re/redis/redis-lua-scripts/testscripts.rb → ...re/redis/redis-lua-scripts/testscripts.rb b/...re/redis/redis-lua-scripts/testscripts.rb → ...re/redis/redis-lua-scripts/testscripts.rb
diff --git a/....2.5/src/store/redis/redis_lua_commands.c → ....2.6/src/store/redis/redis_lua_commands.c b/....2.5/src/store/redis/redis_lua_commands.c → ....2.6/src/store/redis/redis_lua_commands.c
diff --git a/....2.5/src/store/redis/redis_lua_commands.h → ....2.6/src/store/redis/redis_lua_commands.h b/....2.5/src/store/redis/redis_lua_commands.h → ....2.6/src/store/redis/redis_lua_commands.h
diff --git a/...2.5/src/store/redis/redis_nginx_adapter.c → ...2.6/src/store/redis/redis_nginx_adapter.c b/...2.5/src/store/redis/redis_nginx_adapter.c → ...2.6/src/store/redis/redis_nginx_adapter.c
diff --git a/...2.5/src/store/redis/redis_nginx_adapter.h → ...2.6/src/store/redis/redis_nginx_adapter.h b/...2.5/src/store/redis/redis_nginx_adapter.h → ...2.6/src/store/redis/redis_nginx_adapter.h
diff --git a/...han-1.2.5/src/store/redis/redis_nodeset.c → ...han-1.2.6/src/store/redis/redis_nodeset.c b/...han-1.2.5/src/store/redis/redis_nodeset.c → ...han-1.2.6/src/store/redis/redis_nodeset.c
@@ -881,7 +881,6 @@ void node_set_role(redis_node_t *node, redis_node_role_t role) {
         node->peers.master = NULL;
       }
       for(cur = nchan_list_first(&node->peers.slaves); cur != NULL; cur = nchan_list_next(cur)) {
-        assert((*cur)->peers.master == node);
         node_remove_peer(*cur, node);
       }
       nchan_list_empty(&node->peers.slaves);

diff --git a/...han-1.2.5/src/store/redis/redis_nodeset.h → ...han-1.2.6/src/store/redis/redis_nodeset.h b/...han-1.2.5/src/store/redis/redis_nodeset.h → ...han-1.2.6/src/store/redis/redis_nodeset.h
diff --git a/....5/src/store/redis/redis_nodeset_parser.c → ....6/src/store/redis/redis_nodeset_parser.c b/....5/src/store/redis/redis_nodeset_parser.c → ....6/src/store/redis/redis_nodeset_parser.c
diff --git a/....5/src/store/redis/redis_nodeset_parser.h → ....6/src/store/redis/redis_nodeset_parser.h b/....5/src/store/redis/redis_nodeset_parser.h → ....6/src/store/redis/redis_nodeset_parser.h
diff --git a/...han-1.2.5/src/store/redis/store-private.h → ...han-1.2.6/src/store/redis/store-private.h b/...han-1.2.5/src/store/redis/store-private.h → ...han-1.2.6/src/store/redis/store-private.h
diff --git a/3rd/nchan-1.2.5/src/store/redis/store.h → 3rd/nchan-1.2.6/src/store/redis/store.h b/3rd/nchan-1.2.5/src/store/redis/store.h → 3rd/nchan-1.2.6/src/store/redis/store.h
diff --git a/3rd/nchan-1.2.5/src/store/spool.c → 3rd/nchan-1.2.6/src/store/spool.c b/3rd/nchan-1.2.5/src/store/spool.c → 3rd/nchan-1.2.6/src/store/spool.c
@@ -388,6 +388,7 @@ static ngx_int_t spool_fetch_msg_callback(ngx_int_t code, nchan_msg_t *msg, fetc
         if(spool->reserved == 0) {
           destroy_spool(spool);
         }
+        spool_fetch_msg(nuspool);
       }
       else if(spool->id.tagcount == 1 && nchan_compare_msgids(&spool->id, &oldest_msg_id) == 0) {
         // oldest msgid not found or expired. that means there are no messages in this channel, 

diff --git a/3rd/nchan-1.2.5/src/store/spool.h → 3rd/nchan-1.2.6/src/store/spool.h b/3rd/nchan-1.2.5/src/store/spool.h → 3rd/nchan-1.2.6/src/store/spool.h
diff --git a/3rd/nchan-1.2.5/src/store/store_common.c → 3rd/nchan-1.2.6/src/store/store_common.c b/3rd/nchan-1.2.5/src/store/store_common.c → 3rd/nchan-1.2.6/src/store/store_common.c
diff --git a/3rd/nchan-1.2.5/src/store/store_common.h → 3rd/nchan-1.2.6/src/store/store_common.h b/3rd/nchan-1.2.5/src/store/store_common.h → 3rd/nchan-1.2.6/src/store/store_common.h
diff --git a/3rd/nchan-1.2.5/src/subscribers/benchmark.c → 3rd/nchan-1.2.6/src/subscribers/benchmark.c b/3rd/nchan-1.2.5/src/subscribers/benchmark.c → 3rd/nchan-1.2.6/src/subscribers/benchmark.c
diff --git a/3rd/nchan-1.2.5/src/subscribers/benchmark.h → 3rd/nchan-1.2.6/src/subscribers/benchmark.h b/3rd/nchan-1.2.5/src/subscribers/benchmark.h → 3rd/nchan-1.2.6/src/subscribers/benchmark.h
diff --git a/3rd/nchan-1.2.5/src/subscribers/common.c → 3rd/nchan-1.2.6/src/subscribers/common.c b/3rd/nchan-1.2.5/src/subscribers/common.c → 3rd/nchan-1.2.6/src/subscribers/common.c
diff --git a/3rd/nchan-1.2.5/src/subscribers/common.h → 3rd/nchan-1.2.6/src/subscribers/common.h b/3rd/nchan-1.2.5/src/subscribers/common.h → 3rd/nchan-1.2.6/src/subscribers/common.h
diff --git a/...nchan-1.2.5/src/subscribers/eventsource.c → ...nchan-1.2.6/src/subscribers/eventsource.c b/...nchan-1.2.5/src/subscribers/eventsource.c → ...nchan-1.2.6/src/subscribers/eventsource.c
diff --git a/...nchan-1.2.5/src/subscribers/eventsource.h → ...nchan-1.2.6/src/subscribers/eventsource.h b/...nchan-1.2.5/src/subscribers/eventsource.h → ...nchan-1.2.6/src/subscribers/eventsource.h
diff --git a/...chan-1.2.5/src/subscribers/getmsg_proxy.c → ...chan-1.2.6/src/subscribers/getmsg_proxy.c b/...chan-1.2.5/src/subscribers/getmsg_proxy.c → ...chan-1.2.6/src/subscribers/getmsg_proxy.c
diff --git a/...chan-1.2.5/src/subscribers/getmsg_proxy.h → ...chan-1.2.6/src/subscribers/getmsg_proxy.h b/...chan-1.2.5/src/subscribers/getmsg_proxy.h → ...chan-1.2.6/src/subscribers/getmsg_proxy.h
diff --git a/...chan-1.2.5/src/subscribers/http-chunked.c → ...chan-1.2.6/src/subscribers/http-chunked.c b/...chan-1.2.5/src/subscribers/http-chunked.c → ...chan-1.2.6/src/subscribers/http-chunked.c
diff --git a/...chan-1.2.5/src/subscribers/http-chunked.h → ...chan-1.2.6/src/subscribers/http-chunked.h b/...chan-1.2.5/src/subscribers/http-chunked.h → ...chan-1.2.6/src/subscribers/http-chunked.h
diff --git a/....5/src/subscribers/http-multipart-mixed.c → ....6/src/subscribers/http-multipart-mixed.c b/....5/src/subscribers/http-multipart-mixed.c → ....6/src/subscribers/http-multipart-mixed.c
diff --git a/....5/src/subscribers/http-multipart-mixed.h → ....6/src/subscribers/http-multipart-mixed.h b/....5/src/subscribers/http-multipart-mixed.h → ....6/src/subscribers/http-multipart-mixed.h
diff --git a/...n-1.2.5/src/subscribers/http-raw-stream.c → ...n-1.2.6/src/subscribers/http-raw-stream.c b/...n-1.2.5/src/subscribers/http-raw-stream.c → ...n-1.2.6/src/subscribers/http-raw-stream.c
diff --git a/...n-1.2.5/src/subscribers/http-raw-stream.h → ...n-1.2.6/src/subscribers/http-raw-stream.h b/...n-1.2.5/src/subscribers/http-raw-stream.h → ...n-1.2.6/src/subscribers/http-raw-stream.h
diff --git a/3rd/nchan-1.2.5/src/subscribers/internal.c → 3rd/nchan-1.2.6/src/subscribers/internal.c b/3rd/nchan-1.2.5/src/subscribers/internal.c → 3rd/nchan-1.2.6/src/subscribers/internal.c
diff --git a/3rd/nchan-1.2.5/src/subscribers/internal.h → 3rd/nchan-1.2.6/src/subscribers/internal.h b/3rd/nchan-1.2.5/src/subscribers/internal.h → 3rd/nchan-1.2.6/src/subscribers/internal.h
diff --git a/...chan-1.2.5/src/subscribers/intervalpoll.c → ...chan-1.2.6/src/subscribers/intervalpoll.c b/...chan-1.2.5/src/subscribers/intervalpoll.c → ...chan-1.2.6/src/subscribers/intervalpoll.c
diff --git a/...chan-1.2.5/src/subscribers/intervalpoll.h → ...chan-1.2.6/src/subscribers/intervalpoll.h b/...chan-1.2.5/src/subscribers/intervalpoll.h → ...chan-1.2.6/src/subscribers/intervalpoll.h
diff --git a/...-1.2.5/src/subscribers/longpoll-private.h → ...-1.2.6/src/subscribers/longpoll-private.h b/...-1.2.5/src/subscribers/longpoll-private.h → ...-1.2.6/src/subscribers/longpoll-private.h
diff --git a/3rd/nchan-1.2.5/src/subscribers/longpoll.c → 3rd/nchan-1.2.6/src/subscribers/longpoll.c b/3rd/nchan-1.2.5/src/subscribers/longpoll.c → 3rd/nchan-1.2.6/src/subscribers/longpoll.c
diff --git a/3rd/nchan-1.2.5/src/subscribers/longpoll.h → 3rd/nchan-1.2.6/src/subscribers/longpoll.h b/3rd/nchan-1.2.5/src/subscribers/longpoll.h → 3rd/nchan-1.2.6/src/subscribers/longpoll.h
diff --git a/...chan-1.2.5/src/subscribers/memstore_ipc.c → ...chan-1.2.6/src/subscribers/memstore_ipc.c b/...chan-1.2.5/src/subscribers/memstore_ipc.c → ...chan-1.2.6/src/subscribers/memstore_ipc.c
diff --git a/...chan-1.2.5/src/subscribers/memstore_ipc.h → ...chan-1.2.6/src/subscribers/memstore_ipc.h b/...chan-1.2.5/src/subscribers/memstore_ipc.h → ...chan-1.2.6/src/subscribers/memstore_ipc.h
diff --git a/...an-1.2.5/src/subscribers/memstore_multi.c → ...an-1.2.6/src/subscribers/memstore_multi.c b/...an-1.2.5/src/subscribers/memstore_multi.c → ...an-1.2.6/src/subscribers/memstore_multi.c
@@ -44,9 +44,9 @@ static void change_sub_count(memstore_channel_head_t *ch, ngx_int_t n) {
 
 static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
   DBG("%p enqueued (%p %V %i) %V", d->multi->sub, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
-  assert(d->multi_chanhead->multi_waiting > 0);
-  d->multi_chanhead->multi_waiting --;
-  if(d->multi_chanhead->multi_waiting == 0) {
+  assert(d->multi_chanhead->multi_subscribers_pending > 0);
+  d->multi_chanhead->multi_subscribers_pending --;
+  if(d->multi_chanhead->multi_subscribers_pending == 0) {
     memstore_ready_chanhead_unless_stub(d->multi_chanhead);
   }
 
@@ -56,7 +56,7 @@ static ngx_int_t sub_enqueue(ngx_int_t status, void *ptr, sub_data_t *d) {
 static ngx_int_t sub_dequeue(ngx_int_t status, void *ptr, sub_data_t* d) {
   DBG("%p dequeued (%p %V %i) %V", d->multi->sub, d->multi_chanhead, &d->multi_chanhead->id, d->n, &d->multi->id);
   d->multi_chanhead->status = WAITING;
-  d->multi_chanhead->multi_waiting++;
+  d->multi_chanhead->multi_subscribers_pending++;
   d->multi->sub = NULL;
 
   return NGX_OK;
@@ -152,18 +152,19 @@ subscriber_t *memstore_multi_subscriber_create(memstore_channel_head_t *chanhead
   sub->destroy_after_dequeue = 1;
   sub->dequeue_after_response = 0;
 
+  //DBG("create multi sub for %V (n=%i) pending=%i", &chanhead->multi[n].id, n, chanhead->multi_subscribers_pending);
   d->multi = &chanhead->multi[n];
   d->multi->sub = sub;
   d->multi_chanhead = chanhead;
   d->n = n;
-  chanhead->multi_waiting++;  
+  d->target_chanhead = target_ch;
+
+  assert(chanhead->multi_subscribers_pending > 0);
 
   target_ch->spooler.fn->add(&target_ch->spooler, sub);
 
   multi_subs = chanhead->shared->sub_count;
-
-  d->target_chanhead = target_ch;
-
+
   change_sub_count(target_ch, multi_subs);
 
   DBG("%p created with privdata %p", d->multi->sub, d);

diff --git a/...an-1.2.5/src/subscribers/memstore_multi.h → ...an-1.2.6/src/subscribers/memstore_multi.h b/...an-1.2.5/src/subscribers/memstore_multi.h → ...an-1.2.6/src/subscribers/memstore_multi.h
diff --git a/...an-1.2.5/src/subscribers/memstore_redis.c → ...an-1.2.6/src/subscribers/memstore_redis.c b/...an-1.2.5/src/subscribers/memstore_redis.c → ...an-1.2.6/src/subscribers/memstore_redis.c
diff --git a/...an-1.2.5/src/subscribers/memstore_redis.h → ...an-1.2.6/src/subscribers/memstore_redis.h b/...an-1.2.5/src/subscribers/memstore_redis.h → ...an-1.2.6/src/subscribers/memstore_redis.h
diff --git a/3rd/nchan-1.2.5/src/subscribers/websocket.c → 3rd/nchan-1.2.6/src/subscribers/websocket.c b/3rd/nchan-1.2.5/src/subscribers/websocket.c → 3rd/nchan-1.2.6/src/subscribers/websocket.c
@@ -472,7 +472,7 @@ static ngx_int_t websocket_publish_callback(ngx_int_t status, nchan_channel_t *c
   }
   d = NULL;
 
-  if(websocket_release(&fsub->sub, 0) == NGX_ABORT) {
+  if(websocket_release(&fsub->sub, 0) == NGX_ABORT || fsub->sub.status == DEAD) {
     //zombie publisher
     //nothing more to do, we're finished here
     return NGX_OK;
@@ -839,10 +839,6 @@ ngx_int_t websocket_subscriber_destroy(subscriber_t *sub) {
 
     websocket_delete_timers(fsub);
     nchan_free_msg_id(&sub->last_msgid);
-    //debug 
-    if(fsub->cln) {
-      fsub->cln->data = NULL;
-    }
     //ngx_memset(fsub, 0x13, sizeof(*fsub));
     ws_destroy_msgpool(fsub);
     if(fsub->deflate.zstream_in) {
@@ -1155,9 +1151,9 @@ static ngx_int_t websocket_reserve(subscriber_t *self) {
 }
 static ngx_int_t websocket_release(subscriber_t *self, uint8_t nodestroy) {
   full_subscriber_t  *fsub = (full_subscriber_t  *)self;
+  //DBG("%p release for req %p, reservations: %i", self, fsub->sub.request, self->reserved);
   assert(self->reserved > 0);
   self->reserved--;
-  //DBG("%p release for req %p, reservations: %i", self, fsub->sub.request, self->reserved);
   if(nodestroy == 0 && fsub->awaiting_destruction == 1 && self->reserved == 0) {
     websocket_subscriber_destroy(self);
     return NGX_ABORT;
@@ -1305,8 +1301,6 @@ static void websocket_reading(ngx_http_request_t *r) {
   ngx_connection_t           *c;
   ngx_buf_t                  *msgbuf, buf;
   //ngx_str_t                 msg_in_str;
-  int                         close_code;
-  ngx_str_t                   close_reason;
 
   c = r->connection;
   rev = c->read;
@@ -1389,66 +1383,75 @@ static void websocket_reading(ngx_http_request_t *r) {
           case WEBSOCKET_OPCODE_PING:
           case WEBSOCKET_OPCODE_PONG:
           case WEBSOCKET_OPCODE_CLOSE:
-            if (frame->payload_len == 0) {
-              frame->payload = NULL;
-            }
-            else if(frame->payload_len < 1024) {
-              u_char payloadbuf[1024];
-              frame->payload = payloadbuf;
-              frame->last = frame->payload;
-              set_buffer(&buf, frame->payload, frame->last, frame->payload_len);
-              if ((rc = ws_recv(c, rev, &buf, frame->payload_len)) != NGX_OK) {
-                ERR("ws_recv NOT OK when receiving payload");
-                goto exit;
-              }
-              if (frame->mask) {
-                websocket_unmask_frame(frame);
-              }
-            }
-            else {
-              //ERROR: frame too big
-              websocket_send_close_frame(fsub, CLOSE_MESSAGE_TOO_BIG, NULL);
-              return websocket_reading_finalize(r);
-            }
-
-            switch(frame->opcode) {
-              case WEBSOCKET_OPCODE_PING:
-                DBG("%p got pinged", fsub);
-                websocket_send_frame(fsub, WEBSOCKET_PONG_LAST_FRAME_BYTE, 0, NULL);
-                break;
-
-              case WEBSOCKET_OPCODE_PONG:
-                DBG("%p Got ponged", fsub);
-                if(fsub->awaiting_pong) {
-                  fsub->awaiting_pong = 0;
-                }
-                // unsolicited pongs are ok too as per 
-                // https://tools.ietf.org/html/rfc6455#page-37
-                break;
+            { //block-scope these vars
+              u_char                  payloadbuf[1024];
+              int                     close_code;
+              ngx_str_t               payload_str;
+              nchan_buf_and_chain_t  *bc;
 
-              case WEBSOCKET_OPCODE_CLOSE:
-                fsub->received_close_frame = 1;
-                if(frame->payload_len >= 2) {
-                  ngx_memcpy(&close_code, frame->payload, 2);
-                  close_code = ntohs(close_code);
-                  close_reason.data = frame->payload + 2;
-                  close_reason.len = frame->payload_len - 2;
-                }
-                else {
-                  close_code = 0;
-                  close_reason.data = (u_char *)"";
-                  close_reason.len = 0;
+              if (frame->payload_len == 0) {
+                frame->payload = NULL;
+              }
+              else if(frame->payload_len < 1024) {
+                frame->payload = payloadbuf;
+                frame->last = frame->payload;
+                set_buffer(&buf, frame->payload, frame->last, frame->payload_len);
+                if ((rc = ws_recv(c, rev, &buf, frame->payload_len)) != NGX_OK) {
+                  ERR("ws_recv NOT OK when receiving payload");
+                  goto exit;
                 }
-                DBG("%p wants to close (code %i reason \"%V\")", fsub, close_code, &close_reason);
-                if(!fsub->sent_close_frame) {
-                  websocket_send_close_frame(fsub, close_code, &close_reason);
+                if (frame->mask) {
+                  websocket_unmask_frame(frame);
                 }
+              }
+              else {
+                //ERROR: frame too big
+                websocket_send_close_frame(fsub, CLOSE_MESSAGE_TOO_BIG, NULL);
                 return websocket_reading_finalize(r);
-                break; //good practice?
+              }
+
+              switch(frame->opcode) {
+                case WEBSOCKET_OPCODE_PING:
+                  bc = nchan_bufchain_pool_reserve(fsub->ctx->bcp, 1);
+                  DBG("%p got pinged", fsub);
+                  init_buf(&bc->buf, 1);
+                  payload_str.data = frame->payload;
+                  payload_str.len = frame->payload_len;
+                  set_buf_to_str(&bc->buf, &payload_str);
+                  websocket_send_frame(fsub, WEBSOCKET_PONG_LAST_FRAME_BYTE, frame->payload_len, &bc->chain);
+                  break;
+
+                case WEBSOCKET_OPCODE_PONG:
+                  DBG("%p Got ponged", fsub);
+                  if(fsub->awaiting_pong) {
+                    fsub->awaiting_pong = 0;
+                  }
+                  // unsolicited pongs are ok too as per 
+                  // https://tools.ietf.org/html/rfc6455#page-37
+                  break;
+
+                case WEBSOCKET_OPCODE_CLOSE:
+                  fsub->received_close_frame = 1;
+                  if(frame->payload_len >= 2) {
+                    ngx_memcpy(&close_code, frame->payload, 2);
+                    close_code = ntohs(close_code);
+                    payload_str.data = frame->payload + 2;
+                    payload_str.len = frame->payload_len - 2;
+                  }
+                  else {
+                    close_code = 0;
+                    payload_str.data = (u_char *)"";
+                    payload_str.len = 0;
+                  }
+                  DBG("%p wants to close (code %i reason \"%V\")", fsub, close_code, &payload_str);
+                  if(!fsub->sent_close_frame) {
+                    websocket_send_close_frame(fsub, close_code, &payload_str);
+                  }
+                  return websocket_reading_finalize(r);
+                  break; //good practice?
+              }
             }
-
             break;
-
           case WEBSOCKET_OPCODE_TEXT:
           case WEBSOCKET_OPCODE_BINARY:
 

diff --git a/3rd/nchan-1.2.5/src/subscribers/websocket.h → 3rd/nchan-1.2.6/src/subscribers/websocket.h b/3rd/nchan-1.2.5/src/subscribers/websocket.h → 3rd/nchan-1.2.6/src/subscribers/websocket.h
diff --git a/3rd/nchan-1.2.5/src/uthash.h → 3rd/nchan-1.2.6/src/uthash.h b/3rd/nchan-1.2.5/src/uthash.h → 3rd/nchan-1.2.6/src/uthash.h
diff --git a/3rd/nchan-1.2.5/src/util/hdr_histogram.c → 3rd/nchan-1.2.6/src/util/hdr_histogram.c b/3rd/nchan-1.2.5/src/util/hdr_histogram.c → 3rd/nchan-1.2.6/src/util/hdr_histogram.c
diff --git a/3rd/nchan-1.2.5/src/util/hdr_histogram.h → 3rd/nchan-1.2.6/src/util/hdr_histogram.h b/3rd/nchan-1.2.5/src/util/hdr_histogram.h → 3rd/nchan-1.2.6/src/util/hdr_histogram.h
diff --git a/3rd/nchan-1.2.5/src/util/nchan_benchmark.c → 3rd/nchan-1.2.6/src/util/nchan_benchmark.c b/3rd/nchan-1.2.5/src/util/nchan_benchmark.c → 3rd/nchan-1.2.6/src/util/nchan_benchmark.c
diff --git a/3rd/nchan-1.2.5/src/util/nchan_benchmark.h → 3rd/nchan-1.2.6/src/util/nchan_benchmark.h b/3rd/nchan-1.2.5/src/util/nchan_benchmark.h → 3rd/nchan-1.2.6/src/util/nchan_benchmark.h
diff --git a/...nchan-1.2.5/src/util/nchan_bufchainpool.c → ...nchan-1.2.6/src/util/nchan_bufchainpool.c b/...nchan-1.2.5/src/util/nchan_bufchainpool.c → ...nchan-1.2.6/src/util/nchan_bufchainpool.c
diff --git a/...nchan-1.2.5/src/util/nchan_bufchainpool.h → ...nchan-1.2.6/src/util/nchan_bufchainpool.h b/...nchan-1.2.5/src/util/nchan_bufchainpool.h → ...nchan-1.2.6/src/util/nchan_bufchainpool.h
diff --git a/3rd/nchan-1.2.5/src/util/nchan_channel_id.c → 3rd/nchan-1.2.6/src/util/nchan_channel_id.c b/3rd/nchan-1.2.5/src/util/nchan_channel_id.c → 3rd/nchan-1.2.6/src/util/nchan_channel_id.c
diff --git a/3rd/nchan-1.2.5/src/util/nchan_channel_id.h → 3rd/nchan-1.2.6/src/util/nchan_channel_id.h b/3rd/nchan-1.2.5/src/util/nchan_channel_id.h → 3rd/nchan-1.2.6/src/util/nchan_channel_id.h
diff --git a/3rd/nchan-1.2.5/src/util/nchan_debug.c → 3rd/nchan-1.2.6/src/util/nchan_debug.c b/3rd/nchan-1.2.5/src/util/nchan_debug.c → 3rd/nchan-1.2.6/src/util/nchan_debug.c
diff --git a/3rd/nchan-1.2.5/src/util/nchan_debug.h → 3rd/nchan-1.2.6/src/util/nchan_debug.h b/3rd/nchan-1.2.5/src/util/nchan_debug.h → 3rd/nchan-1.2.6/src/util/nchan_debug.h
diff --git a/...nchan-1.2.5/src/util/nchan_fake_request.c → ...nchan-1.2.6/src/util/nchan_fake_request.c b/...nchan-1.2.5/src/util/nchan_fake_request.c → ...nchan-1.2.6/src/util/nchan_fake_request.c
diff --git a/...nchan-1.2.5/src/util/nchan_fake_request.h → ...nchan-1.2.6/src/util/nchan_fake_request.h b/...nchan-1.2.5/src/util/nchan_fake_request.h → ...nchan-1.2.6/src/util/nchan_fake_request.h
diff --git a/3rd/nchan-1.2.5/src/util/nchan_list.c → 3rd/nchan-1.2.6/src/util/nchan_list.c b/3rd/nchan-1.2.5/src/util/nchan_list.c → 3rd/nchan-1.2.6/src/util/nchan_list.c
diff --git a/3rd/nchan-1.2.5/src/util/nchan_list.h → 3rd/nchan-1.2.6/src/util/nchan_list.h b/3rd/nchan-1.2.5/src/util/nchan_list.h → 3rd/nchan-1.2.6/src/util/nchan_list.h
diff --git a/3rd/nchan-1.2.5/src/util/nchan_msg.c → 3rd/nchan-1.2.6/src/util/nchan_msg.c b/3rd/nchan-1.2.5/src/util/nchan_msg.c → 3rd/nchan-1.2.6/src/util/nchan_msg.c
diff --git a/3rd/nchan-1.2.5/src/util/nchan_msg.h → 3rd/nchan-1.2.6/src/util/nchan_msg.h b/3rd/nchan-1.2.5/src/util/nchan_msg.h → 3rd/nchan-1.2.6/src/util/nchan_msg.h
diff --git a/3rd/nchan-1.2.5/src/util/nchan_output.c → 3rd/nchan-1.2.6/src/util/nchan_output.c b/3rd/nchan-1.2.5/src/util/nchan_output.c → 3rd/nchan-1.2.6/src/util/nchan_output.c
diff --git a/3rd/nchan-1.2.5/src/util/nchan_output.h → 3rd/nchan-1.2.6/src/util/nchan_output.h b/3rd/nchan-1.2.5/src/util/nchan_output.h → 3rd/nchan-1.2.6/src/util/nchan_output.h
diff --git a/3rd/nchan-1.2.5/src/util/nchan_output_info.c → 3rd/nchan-1.2.6/src/util/nchan_output_info.c b/3rd/nchan-1.2.5/src/util/nchan_output_info.c → 3rd/nchan-1.2.6/src/util/nchan_output_info.c
diff --git a/3rd/nchan-1.2.5/src/util/nchan_output_info.h → 3rd/nchan-1.2.6/src/util/nchan_output_info.h b/3rd/nchan-1.2.5/src/util/nchan_output_info.h → 3rd/nchan-1.2.6/src/util/nchan_output_info.h
diff --git a/3rd/nchan-1.2.5/src/util/nchan_rbtree.c → 3rd/nchan-1.2.6/src/util/nchan_rbtree.c b/3rd/nchan-1.2.5/src/util/nchan_rbtree.c → 3rd/nchan-1.2.6/src/util/nchan_rbtree.c
diff --git a/3rd/nchan-1.2.5/src/util/nchan_rbtree.h → 3rd/nchan-1.2.6/src/util/nchan_rbtree.h b/3rd/nchan-1.2.5/src/util/nchan_rbtree.h → 3rd/nchan-1.2.6/src/util/nchan_rbtree.h
diff --git a/3rd/nchan-1.2.5/src/util/nchan_reaper.c → 3rd/nchan-1.2.6/src/util/nchan_reaper.c b/3rd/nchan-1.2.5/src/util/nchan_reaper.c → 3rd/nchan-1.2.6/src/util/nchan_reaper.c
diff --git a/3rd/nchan-1.2.5/src/util/nchan_reaper.h → 3rd/nchan-1.2.6/src/util/nchan_reaper.h b/3rd/nchan-1.2.5/src/util/nchan_reaper.h → 3rd/nchan-1.2.6/src/util/nchan_reaper.h
diff --git a/3rd/nchan-1.2.5/src/util/nchan_reuse_queue.c → 3rd/nchan-1.2.6/src/util/nchan_reuse_queue.c b/3rd/nchan-1.2.5/src/util/nchan_reuse_queue.c → 3rd/nchan-1.2.6/src/util/nchan_reuse_queue.c
diff --git a/3rd/nchan-1.2.5/src/util/nchan_reuse_queue.h → 3rd/nchan-1.2.6/src/util/nchan_reuse_queue.h b/3rd/nchan-1.2.5/src/util/nchan_reuse_queue.h → 3rd/nchan-1.2.6/src/util/nchan_reuse_queue.h
diff --git a/3rd/nchan-1.2.5/src/util/nchan_slist.c → 3rd/nchan-1.2.6/src/util/nchan_slist.c b/3rd/nchan-1.2.5/src/util/nchan_slist.c → 3rd/nchan-1.2.6/src/util/nchan_slist.c
diff --git a/3rd/nchan-1.2.5/src/util/nchan_slist.h → 3rd/nchan-1.2.6/src/util/nchan_slist.h b/3rd/nchan-1.2.5/src/util/nchan_slist.h → 3rd/nchan-1.2.6/src/util/nchan_slist.h
diff --git a/3rd/nchan-1.2.5/src/util/nchan_subrequest.c → 3rd/nchan-1.2.6/src/util/nchan_subrequest.c b/3rd/nchan-1.2.5/src/util/nchan_subrequest.c → 3rd/nchan-1.2.6/src/util/nchan_subrequest.c
diff --git a/3rd/nchan-1.2.5/src/util/nchan_subrequest.h → 3rd/nchan-1.2.6/src/util/nchan_subrequest.h b/3rd/nchan-1.2.5/src/util/nchan_subrequest.h → 3rd/nchan-1.2.6/src/util/nchan_subrequest.h
diff --git a/3rd/nchan-1.2.5/src/util/nchan_thingcache.c → 3rd/nchan-1.2.6/src/util/nchan_thingcache.c b/3rd/nchan-1.2.5/src/util/nchan_thingcache.c → 3rd/nchan-1.2.6/src/util/nchan_thingcache.c
diff --git a/3rd/nchan-1.2.5/src/util/nchan_thingcache.h → 3rd/nchan-1.2.6/src/util/nchan_thingcache.h b/3rd/nchan-1.2.5/src/util/nchan_thingcache.h → 3rd/nchan-1.2.6/src/util/nchan_thingcache.h
diff --git a/3rd/nchan-1.2.5/src/util/nchan_util.c → 3rd/nchan-1.2.6/src/util/nchan_util.c b/3rd/nchan-1.2.5/src/util/nchan_util.c → 3rd/nchan-1.2.6/src/util/nchan_util.c
diff --git a/3rd/nchan-1.2.5/src/util/nchan_util.h → 3rd/nchan-1.2.6/src/util/nchan_util.h b/3rd/nchan-1.2.5/src/util/nchan_util.h → 3rd/nchan-1.2.6/src/util/nchan_util.h
diff --git a/...an-1.2.5/src/util/ngx_nchan_hacked_slab.c → ...an-1.2.6/src/util/ngx_nchan_hacked_slab.c b/...an-1.2.5/src/util/ngx_nchan_hacked_slab.c → ...an-1.2.6/src/util/ngx_nchan_hacked_slab.c
diff --git a/...an-1.2.5/src/util/ngx_nchan_hacked_slab.h → ...an-1.2.6/src/util/ngx_nchan_hacked_slab.h b/...an-1.2.5/src/util/ngx_nchan_hacked_slab.h → ...an-1.2.6/src/util/ngx_nchan_hacked_slab.h
diff --git a/3rd/nchan-1.2.5/src/util/shmem.c → 3rd/nchan-1.2.6/src/util/shmem.c b/3rd/nchan-1.2.5/src/util/shmem.c → 3rd/nchan-1.2.6/src/util/shmem.c
diff --git a/3rd/nchan-1.2.5/src/util/shmem.h → 3rd/nchan-1.2.6/src/util/shmem.h b/3rd/nchan-1.2.5/src/util/shmem.h → 3rd/nchan-1.2.6/src/util/shmem.h
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,21 @@
 
+Changes with nginx 1.17.1                                        25 Jun 2019
+
+    *) Feature: the "limit_req_dry_run" directive.
+
+    *) Feature: when using the "hash" directive inside the "upstream" block
+       an empty hash key now triggers round-robin balancing.
+       Thanks to Niklas Keller.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if
+       caching was used along with the "image_filter" directive, and errors
+       with code 415 were redirected with the "error_page" directive; the
+       bug had appeared in 1.11.10.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if
+       embedded perl was used; the bug had appeared in 1.7.3.
+
+
 Changes with nginx 1.17.0                                        21 May 2019
 
     *) Feature: variables support in the "limit_rate" and "limit_rate_after"

diff --git a/CHANGES.ru b/CHANGES.ru
@@ -1,4 +1,22 @@
 
+Изменения в nginx 1.17.1                                          25.06.2019
+
+    *) Добавление: директива limit_req_dry_run.
+
+    *) Добавление: при использовании директивы hash в блоке upstream пустой
+       ключ хэширования теперь приводит к переключению на round-robin
+       балансировку.
+       Спасибо Niklas Keller.
+
+    *) Исправление: в рабочем процессе мог произойти segmentation fault,
+       если использовалось кэширование и директива image_filter, а ошибки с
+       кодом 415 перенаправлялись с помощь директивы error_page; ошибка
+       появилась в 1.11.10.
+
+    *) Исправление: в рабочем процессе мог произойти segmentation fault,
+       если использовался встроенный перл; ошибка появилась в 1.7.3.
+
+
 Изменения в nginx 1.17.0                                          21.05.2019
 
     *) Добавление: директивы limit_rate и limit_rate_after поддерживают

diff --git a/install_demo.sh b/install_demo.sh
@@ -18,7 +18,7 @@ if ! test -f Makefile;then
                 --with-http-hi-lua-version=lua5.3                   \
                 --add-module=module/ngx_http_hi_module              \
                 --add-module=module/ngx_http_autoblacklist_module   \
-                --add-module=3rd/nchan-1.2.5                        \
+                --add-module=3rd/nchan-1.2.6                        \
                 --add-module=3rd/nginx-rtmp-module-1.2.1            
 else
     echo ready.