bugfix: ensured Content-Type header gets generated when other headers get set.

Fixed a regression introduced in 017e004 and previously described
in openresty#92.

Signed-off-by: Thibault Charbonnier <[email protected]>

Author: spacewander

src/ngx_http_lua_common.h

@@ -566,6 +566,8 @@ typedef struct ngx_http_lua_ctx_s {
 
     unsigned         headers_set:1; /* whether the user has set custom
                                        response headers */
+    unsigned         mime_set:1;    /* whether the user has set Content-Type
+                                       response header */
 
     unsigned         entered_rewrite_phase:1;
     unsigned         entered_access_phase:1;

src/ngx_http_lua_headers.c

@@ -563,7 +563,7 @@ ngx_http_lua_ngx_resp_get_headers(lua_State *L)
     }
 
     if (!r->headers_out.content_type.len) {
-        rc = ngx_http_lua_set_content_type(r);
+        rc = ngx_http_lua_set_content_type(r, ctx);
         if (rc != NGX_OK) {
             return luaL_error(L,
                               "failed to set default content type: %d",
@@ -826,7 +826,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
                 ngx_memcpy(value.data, p, len);
                 value.len = len;
 
-                rc = ngx_http_lua_set_output_header(r, key, value,
+                rc = ngx_http_lua_set_output_header(r, ctx, key, value,
                                                     i == 1 /* override */);
 
                 if (rc == NGX_ERROR) {
@@ -853,7 +853,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
     dd("key: %.*s, value: %.*s",
        (int) key.len, key.data, (int) value.len, value.data);
 
-    rc = ngx_http_lua_set_output_header(r, key, value, 1 /* override */);
+    rc = ngx_http_lua_set_output_header(r, ctx, key, value, 1 /* override */);
 
     if (rc == NGX_ERROR) {
         return luaL_error(L, "failed to set header %s (error: %d)",
@@ -1250,7 +1250,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
                 ngx_memcpy(value.data, p, len);
                 value.len = len;
 
-                rc = ngx_http_lua_set_output_header(r, key, value,
+                rc = ngx_http_lua_set_output_header(r, ctx, key, value,
                                                     override && i == 0);
 
                 if (rc == NGX_ERROR) {
@@ -1276,7 +1276,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
     dd("key: %.*s, value: %.*s",
        (int) key.len, key.data, (int) value.len, value.data);
 
-    rc = ngx_http_lua_set_output_header(r, key, value, override);
+    rc = ngx_http_lua_set_output_header(r, ctx, key, value, override);
 
     if (rc == NGX_ERROR) {
         *errmsg = "failed to set header";
@@ -1407,7 +1407,7 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
     case 12:
         if (ngx_strncasecmp(key_buf, (u_char *) "Content-Type", 12) == 0) {
             if (!r->headers_out.content_type.len) {
-                if (ngx_http_lua_set_content_type(r) != NGX_OK) {
+                if (ngx_http_lua_set_content_type(r, ctx) != NGX_OK) {
                     *errmsg = "failed to set default content type";
                     return NGX_ERROR;
                 }

src/ngx_http_lua_headers_out.c

@@ -476,8 +476,8 @@ ngx_http_clear_builtin_header(ngx_http_request_t *r,
 
 
 ngx_int_t
-ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
-    ngx_str_t value, unsigned override)
+ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx,
+    ngx_str_t key, ngx_str_t value, unsigned override)
 {
     ngx_http_lua_header_val_t         hv;
     ngx_http_lua_set_header_t        *handlers = ngx_http_lua_set_handlers;
@@ -508,6 +508,10 @@ ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
         hv.offset = handlers[i].offset;
         hv.handler = handlers[i].handler;
 
+        if (hv.handler == ngx_http_set_content_type_header) {
+            ctx->mime_set = 1;
+        }
+
         break;
     }
 
@@ -552,8 +556,8 @@ ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
 
     case 12:
         if (ngx_strncasecmp(key->data, (u_char *) "Content-Type", 12) == 0) {
-            if (!r->headers_out.content_type.len) {
-                rc = ngx_http_lua_set_content_type(r);
+            if (r->headers_out.content_type.len == 0) {
+                rc = ngx_http_lua_set_content_type(r, ctx);
                 if (rc != NGX_OK) {
                     return luaL_error(L,
                                       "failed to set default content type: %d",

src/ngx_http_lua_headers_out.h

@@ -12,8 +12,8 @@
 #include "ngx_http_lua_common.h"
 
 
-ngx_int_t ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
-    ngx_str_t value, unsigned override);
+ngx_int_t ngx_http_lua_set_output_header(ngx_http_request_t *r,
+    ngx_http_lua_ctx_t *ctx, ngx_str_t key, ngx_str_t value, unsigned override);
 int ngx_http_lua_get_output_header(lua_State *L, ngx_http_request_t *r,
     ngx_http_lua_ctx_t *ctx, ngx_str_t *key);
 

src/ngx_http_lua_subrequest.c

@@ -1032,7 +1032,7 @@ ngx_http_lua_post_subrequest(ngx_http_request_t *r, void *data, ngx_int_t rc)
 
     /* copy subrequest response headers */
     if (ctx->headers_set) {
-        rc = ngx_http_lua_set_content_type(r);
+        rc = ngx_http_lua_set_content_type(r, ctx);
         if (rc != NGX_OK) {
             ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                           "failed to set default content type: %i", rc);

src/ngx_http_lua_util.c

@@ -433,7 +433,9 @@ ngx_http_lua_send_header_if_needed(ngx_http_request_t *r,
             r->headers_out.status = NGX_HTTP_OK;
         }
 
-        if (!ctx->headers_set && ngx_http_lua_set_content_type(r) != NGX_OK) {
+        if (!ctx->mime_set
+            && ngx_http_lua_set_content_type(r, ctx) != NGX_OK)
+        {
             return NGX_ERROR;
         }
 

src/ngx_http_lua_util.h

@@ -411,10 +411,12 @@ ngx_http_lua_hash_str(u_char *src, size_t n)
 
 
 static ngx_inline ngx_int_t
-ngx_http_lua_set_content_type(ngx_http_request_t *r)
+ngx_http_lua_set_content_type(ngx_http_request_t *r, ngx_http_lua_ctx_t *ctx)
 {
     ngx_http_lua_loc_conf_t     *llcf;
 
+    ctx->mime_set = 1;
+
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
     if (llcf->use_default_type
         && r->headers_out.status != NGX_HTTP_NOT_MODIFIED)

t/016-resp-header.t

@@ -8,7 +8,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 3 + 51);
+plan tests => repeat_each() * (blocks() * 3 + 55);
 
 #no_diff();
 no_long_string();
@@ -1705,16 +1705,38 @@ lua exceeding response header limit
 
 
 
-=== TEST 76: don't generate Content-Type header when setting other response headers
+=== TEST 76: don't generate Content-Type when setting other response header
 --- config
+    location = /backend {
+        content_by_lua_block {
+            ngx.say("foo")
+        }
+        header_filter_by_lua_block {
+            ngx.header.content_type = nil
+        }
+    }
+
     location = /t {
         default_type text/html;
         rewrite_by_lua_block {
             ngx.header.blah = "foo"
         }
         proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
     }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+blah: foo
+!Content-Type
+--- no_error_log
+[error]
 
+
+
+=== TEST 77: don't generate Content-Type when getting other response header
+--- config
     location = /backend {
         content_by_lua_block {
             ngx.say("foo")
@@ -1723,41 +1745,80 @@ lua exceeding response header limit
             ngx.header.content_type = nil
         }
     }
+
+    location = /t {
+        default_type text/html;
+        rewrite_by_lua_block {
+            local h = ngx.header.content_length
+        }
+        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
+    }
 --- request
 GET /t
 --- response_body
 foo
 --- response_headers
-blah: foo
-Content-Type:
+!Content-Type
 --- no_error_log
 [error]
 
 
 
-=== TEST 77: don't generate Content-Type header when getting other response headers
+=== TEST 78: generate default Content-Type when setting other response header
 --- config
     location = /t {
         default_type text/html;
-        rewrite_by_lua_block {
-            local h = ngx.header.content_length
+        content_by_lua_block {
+            ngx.header.blah = "foo"
+            ngx.say("foo")
         }
-        proxy_pass http://127.0.0.1:$TEST_NGINX_SERVER_PORT/backend;
     }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+blah: foo
+Content-Type: text/html
+--- no_error_log
+[error]
 
-    location = /backend {
+
+
+=== TEST 79: don't generate default Content-Type when Content-Type is cleared
+--- config
+    location = /t {
+        default_type text/html;
         content_by_lua_block {
+            ngx.header["Content-Type"] = nil
             ngx.say("foo")
         }
-        header_filter_by_lua_block {
-            ngx.header.content_type = nil
+    }
+--- request
+GET /t
+--- response_body
+foo
+--- response_headers
+!Content-Type
+--- no_error_log
+[error]
+
+
+
+=== TEST 80: don't generate default Content-Type when Content-Type is set
+--- config
+    location = /t {
+        default_type text/html;
+        content_by_lua_block {
+            ngx.header["Content-Type"] = "application/json"
+            ngx.say("foo")
         }
     }
 --- request
 GET /t
 --- response_body
 foo
 --- response_headers
-Content-Type:
+Content-Type: application/json
 --- no_error_log
 [error]