Browse Source

bugfixed: syslog crashed when used in error_log within 'http' block

pull/557/head
weiyue 11 years ago
parent
commit
f1a078f2f1
  1. 2
      src/core/ngx_log.c
  2. 52
      tests/test-nginx/cases/syslog.t

2
src/core/ngx_log.c

@ -183,7 +183,7 @@ ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
#endif
if (log->file->fd == ngx_stderr) {
if (log->file != NULL && log->file->fd == ngx_stderr) {
wrote_stderr = 1;
}

52
tests/test-nginx/cases/syslog.t

@ -98,92 +98,92 @@ GET /p
=== TEST 11: syslog:user for error log ===
--- config
location /p {
error_log syslog:user;
empty_gif;
error_log syslog:user debug;
root /not/exist;
}
--- request
GET /p
--- error_code: 200
--- error_code: 404
=== TEST 12: syslog:user:info for error log ===
--- config
location /p {
error_log syslog:user:info;
empty_gif;
root /not/exist;
}
--- request
GET /p
--- error_code: 200
--- error_code: 404
=== TEST 13: syslog:user:info:127.0.0.1 for error log ===
--- config
location /p {
error_log syslog:user:info:127.0.0.1;
empty_gif;
error_log syslog:user:info:127.0.0.1 debug;
root /not/exist;
}
--- request
GET /p
--- error_code: 200
--- error_code: 404
=== TEST 14: syslog:user:info:127.0.0.1:514 for error log ===
--- config
location /p {
error_log syslog:user:info:127.0.0.1:514;
empty_gif;
error_log syslog:user:info:127.0.0.1:514 debug;
root /not/exist;
}
--- request
GET /p
--- error_code: 200
--- error_code: 404
=== TEST 15: syslog:user:info:127.0.0.1:514:test.taobao.com for error log ===
--- config
location /p {
error_log syslog:user:info:127.0.0.1:514:test.taobao.com;
empty_gif;
error_log syslog:user:info:127.0.0.1:514:test.taobao.com debug;
root /not/exist;
}
--- request
GET /p
--- error_code: 200
--- error_code: 404
=== TEST 16: syslog:user::127.0.0.1:514:test.taobao.com for error log ===
--- config
location /p {
error_log syslog:user::127.0.0.1:514:test.taobao.com;
empty_gif;
error_log syslog:user::127.0.0.1:514:test.taobao.com debug;
root /not/exist;
}
--- request
GET /p
--- error_code: 200
--- error_code: 404
=== TEST 17: syslog:user:info:127.0.0.1::test.taobao.com for error log ===
--- config
location /p {
error_log syslog:user:info:127.0.0.1::test.taobao.com;
empty_gif;
error_log syslog:user:info:127.0.0.1::test.taobao.com debug;
root /not/exist;
}
--- request
GET /p
--- error_code: 200
--- error_code: 404
=== TEST 18: syslog:user:info:/dev/log:test.taobao.com for error log ===
--- config
location /p {
error_log syslog:user::/dev/log:test.taobao.com;
empty_gif;
error_log syslog:user::/dev/log:test.taobao.com debug;
root /not/exist;
}
--- request
GET /p
--- error_code: 200
--- error_code: 404
=== TEST 19: syslog:user:info:/dev/log for error log ===
--- config
location /p {
error_log syslog:user::/dev/log;
empty_gif;
error_log syslog:user::/dev/log debug;
root /not/exist;
}
--- request
GET /p
--- error_code: 200
--- error_code: 404
=== Test 20: hostname and domain support, besides ip ===
--- config

Loading…
Cancel
Save