feature: added the new configuration directive "lua_use_default_type" for controlling whether to send out a default Content-Type response header (as defined by the "default_type" directive). default on. thanks aviramc for the patch in #286.

Author: agentzh

src/ngx_http_lua_common.h

@@ -201,6 +201,7 @@ typedef struct {
     ngx_flag_t                       transform_underscores_in_resp_headers;
     ngx_flag_t                       log_socket_errors;
     ngx_flag_t                       check_client_abort;
+    ngx_flag_t                       use_default_type;
 } ngx_http_lua_loc_conf_t;
 
 

src/ngx_http_lua_headers.c

@@ -497,7 +497,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
     }
 
     if (!ctx->headers_set) {
-        rc = ngx_http_set_content_type(r);
+        rc = ngx_http_lua_set_content_type(r);
         if (rc != NGX_OK) {
             return luaL_error(L,
                               "failed to set default content type: %d",

src/ngx_http_lua_module.c

@@ -343,6 +343,14 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       offsetof(ngx_http_lua_loc_conf_t, check_client_abort),
       NULL },
 
+    { ngx_string("lua_use_default_type"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                        |NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_lua_loc_conf_t, use_default_type),
+      NULL },
+
     ngx_null_command
 };
 
@@ -616,6 +624,7 @@ ngx_http_lua_create_loc_conf(ngx_conf_t *cf)
     conf->enable_code_cache  = NGX_CONF_UNSET;
     conf->http10_buffering   = NGX_CONF_UNSET;
     conf->check_client_abort = NGX_CONF_UNSET;
+    conf->use_default_type   = NGX_CONF_UNSET;
 
     conf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
     conf->connect_timeout = NGX_CONF_UNSET_MSEC;
@@ -679,6 +688,7 @@ ngx_http_lua_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->enable_code_cache, prev->enable_code_cache, 1);
     ngx_conf_merge_value(conf->http10_buffering, prev->http10_buffering, 1);
     ngx_conf_merge_value(conf->check_client_abort, prev->check_client_abort, 0);
+    ngx_conf_merge_value(conf->use_default_type, prev->use_default_type, 1);
 
     ngx_conf_merge_msec_value(conf->keepalive_timeout,
                               prev->keepalive_timeout, 60000);

src/ngx_http_lua_util.c

@@ -484,7 +484,7 @@ 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_set_content_type(r) != NGX_OK) {
+        if (!ctx->headers_set && ngx_http_lua_set_content_type(r) != NGX_OK) {
             return NGX_ERROR;
         }
 

src/ngx_http_lua_util.h

@@ -249,6 +249,20 @@ 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_loc_conf_t     *llcf;
+
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
+    if (llcf->use_default_type) {
+        return ngx_http_set_content_type(r);
+    }
+
+    return NGX_OK;
+}
+
+
 extern ngx_uint_t  ngx_http_lua_location_hash;
 extern ngx_uint_t  ngx_http_lua_content_length_hash;