change: fixed introduce version in doc. fixed a typo.

openresty · Sep 3, 2021 · 6c329ac · 6c329ac
1 parent b8f857c
commit 6c329ac
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/README.markdown b/README.markdown
@@ -2617,7 +2617,7 @@ total number of connections to upstream servers that an nginx worker process
 can open. The connections parameter should be set to a number small enough to
 let upstream servers process new incoming connections as well.
 
-This directive was first introduced in the `v0.10.19.5` release.
+This directive was first introduced in the `v0.10.21` release.
 
 [Back to TOC](#directives)
 

diff --git a/doc/HttpLuaModule.wiki b/doc/HttpLuaModule.wiki
@@ -2204,7 +2204,7 @@ total number of connections to upstream servers that an nginx worker process
 can open. The connections parameter should be set to a number small enough to
 let upstream servers process new incoming connections as well.
 
-This directive was first introduced in the <code>v0.10.19.5</code> release.
+This directive was first introduced in the <code>v0.10.21</code> release.
 
 == lua_need_request_body ==
 

diff --git a/src/ngx_http_lua_balancer.c b/src/ngx_http_lua_balancer.c
@@ -674,7 +674,8 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
 
                         ngx_queue_remove(&item->queue);
                         ngx_queue_remove(&item->hnode);
-                        ngx_queue_insert_head(&item->lscf->balancer.free, &item->queue);
+                        ngx_queue_insert_head(&item->lscf->balancer.free,
+                                              &item->queue);
                         return;
                     }
                 }
@@ -813,7 +814,6 @@ ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r,
     const u_char *host, size_t host_len,
     char **err)
 {
-    u_char                *p;
     ngx_url_t              url;
     ngx_http_lua_ctx_t    *ctx;
     ngx_http_upstream_t   *u;
@@ -860,8 +860,7 @@ ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r,
 
     if (ngx_parse_url(r->pool, &url) != NGX_OK) {
         if (url.err) {
-            p = ngx_snprintf(errbuf, *errbuf_size, "%s", url.err);
-            *errbuf_size = p - errbuf;
+            *err = url.err;
         }
 
         return NGX_ERROR;

diff --git a/t/138-balancer.t b/t/138-balancer.t
@@ -489,6 +489,7 @@ retry counter: 5
 
 --- error_log
 set more tries: reduced tries due to limit
+--- ONLY