Mercurial > hg > nginx

changeset 5927:ac2a8e4d8f01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Access log: restricted "log_format" to "http" level. Specifying the "log_format" directive on levels other than "http" is deprecated since 73d37e1ccb91 (1.1.11).
author Sergey Kandaurov <pluknet@nginx.com>
date Mon, 01 Dec 2014 14:51:36 +0300
parents 08bfc7188a41
children 8dfee01ff0bd
files src/http/modules/ngx_http_log_module.c
diffstat 1 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_log_module.c
+++ b/src/http/modules/ngx_http_log_module.c
@@ -152,7 +152,7 @@ static ngx_int_t ngx_http_log_init(ngx_c
 static ngx_command_t  ngx_http_log_commands[] = {
 
     { ngx_string("log_format"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_2MORE,
+      NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE,
       ngx_http_log_set_format,
       NGX_HTTP_MAIN_CONF_OFFSET,
       0,
@@ -1448,12 +1448,6 @@ ngx_http_log_set_format(ngx_conf_t *cf, 
     ngx_uint_t           i;
     ngx_http_log_fmt_t  *fmt;
 
-    if (cf->cmd_type != NGX_HTTP_MAIN_CONF) {
-        ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                           "the \"log_format\" directive may be used "
-                           "only on \"http\" level");
-    }
-
     value = cf->args->elts;
 
     fmt = lmcf->formats.elts;