From 174f72b95cd35f1929eb6806f1fa51cff820fc80 Mon Sep 17 00:00:00 2001
From: Yao Wang <wangyao@openresty.com>
Date: Fri, 9 Jul 2021 23:31:26 -0400
Subject: [PATCH 1/5] feature: add config ability for privileged connections
 number.

---
 ...ginx-1.19.9-privileged_agent_process.patch | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/patches/nginx-1.19.9-privileged_agent_process.patch b/patches/nginx-1.19.9-privileged_agent_process.patch
index 164004e..d33023a 100644
--- a/patches/nginx-1.19.9-privileged_agent_process.patch
+++ b/patches/nginx-1.19.9-privileged_agent_process.patch
@@ -1,25 +1,27 @@
 diff --git a/src/core/nginx.c b/src/core/nginx.c
-index 60f8fe7..4bd244b 100644
+index 48a20e9..48329bd 100644
 --- a/src/core/nginx.c
 +++ b/src/core/nginx.c
-@@ -981,6 +981,7 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle)
+@@ -1061,6 +1061,8 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle)
  
      ccf->daemon = NGX_CONF_UNSET;
      ccf->master = NGX_CONF_UNSET;
 +    ccf->privileged_agent = NGX_CONF_UNSET;
++    ccf->privileged_agent_connections = NGX_CONF_UNSET_UINT;
      ccf->timer_resolution = NGX_CONF_UNSET_MSEC;
+     ccf->shutdown_timeout = NGX_CONF_UNSET_MSEC;
  
-     ccf->worker_processes = NGX_CONF_UNSET;
-@@ -1009,6 +1010,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
+@@ -1090,6 +1092,8 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
  
      ngx_conf_init_value(ccf->daemon, 1);
      ngx_conf_init_value(ccf->master, 1);
 +    ngx_conf_init_value(ccf->privileged_agent, 0);
++    ngx_conf_init_uint_value(ccf->privileged_agent_connections, 512);
      ngx_conf_init_msec_value(ccf->timer_resolution, 0);
+     ngx_conf_init_msec_value(ccf->shutdown_timeout, 0);
  
-     ngx_conf_init_value(ccf->worker_processes, 1);
 diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
-index c51b7ff..3261f90 100644
+index 0c47f25..4469390 100644
 --- a/src/core/ngx_cycle.h
 +++ b/src/core/ngx_cycle.h
 @@ -22,6 +22,9 @@
@@ -32,16 +34,17 @@ index c51b7ff..3261f90 100644
  typedef struct ngx_shm_zone_s  ngx_shm_zone_t;
  
  typedef ngx_int_t (*ngx_shm_zone_init_pt) (ngx_shm_zone_t *zone, void *data);
