File 778cc4b42ea85e19a8ebf6c1a42fc636e48ec309.patch of Package nginx

Overview Repositories Revisions Requests Users Attributes Meta

File 778cc4b42ea85e19a8ebf6c1a42fc636e48ec309.patch of Package nginx (Revision 5348d05151a4e267fa4aead01077a425)

Currently displaying revision 5348d05151a4e267fa4aead01077a425 , Show latest

From 778cc4b42ea85e19a8ebf6c1a42fc636e48ec309 Mon Sep 17 00:00:00 2001
From: Sergey Kandaurov <pluknet@nginx.com>
Date: Mon, 1 Dec 2014 14:51:36 +0300
Subject: [PATCH] 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).
---
 src/http/modules/ngx_http_log_module.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
index 04aa27f..df9424f 100644
--- 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_conf_t *cf);
 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_command_t *cmd, void *conf)
     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;

Places

File 778cc4b42ea85e19a8ebf6c1a42fc636e48ec309.patch of Package nginx (Revision 5348d05151a4e267fa4aead01077a425)

Places