From: Ruslan Ermilov <ru@nginx.com>
Date: Thu, 15 Mar 2012 20:04:50 +0000 (+0000)
Subject: The "error_log" directive specified in the "http", "server", and
X-Git-Tag: release-1.1.18~24
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=849e3b09ae74bcf2b443b3c2eaf851609fd0f763;p=nginx.git

The "error_log" directive specified in the "http", "server", and
"location" sections now understands the special "stderr" parameter.
It was already treated specially when specified in the main section.
---

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 7504a2c64..6dcc38be8 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -4647,7 +4647,7 @@ ngx_http_core_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_http_core_loc_conf_t *clcf = conf;
 
-    ngx_str_t  *value;
+    ngx_str_t  *value, name;
 
     if (clcf->error_log) {
         return "is duplicate";
@@ -4655,7 +4655,14 @@ ngx_http_core_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     value = cf->args->elts;
 
-    clcf->error_log = ngx_log_create(cf->cycle, &value[1]);
+    if (ngx_strcmp(value[1].data, "stderr") == 0) {
+        ngx_str_null(&name);
+
+    } else {
+        name = value[1];
+    }
+
+    clcf->error_log = ngx_log_create(cf->cycle, &name);
     if (clcf->error_log == NULL) {
         return NGX_CONF_ERROR;
     }