Mercurial > hg > nginx

changeset 7321:45e513c3540d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed invalid access to location defined as an empty string.
author Ruslan Ermilov <ru@nginx.com>
date Tue, 17 Jul 2018 15:30:43 +0300
parents 696df3ac27ac
children 6649d4433266
files src/http/modules/ngx_http_fastcgi_module.c src/http/modules/ngx_http_grpc_module.c src/http/modules/ngx_http_memcached_module.c src/http/modules/ngx_http_proxy_module.c src/http/modules/ngx_http_scgi_module.c src/http/modules/ngx_http_uwsgi_module.c
diffstat 6 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_fastcgi_module.c	Tue Jul 17 12:53:23 2018 +0300
+++ b/src/http/modules/ngx_http_fastcgi_module.c	Tue Jul 17 15:30:43 2018 +0300
@@ -3501,7 +3501,7 @@
 
     clcf->handler = ngx_http_fastcgi_handler;
 
-    if (clcf->name.data[clcf->name.len - 1] == '/') {
+    if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') {
         clcf->auto_redirect = 1;
     }
 
--- a/src/http/modules/ngx_http_grpc_module.c	Tue Jul 17 12:53:23 2018 +0300
+++ b/src/http/modules/ngx_http_grpc_module.c	Tue Jul 17 15:30:43 2018 +0300
@@ -4525,7 +4525,7 @@
 
     clcf->handler = ngx_http_grpc_handler;
 
-    if (clcf->name.data[clcf->name.len - 1] == '/') {
+    if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') {
         clcf->auto_redirect = 1;
     }
 
--- a/src/http/modules/ngx_http_memcached_module.c	Tue Jul 17 12:53:23 2018 +0300
+++ b/src/http/modules/ngx_http_memcached_module.c	Tue Jul 17 15:30:43 2018 +0300
@@ -707,7 +707,7 @@
 
     clcf->handler = ngx_http_memcached_handler;
 
-    if (clcf->name.data[clcf->name.len - 1] == '/') {
+    if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') {
         clcf->auto_redirect = 1;
     }
 
--- a/src/http/modules/ngx_http_proxy_module.c	Tue Jul 17 12:53:23 2018 +0300
+++ b/src/http/modules/ngx_http_proxy_module.c	Tue Jul 17 15:30:43 2018 +0300
@@ -3580,7 +3580,7 @@
 
     clcf->handler = ngx_http_proxy_handler;
 
-    if (clcf->name.data[clcf->name.len - 1] == '/') {
+    if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') {
         clcf->auto_redirect = 1;
     }
 
--- a/src/http/modules/ngx_http_scgi_module.c	Tue Jul 17 12:53:23 2018 +0300
+++ b/src/http/modules/ngx_http_scgi_module.c	Tue Jul 17 15:30:43 2018 +0300
@@ -1857,7 +1857,7 @@
         return NGX_CONF_ERROR;
     }
 
-    if (clcf->name.data[clcf->name.len - 1] == '/') {
+    if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') {
         clcf->auto_redirect = 1;
     }
 
--- a/src/http/modules/ngx_http_uwsgi_module.c	Tue Jul 17 12:53:23 2018 +0300
+++ b/src/http/modules/ngx_http_uwsgi_module.c	Tue Jul 17 15:30:43 2018 +0300
@@ -2144,7 +2144,7 @@
         return NGX_CONF_ERROR;
     }
 
-    if (clcf->name.data[clcf->name.len - 1] == '/') {
+    if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') {
         clcf->auto_redirect = 1;
     }