Mercurial > hg > nginx

changeset 6405:5dfc63c1d9ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Headers filter: fixed "add_header ... '' always". The "always" parameter was ignored if the header value was empty.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 18 Feb 2016 15:49:11 +0300
parents 09d5a22c76bd
children d194cad6dd3a
files src/http/modules/ngx_http_headers_filter_module.c
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_headers_filter_module.c
+++ b/src/http/modules/ngx_http_headers_filter_module.c
@@ -712,17 +712,17 @@ ngx_http_headers_add(ngx_conf_t *cf, ngx
 
     if (value[2].len == 0) {
         ngx_memzero(&hv->value, sizeof(ngx_http_complex_value_t));
-        return NGX_CONF_OK;
-    }
 
-    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+    } else {
+        ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
 
-    ccv.cf = cf;
-    ccv.value = &value[2];
-    ccv.complex_value = &hv->value;
+        ccv.cf = cf;
+        ccv.value = &value[2];
+        ccv.complex_value = &hv->value;
 
-    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
-        return NGX_CONF_ERROR;
+        if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+            return NGX_CONF_ERROR;
+        }
     }
 
     if (cf->args->nelts == 3) {