-@@ -81,6 +84,7 @@ struct ngx_cycle_s {
+@@ -89,6 +92,8 @@ struct ngx_cycle_s {
  typedef struct {
      ngx_flag_t                daemon;
      ngx_flag_t                master;
 +    ngx_flag_t                privileged_agent;
++    ngx_uint_t                privileged_agent_connections;
  
      ngx_msec_t                timer_resolution;
- 
+     ngx_msec_t                shutdown_timeout;
 diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
-index 7cee1c5..c4f70d6 100644
+index b31485f..bd259c1 100644
 --- a/src/os/unix/ngx_process_cycle.c
 +++ b/src/os/unix/ngx_process_cycle.c
 @@ -15,6 +15,8 @@ static void ngx_start_worker_processes(ngx_cycle_t *cycle, ngx_int_t n,
@@ -61,7 +64,7 @@ index 7cee1c5..c4f70d6 100644
  static void ngx_cache_manager_process_handler(ngx_event_t *ev);
  static void ngx_cache_loader_process_handler(ngx_event_t *ev);
  
-@@ -51,6 +54,8 @@ sig_atomic_t  ngx_noaccept;
+@@ -52,6 +55,8 @@ sig_atomic_t  ngx_noaccept;
  ngx_uint_t    ngx_noaccepting;
  ngx_uint_t    ngx_restart;
  
@@ -102,7 +105,7 @@ index 7cee1c5..c4f70d6 100644
              live = 1;
          }
  
-@@ -393,6 +431,26 @@ ngx_start_cache_manager_processes(ngx_cycle_t *cycle, ngx_uint_t respawn)
+@@ -393,6 +402,26 @@ ngx_start_cache_manager_processes(ngx_cycle_t *cycle, ngx_uint_t respawn)
  
  
  static void
@@ -128,8 +131,8 @@ index 7cee1c5..c4f70d6 100644
 +static void
  ngx_pass_open_channel(ngx_cycle_t *cycle)
  {
-     ngx_int_t  i;
-@@ -794,7 +860,10 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
+     ngx_int_t      i;
+@@ -794,7 +823,10 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
          }
      }
  
@@ -141,13 +144,14 @@ index 7cee1c5..c4f70d6 100644
          if (setgid(ccf->group) == -1) {
              ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
                            "setgid(%d) failed", ccf->group);
-@@ -1149,6 +1216,47 @@ ngx_cache_manager_process_cycle(ngx_cycle_t *cycle, void *data)
+@@ -1144,6 +1176,48 @@ ngx_cache_manager_process_cycle(ngx_cycle_t *cycle, void *data)
  
  
  static void
 +ngx_privileged_agent_process_cycle(ngx_cycle_t *cycle, void *data)
 +{
 +    char   *name = data;
++    ngx_core_conf_t *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
 +
 +    /*
 +     * Set correct process type since closing listening Unix domain socket
@@ -159,7 +163,7 @@ index 7cee1c5..c4f70d6 100644
 +    ngx_close_listening_sockets(cycle);
 +
 +    /* Set a moderate number of connections for a helper process. */
-+    cycle->connection_n = 512;
++    cycle->connection_n = ccf->privileged_agent_connections;
 +
 +    ngx_worker_process_init(cycle, -1);
 +
@@ -188,7 +192,7 @@ index 7cee1c5..c4f70d6 100644
 +static void
  ngx_cache_manager_process_handler(ngx_event_t *ev)
  {
-     time_t        next, n;
+     ngx_uint_t    i;
 diff --git a/src/os/unix/ngx_process_cycle.h b/src/os/unix/ngx_process_cycle.h
 index 69495d5..5149396 100644
 --- a/src/os/unix/ngx_process_cycle.h

From c93ef77262b6f7a09934e11f088702c1f2b2aa4a Mon Sep 17 00:00:00 2001
From: wangyao <wangyao@openresty.com>
Date: Mon, 19 Jul 2021 18:34:46 +0800
Subject: [PATCH 2/5] change: introduce a new patch for privileged agent
 process connections. (#751)

---
 ...privileged_agent_process_connections.patch | 53 +++++++++++++++++++
 ...ginx-1.19.9-privileged_agent_process.patch | 36 ++++++-------
 ...privileged_agent_process_connections.patch | 53 +++++++++++++++++++
 util/mirror-tarballs                          |  7 +++
 4 files changed, 129 insertions(+), 20 deletions(-)
 create mode 100644 patches/nginx-1.19.3-privileged_agent_process_connections.patch
 create mode 100644 patches/nginx-1.19.9-privileged_agent_process_connections.patch

diff --git a/patches/nginx-1.19.3-privileged_agent_process_connections.patch b/patches/nginx-1.19.3-privileged_agent_process_connections.patch
new file mode 100644
index 0000000..c05790c
--- /dev/null
+++ b/patches/nginx-1.19.3-privileged_agent_process_connections.patch
@@ -0,0 +1,53 @@
+diff --git a/src/core/nginx.c b/src/core/nginx.c
+index 2e8b692..104d96e 100644
+--- a/src/core/nginx.c
++++ b/src/core/nginx.c
+@@ -1029,6 +1029,7 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle)
+     ccf->daemon = NGX_CONF_UNSET;
+     ccf->master = NGX_CONF_UNSET;
+     ccf->privileged_agent = NGX_CONF_UNSET;
++    ccf->privileged_agent_connections = NGX_CONF_UNSET_UINT;
+     ccf->timer_resolution = NGX_CONF_UNSET_MSEC;
+     ccf->shutdown_timeout = NGX_CONF_UNSET_MSEC;
+ 
+@@ -1059,6 +1060,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
+     ngx_conf_init_value(ccf->daemon, 1);
+     ngx_conf_init_value(ccf->master, 1);
+     ngx_conf_init_value(ccf->privileged_agent, 0);
++    ngx_conf_init_uint_value(ccf->privileged_agent_connections, 512);
+     ngx_conf_init_msec_value(ccf->timer_resolution, 0);
+     ngx_conf_init_msec_value(ccf->shutdown_timeout, 0);
+ 
+diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
+index e9239ae..af9406e 100644
+--- a/src/core/ngx_cycle.h
++++ b/src/core/ngx_cycle.h
+@@ -92,6 +92,7 @@ typedef struct {
+     ngx_flag_t                daemon;
+     ngx_flag_t                master;
+     ngx_flag_t                privileged_agent;
++    ngx_uint_t                privileged_agent_connections;
+ 
+     ngx_msec_t                timer_resolution;
+     ngx_msec_t                shutdown_timeout;
+diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
+index b1eb322..8e03696 100644
+--- a/src/os/unix/ngx_process_cycle.c
++++ b/src/os/unix/ngx_process_cycle.c
+@@ -1208,6 +1208,7 @@ static void
+ ngx_privileged_agent_process_cycle(ngx_cycle_t *cycle, void *data)
+ {
+     char   *name = data;
++    ngx_core_conf_t *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+ 
+     /*
+      * Set correct process type since closing listening Unix domain socket
+@@ -1219,7 +1220,7 @@ ngx_privileged_agent_process_cycle(ngx_cycle_t *cycle, void *data)
+     ngx_close_listening_sockets(cycle);
+ 
+     /* Set a moderate number of connections for a helper process. */
+-    cycle->connection_n = 512;
++    cycle->connection_n = ccf->privileged_agent_connections;
+ 
+     ngx_worker_process_init(cycle, -1);
+ 
diff --git a/patches/nginx-1.19.9-privileged_agent_process.patch b/patches/nginx-1.19.9-privileged_agent_process.patch
index d33023a..164004e 100644
--- a/patches/nginx-1.19.9-privileged_agent_process.patch
+++ b/patches/nginx-1.19.9-privileged_agent_process.patch
@@ -1,27 +1,25 @@
 diff --git a/src/core/nginx.c b/src/core/nginx.c
-index 48a20e9..48329bd 100644
+index 60f8fe7..4bd244b 100644
 --- a/src/core/nginx.c
 +++ b/src/core/nginx.c
-@@ -1061,6 +1061,8 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle)
+@@ -981,6 +981,7 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle)
  
      ccf->daemon = NGX_CONF_UNSET;
      ccf->master = NGX_CONF_UNSET;
 +    ccf->privileged_agent = NGX_CONF_UNSET;
-+    ccf->privileged_agent_connections = NGX_CONF_UNSET_UINT;
      ccf->timer_resolution = NGX_CONF_UNSET_MSEC;
-     ccf->shutdown_timeout = NGX_CONF_UNSET_MSEC;
  
-@@ -1090,6 +1092,8 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
+     ccf->worker_processes = NGX_CONF_UNSET;
+@@ -1009,6 +1010,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
  
      ngx_conf_init_value(ccf->daemon, 1);
      ngx_conf_init_value(ccf->master, 1);
 +    ngx_conf_init_value(ccf->privileged_agent, 0);
-+    ngx_conf_init_uint_value(ccf->privileged_agent_connections, 512);
      ngx_conf_init_msec_value(ccf->timer_resolution, 0);
-     ngx_conf_init_msec_value(ccf->shutdown_timeout, 0);
  
+     ngx_conf_init_value(ccf->worker_processes, 1);
 diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
-index 0c47f25..4469390 100644
+index c51b7ff..3261f90 100644
 --- a/src/core/ngx_cycle.h
 +++ b/src/core/ngx_cycle.h
 @@ -22,6 +22,9 @@
@@ -34,17 +32,16 @@ index 0c47f25..4469390 100644
  typedef struct ngx_shm_zone_s  ngx_shm_zone_t;
  
  typedef ngx_int_t (*ngx_shm_zone_init_pt) (ngx_shm_zone_t *zone, void *data);
-@@ -89,6 +92,8 @@ struct ngx_cycle_s {
+@@ -81,6 +84,7 @@ struct ngx_cycle_s {
  typedef struct {
      ngx_flag_t                daemon;
      ngx_flag_t                master;
 +    ngx_flag_t                privileged_agent;
-+    ngx_uint_t                privileged_agent_connections;
  
      ngx_msec_t                timer_resolution;
-     ngx_msec_t                shutdown_timeout;
+ 
 diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
-index b31485f..bd259c1 100644
+index 7cee1c5..c4f70d6 100644
 --- a/src/os/unix/ngx_process_cycle.c
 +++ b/src/os/unix/ngx_process_cycle.c
 @@ -15,6 +15,8 @@ static void ngx_start_worker_processes(ngx_cycle_t *cycle, ngx_int_t n,
@@ -64,7 +61,7 @@ index b31485f..bd259c1 100644
  static void ngx_cache_manager_process_handler(ngx_event_t *ev);
  static void ngx_cache_loader_process_handler(ngx_event_t *ev);
  
-@@ -52,6 +55,8 @@ sig_atomic_t  ngx_noaccept;
+@@ -51,6 +54,8 @@ sig_atomic_t  ngx_noaccept;
  ngx_uint_t    ngx_noaccepting;
  ngx_uint_t    ngx_restart;
  
@@ -105,7 +102,7 @@ index b31485f..bd259c1 100644
              live = 1;
          }
  
-@@ -393,6 +402,26 @@ ngx_start_cache_manager_processes(ngx_cycle_t *cycle, ngx_uint_t respawn)
+@@ -393,6 +431,26 @@ ngx_start_cache_manager_processes(ngx_cycle_t *cycle, ngx_uint_t respawn)
  
  
  static void
@@ -131,8 +128,8 @@ index b31485f..bd259c1 100644
 +static void
  ngx_pass_open_channel(ngx_cycle_t *cycle)
  {
-     ngx_int_t      i;
-@@ -794,7 +823,10 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
+     ngx_int_t  i;
+@@ -794,7 +860,10 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
          }
      }
  
@@ -144,14 +141,13 @@ index b31485f..bd259c1 100644
          if (setgid(ccf->group) == -1) {
              ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
                            "setgid(%d) failed", ccf->group);
-@@ -1144,6 +1176,48 @@ ngx_cache_manager_process_cycle(ngx_cycle_t *cycle, void *data)
+@@ -1149,6 +1216,47 @@ ngx_cache_manager_process_cycle(ngx_cycle_t *cycle, void *data)
  
  
  static void
 +ngx_privileged_agent_process_cycle(ngx_cycle_t *cycle, void *data)
 +{
 +    char   *name = data;
-+    ngx_core_conf_t *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
 +
 +    /*
 +     * Set correct process type since closing listening Unix domain socket
@@ -163,7 +159,7 @@ index b31485f..bd259c1 100644
 +    ngx_close_listening_sockets(cycle);
 +
 +    /* Set a moderate number of connections for a helper process. */
-+    cycle->connection_n = ccf->privileged_agent_connections;
++    cycle->connection_n = 512;
 +
 +    ngx_worker_process_init(cycle, -1);
 +
@@ -192,7 +188,7 @@ index b31485f..bd259c1 100644
 +static void
  ngx_cache_manager_process_handler(ngx_event_t *ev)
  {
-     ngx_uint_t    i;
+     time_t        next, n;
 diff --git a/src/os/unix/ngx_process_cycle.h b/src/os/unix/ngx_process_cycle.h
 index 69495d5..5149396 100644
 --- a/src/os/unix/ngx_process_cycle.h
diff --git a/patches/nginx-1.19.9-privileged_agent_process_connections.patch b/patches/nginx-1.19.9-privileged_agent_process_connections.patch
new file mode 100644
index 0000000..c642cfa
--- /dev/null
+++ b/patches/nginx-1.19.9-privileged_agent_process_connections.patch
@@ -0,0 +1,53 @@
+diff --git a/src/core/nginx.c b/src/core/nginx.c
+index 269ff84..48329bd 100644
+--- a/src/core/nginx.c
++++ b/src/core/nginx.c
+@@ -1062,6 +1062,7 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle)
+     ccf->daemon = NGX_CONF_UNSET;
+     ccf->master = NGX_CONF_UNSET;
+     ccf->privileged_agent = NGX_CONF_UNSET;
++    ccf->privileged_agent_connections = NGX_CONF_UNSET_UINT;
+     ccf->timer_resolution = NGX_CONF_UNSET_MSEC;
+     ccf->shutdown_timeout = NGX_CONF_UNSET_MSEC;
+ 
+@@ -1092,6 +1093,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
+     ngx_conf_init_value(ccf->daemon, 1);
+     ngx_conf_init_value(ccf->master, 1);
+     ngx_conf_init_value(ccf->privileged_agent, 0);
++    ngx_conf_init_uint_value(ccf->privileged_agent_connections, 512);
+     ngx_conf_init_msec_value(ccf->timer_resolution, 0);
+     ngx_conf_init_msec_value(ccf->shutdown_timeout, 0);
+ 
+diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
+index 6a9583e..4469390 100644
+--- a/src/core/ngx_cycle.h
++++ b/src/core/ngx_cycle.h
+@@ -93,6 +93,7 @@ typedef struct {
+     ngx_flag_t                daemon;
+     ngx_flag_t                master;
+     ngx_flag_t                privileged_agent;
++    ngx_uint_t                privileged_agent_connections;
+ 
+     ngx_msec_t                timer_resolution;
+     ngx_msec_t                shutdown_timeout;
+diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
+index df25f9d..bd259c1 100644
+--- a/src/os/unix/ngx_process_cycle.c
++++ b/src/os/unix/ngx_process_cycle.c
+@@ -1179,6 +1179,7 @@ static void
+ ngx_privileged_agent_process_cycle(ngx_cycle_t *cycle, void *data)
+ {
+     char   *name = data;
++    ngx_core_conf_t *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+ 
+     /*
+      * Set correct process type since closing listening Unix domain socket
+@@ -1190,7 +1191,7 @@ ngx_privileged_agent_process_cycle(ngx_cycle_t *cycle, void *data)
+     ngx_close_listening_sockets(cycle);
+ 
+     /* Set a moderate number of connections for a helper process. */
+-    cycle->connection_n = 512;
++    cycle->connection_n = ccf->privileged_agent_connections;
+ 
+     ngx_worker_process_init(cycle, -1);
+ 
diff --git a/util/mirror-tarballs b/util/mirror-tarballs
index 0ad5a8f..8bccf0e 100755
--- a/util/mirror-tarballs
+++ b/util/mirror-tarballs
@@ -126,6 +126,13 @@ if [ "$answer" = "Y" ]; then
     echo
 fi
 
+answer=`$root/util/ver-ge "$main_ver" 1.19.3`
+if [ "$answer" = "Y" ]; then
+    echo "$info_txt applying the privileged-agent-process-connections patch"
+    patch -p1 < $root/patches/nginx-$main_ver-privileged_agent_process_connections.patch || exit 1
+    echo
+fi
+
 answer=`$root/util/ver-ge "$main_ver" 1.11.2`
 if [ "$answer" = "Y" ]; then
     echo "$info_txt applying the single-process-graceful-exit patch"

From f39a58477510166863cd04dede0411d192f8bc47 Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@gmail.com>
Date: Fri, 7 May 2021 20:25:13 +1000
Subject: [PATCH 3/5] chore: fix spelling

---
 clients/js/openresty.js              | 6 +++---
 doc/LuaJIT-2.1/ext_ffi_api.pod       | 2 +-
 doc/LuaJIT-2.1/ext_ffi_semantics.pod | 2 +-
 doc/LuaJIT-2.1/extensions.pod        | 2 +-
 doc/README-windows.md                | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/clients/js/openresty.js b/clients/js/openresty.js
index bdf6db5..112b718 100644
--- a/clients/js/openresty.js
+++ b/clients/js/openresty.js
@@ -142,10 +142,10 @@ $ClientP._post_by_form = function (url, content, args) {
         reqId: reqId
     };
     _post_forms[reqId] = obj;
-    var submited = false;
+    var submitted = false;
     // var onloadCount = 0;
     obj.onload = function() {
-        if (!submited) return;
+        if (!submitted) return;
         
         // alert('contentLoad ' + (++onloadCount) + ' times\n' + this);
         
@@ -237,7 +237,7 @@ $ClientP._post_by_form = function (url, content, args) {
     _ipt = null;
     
     _form.submit();
-    submited = true;
+    submitted = true;
 };
 
 $ClientP.post = function (url) {
diff --git a/doc/LuaJIT-2.1/ext_ffi_api.pod b/doc/LuaJIT-2.1/ext_ffi_api.pod
index 182f820..ddf2b9c 100644
--- a/doc/LuaJIT-2.1/ext_ffi_api.pod
+++ b/doc/LuaJIT-2.1/ext_ffi_api.pod
@@ -326,7 +326,7 @@ of the string is computed with C<strlen()>.
 
 Otherwise C<ptr> is converted to a C<"void *"> and C<len> gives the
 length of the data. The data may contain embedded zeros and need not be
-byte-oriented (though this may cause endianess issues).
+byte-oriented (though this may cause endianness issues).
 
 This function is mainly useful to convert (temporary) C<"const char *">
 pointers returned by C functions to Lua strings and store them or pass
diff --git a/doc/LuaJIT-2.1/ext_ffi_semantics.pod b/doc/LuaJIT-2.1/ext_ffi_semantics.pod
index 94b7908..f5a11e1 100644
--- a/doc/LuaJIT-2.1/ext_ffi_semantics.pod
+++ b/doc/LuaJIT-2.1/ext_ffi_semantics.pod
@@ -847,7 +847,7 @@ through unions is explicitly detected and allowed.
 =item * B<Constructor>: a ctype object can be called and used as a
 constructor. This is equivalent to C<ffi.new(ct, ...)>, unless a
 C<__new> metamethod is defined. The C<__new> metamethod is called with
-the ctype object plus any other arguments passed to the contructor.
+the ctype object plus any other arguments passed to the constructor.
 Note that you have to use C<ffi.new> inside of it, since calling
 C<ct(...)> would cause infinite recursion.
 
diff --git a/doc/LuaJIT-2.1/extensions.pod b/doc/LuaJIT-2.1/extensions.pod
index 5cdcc5d..7a1cc37 100644
--- a/doc/LuaJIT-2.1/extensions.pod
+++ b/doc/LuaJIT-2.1/extensions.pod
@@ -158,7 +158,7 @@ also the C<-b> command line option.
 
 The generated bytecode is portable and can be loaded on any
 architecture that LuaJIT supports, independent of word size or
-endianess. However the bytecode compatibility versions must match.
+endianness. However the bytecode compatibility versions must match.
 Bytecode stays compatible for dot releases (x.y.0 E<rarr> x.y.1), but
 may change with major or minor releases (2.0 E<rarr> 2.1) or between
 any beta release. Foreign bytecode (e.g. from Lua 5.1) is incompatible
diff --git a/doc/README-windows.md b/doc/README-windows.md
index f6f0595..d3d860d 100644
--- a/doc/README-windows.md
+++ b/doc/README-windows.md
@@ -136,7 +136,7 @@ side. But if you do, please read on.
 
 The Win32/Win64 build of OpenResty is currently built via the MSYS2/MinGW toolchain, including
 MinGW gcc 7.2.3, MSYS2 perl 5.24.4, MSYS2 bash, MSYS2 make, and etc. Basically, it is currently built via
- the following cmmands:
+ the following commands:
 
 ```bash
 PCRE=pcre-8.42

From 04ef2ec590e388456f78fe071ef577fa62520976 Mon Sep 17 00:00:00 2001
From: "Yichun Zhang (agentzh)" <yichun@openresty.com>
Date: Thu, 5 Aug 2021 18:28:44 -0700
Subject: [PATCH 4/5] bumped version to 1.19.9.1.

---
 util/ver | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/ver b/util/ver
index a3bd55b..8fe4c8f 100755
--- a/util/ver
+++ b/util/ver
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 main_ver=1.19.9
-minor_ver=1rc1
+minor_ver=1
 version=$main_ver.$minor_ver
 echo $version
 

From 1befa30baae94c1a1b915a1e66f63bb6abd80990 Mon Sep 17 00:00:00 2001
From: Johnny Wang <wangjiahao@openresty.com>
Date: Fri, 13 Aug 2021 14:01:00 +0800
Subject: [PATCH 5/5] upgraded ngx_http_redis module to 0.3.9. (#754)

---
 ...gx_http_redis-0.3.9-default_port_fix.patch |  17 ++
 ..._redis-0.3.9-variables_in_redis_pass.patch | 189 ++++++++++++++++++
 t/000-sanity.t                                | 120 +++++------
 util/mirror-tarballs                          |   5 +-
 4 files changed, 267 insertions(+), 64 deletions(-)
 create mode 100644 patches/ngx_http_redis-0.3.9-default_port_fix.patch
 create mode 100644 patches/ngx_http_redis-0.3.9-variables_in_redis_pass.patch

diff --git a/patches/ngx_http_redis-0.3.9-default_port_fix.patch b/patches/ngx_http_redis-0.3.9-default_port_fix.patch
new file mode 100644
index 0000000..3e8a01f
--- /dev/null
+++ b/patches/ngx_http_redis-0.3.9-default_port_fix.patch
@@ -0,0 +1,17 @@
+--- redis-nginx-module-0.3.9/ngx_http_redis_module.c	2021-08-02 23:01:47.810190756 +0800
++++ redis-nginx-module-0.3.9-patched/ngx_http_redis_module.c	2021-08-02 23:02:06.861317611 +0800
+@@ -1021,12 +1021,14 @@
+             continue;
+         }
+ 
++#if (nginx_version < 1011006)
+         if (uscfp[i]->default_port
+             && url->default_port
+             && uscfp[i]->default_port != url->default_port)
+         {
+             continue;
+         }
++#endif
+ 
+         return uscfp[i];
+     }
diff --git a/patches/ngx_http_redis-0.3.9-variables_in_redis_pass.patch b/patches/ngx_http_redis-0.3.9-variables_in_redis_pass.patch
new file mode 100644
index 0000000..43e4472
--- /dev/null
+++ b/patches/ngx_http_redis-0.3.9-variables_in_redis_pass.patch
@@ -0,0 +1,189 @@
+--- ngx_http_redis-0.3.9/ngx_http_redis_module.c	2021-08-02 22:22:48.769615464 +0800
++++ ngx_http_redis-0.3.9-patched2/ngx_http_redis_module.c	2021-08-02 22:57:54.388636438 +0800
+@@ -24,6 +24,7 @@
+     ngx_int_t                  db;
+     ngx_int_t                  auth;
+     ngx_uint_t                 gzip_flag;
++    ngx_http_complex_value_t  *complex_target; /* for redis_pass */
+ } ngx_http_redis_loc_conf_t;
+ 
+ 
+@@ -50,6 +51,8 @@
+ 
+ static char *ngx_http_redis_pass(ngx_conf_t *cf, ngx_command_t *cmd,
+     void *conf);
++static ngx_http_upstream_srv_conf_t *
++    ngx_http_redis_upstream_add(ngx_http_request_t *r, ngx_url_t *url);
+ 
+ static ngx_conf_bitmask_t  ngx_http_redis_next_upstream_masks[] = {
+     { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
+@@ -196,14 +199,46 @@
+ #if defined nginx_version && nginx_version >= 8011
+     if (ngx_http_upstream_create(r) != NGX_OK) {
+ #else
+-    rlcf = ngx_http_get_module_loc_conf(r, ngx_http_redis_module);
+-
+     u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t));
+     if (u == NULL) {
+ #endif
+         return NGX_HTTP_INTERNAL_SERVER_ERROR;
+     }
+ 
++    rlcf = ngx_http_get_module_loc_conf(r, ngx_http_redis_module);
++    if (rlcf->complex_target) {
++        ngx_str_t           target;
++        ngx_url_t           url;
++
++        /* variables used in the redis_pass directive */
++
++        if (ngx_http_complex_value(r, rlcf->complex_target, &target)
++                != NGX_OK)
++        {
++            return NGX_ERROR;
++        }
++
++        if (target.len == 0) {
++            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
++                    "handler: empty \"redis_pass\" target");
++            return NGX_HTTP_INTERNAL_SERVER_ERROR;
++        }
++
++        url.host = target;
++        url.port = 0;
++        url.default_port = 6379;
++        url.no_resolve = 1;
++
++        rlcf->upstream.upstream = ngx_http_redis_upstream_add(r, &url);
++
++        if (rlcf->upstream.upstream == NULL) {
++            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
++                   "redis: upstream \"%V\" not found", &target);
++
++            return NGX_HTTP_INTERNAL_SERVER_ERROR;
++        }
++    }
++
+ #if defined nginx_version && nginx_version >= 8011
+     u = r->upstream;
+ #endif
+@@ -222,9 +257,7 @@
+     u->peer.log_error = NGX_ERROR_ERR;
+ #endif
+ 
+-#if defined nginx_version && nginx_version >= 8011
+-    rlcf = ngx_http_get_module_loc_conf(r, ngx_http_redis_module);
+-#else
++#if !defined nginx_version || nginx_version < 8011
+     u->output.tag = (ngx_buf_tag_t) &ngx_http_redis_module;
+ #endif
+ 
+@@ -903,22 +936,13 @@
+     ngx_url_t                  u;
+     ngx_http_core_loc_conf_t  *clcf;
+ 
++    ngx_int_t                           n;
++    ngx_http_compile_complex_value_t    ccv;
++
+     if (rlcf->upstream.upstream) {
+         return "is duplicate";
+     }
+ 
+-    value = cf->args->elts;
+-
+-    ngx_memzero(&u, sizeof(ngx_url_t));
+-
+-    u.url = value[1];
+-    u.no_resolve = 1;
+-
+-    rlcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0);
+-    if (rlcf->upstream.upstream == NULL) {
+-        return NGX_CONF_ERROR;
+-    }
+-
+     clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+ 
+     clcf->handler = ngx_http_redis_handler;
+@@ -936,10 +956,83 @@
+     rlcf->db = ngx_http_get_variable_index(cf, &ngx_http_redis_db);
+     rlcf->auth = ngx_http_get_variable_index(cf, &ngx_http_redis_auth);
+ 
++    value = cf->args->elts;
++
++    n = ngx_http_script_variables_count(&value[1]);
++    if (n) {
++        rlcf->complex_target = ngx_palloc(cf->pool,
++                                          sizeof(ngx_http_complex_value_t));
++
++        if (rlcf->complex_target == NULL) {
++            return NGX_CONF_ERROR;
++        }
++
++        ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
++        ccv.cf = cf;
++        ccv.value = &value[1];
++        ccv.complex_value = rlcf->complex_target;
++
++        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
++            return NGX_CONF_ERROR;
++        }
++
++        return NGX_CONF_OK;
++    }
++
++    rlcf->complex_target = NULL;
++
++    ngx_memzero(&u, sizeof(ngx_url_t));
++
++    u.url = value[1];
++    u.no_resolve = 1;
++
++    rlcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0);
++    if (rlcf->upstream.upstream == NULL) {
++        return NGX_CONF_ERROR;
++    }
++
+     return NGX_CONF_OK;
+ }
+ 
+ 
++static ngx_http_upstream_srv_conf_t *
++ngx_http_redis_upstream_add(ngx_http_request_t *r, ngx_url_t *url)
++{
++    ngx_http_upstream_main_conf_t  *umcf;
++    ngx_http_upstream_srv_conf_t  **uscfp;
++    ngx_uint_t                      i;
++
++    umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
++
++    uscfp = umcf->upstreams.elts;
++
++    for (i = 0; i < umcf->upstreams.nelts; i++) {
++
++        if (uscfp[i]->host.len != url->host.len
++            || ngx_strncasecmp(uscfp[i]->host.data, url->host.data,
++               url->host.len) != 0)
++        {
++            continue;
++        }
++
++        if (uscfp[i]->port != url->port) {
++            continue;
++        }
++
++        if (uscfp[i]->default_port
++            && url->default_port
++            && uscfp[i]->default_port != url->default_port)
++        {
++            continue;
++        }
++
++        return uscfp[i];
++    }
++
++    return NULL;
++}
++
++
+ static ngx_int_t
+ ngx_http_redis_reset_variable(ngx_http_request_t *r,
+     ngx_http_variable_value_t *v, uintptr_t data)
diff --git a/t/000-sanity.t b/t/000-sanity.t
index 9f46d82..16c2ff9 100644
--- a/t/000-sanity.t
+++ b/t/000-sanity.t
@@ -300,7 +300,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -387,7 +387,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -474,7 +474,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -561,7 +561,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -647,7 +647,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -733,7 +733,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -1070,7 +1070,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -1158,7 +1158,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -1259,7 +1259,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -1346,7 +1346,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -1436,7 +1436,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -1524,7 +1524,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -1627,7 +1627,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -1715,7 +1715,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -1833,7 +1833,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -1920,7 +1920,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -2007,7 +2007,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -2094,7 +2094,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -2181,7 +2181,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -2268,7 +2268,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -2358,7 +2358,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -2449,7 +2449,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -2536,7 +2536,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -2621,7 +2621,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -2706,7 +2706,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -2792,7 +2792,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -2876,7 +2876,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -2959,7 +2959,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -3040,7 +3040,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -3125,7 +3125,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -3212,7 +3212,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -3299,7 +3299,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -3386,7 +3386,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -3473,7 +3473,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -3559,7 +3559,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -3645,7 +3645,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -3733,7 +3733,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -3820,7 +3820,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -3907,7 +3907,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -3994,7 +3994,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -4081,7 +4081,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -4168,7 +4168,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -4255,7 +4255,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -4341,7 +4341,7 @@ sh ./configure --prefix=./nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -4430,7 +4430,7 @@ sh ./configure --prefix=./nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -4519,7 +4519,7 @@ sh ./configure --prefix=./nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -4611,7 +4611,7 @@ sh ./configure --prefix=. \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -4695,7 +4695,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -4782,7 +4782,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -4869,7 +4869,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -4956,7 +4956,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -5043,7 +5043,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -5130,7 +5130,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -5217,7 +5217,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -5304,7 +5304,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -5390,7 +5390,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -5470,7 +5470,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module
@@ -5531,7 +5531,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -5617,7 +5617,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
@@ -5671,7 +5671,7 @@ sh ./configure --prefix=/usr/local/openresty/nginx \
   --add-module=../array-var-nginx-module-0.05 \
   --add-module=../memc-nginx-module-0.19 \
   --add-module=../redis2-nginx-module-0.15 \
-  --add-module=../redis-nginx-module-0.3.7 \
+  --add-module=../redis-nginx-module-0.3.9 \
   --add-module=../rds-json-nginx-module-0.15 \
   --add-module=../rds-csv-nginx-module-0.09 \
   --add-module=../ngx_stream_lua-0.0.10 \
diff --git a/util/mirror-tarballs b/util/mirror-tarballs
index 8bccf0e..c501a11 100755
--- a/util/mirror-tarballs
+++ b/util/mirror-tarballs
@@ -643,7 +643,7 @@ mv openresty-encrypted-session-nginx-module-* encrypted-session-nginx-module-$ve
 
 #################################
 
-ver=0.3.7
+ver=0.3.9
 $root/util/get-tarball "https://people.freebsd.org/~osa/ngx_http_redis-$ver.tar.gz" -O redis-nginx-module-$ver.tar.gz || exit 1
 tar -xzf redis-nginx-module-$ver.tar.gz || exit 1
 mv ngx_http_redis-* redis-nginx-module-$ver || exit 1
@@ -657,9 +657,6 @@ echo "applying ngx_http_redis-$ver-default_port_fix.patch"
 patch -p1 < $root/patches/ngx_http_redis-$ver-default_port_fix.patch || exit 1
 echo
 
-echo "applying ngx_http_redis-$ver-without_gzip.patch"
-patch -p1 < $root/patches/ngx_http_redis-$ver-without_gzip.patch || exit 1
-echo
 cd ..
 
 #################################