diff options
author | Igor Sysoev <igor@sysoev.ru> | 2004-09-29 20:00:49 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2004-09-29 20:00:49 +0400 |
commit | ff8da91784ae67ef3b5daa6ebbbbef2ec728729f (patch) | |
tree | 66ca5a267c5768598f12e4bc727e5eced7c3c453 /src/core | |
parent | 55168f6b6bca2d9aafc11ada25b514f7ac99d34f (diff) |
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Diffstat (limited to 'src/core')
44 files changed, 60 insertions, 101 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index 236a65b0f..0f37f2ad8 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ @@ -95,8 +95,6 @@ ngx_module_t ngx_core_module = { ngx_uint_t ngx_max_module; -ngx_uint_t ngx_use_stderr; - int main(int argc, char *const *argv) { @@ -120,7 +118,9 @@ int main(int argc, char *const *argv) ngx_pid = ngx_getpid(); - log = ngx_log_init_errlog(); + if (!(log = ngx_log_init_errlog())) { + return 1; + } #if (NGX_OPENSSL) ngx_ssl_init(log); @@ -144,10 +144,6 @@ int main(int argc, char *const *argv) return 1; } - if (ngx_use_stderr) { - log = ngx_log_init_errlog(); - } - if (ngx_os_init(log) == NGX_ERROR) { return 1; } @@ -326,10 +322,6 @@ static ngx_int_t ngx_getopt(ngx_master_ctx_t *ctx, ngx_cycle_t *cycle) ngx_test_config = 1; break; - case 's': - ngx_use_stderr = 1; - break; - case 'c': if (ctx->argv[i + 1] == NULL) { ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, diff --git a/src/core/nginx.h b/src/core/nginx.h index c53ad7a54..66b5c3356 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_array.c b/src/core/ngx_array.c index 0bc25a931..6eae76ffd 100644 --- a/src/core/ngx_array.c +++ b/src/core/ngx_array.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_array.h b/src/core/ngx_array.h index 6a2fe0357..826395de6 100644 --- a/src/core/ngx_array.h +++ b/src/core/ngx_array.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_buf.c b/src/core/ngx_buf.c index ca64783e7..72b558bc8 100644 --- a/src/core/ngx_buf.c +++ b/src/core/ngx_buf.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_buf.h b/src/core/ngx_buf.h index fa2a544d0..3e014d17a 100644 --- a/src/core/ngx_buf.h +++ b/src/core/ngx_buf.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index 99c5df1cf..6387fadc0 100644 --- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index 567c86cfd..fc0533760 100644 --- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h index f23176dba..7e3e6828c 100644 --- a/src/core/ngx_config.h +++ b/src/core/ngx_config.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index 5b663740a..698342fbd 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h index a9250848d..7a0345099 100644 --- a/src/core/ngx_connection.h +++ b/src/core/ngx_connection.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h index 671956e33..909ab8edf 100644 --- a/src/core/ngx_core.h +++ b/src/core/ngx_core.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_crc.h b/src/core/ngx_crc.h index 208001d48..b78f479e4 100644 --- a/src/core/ngx_crc.h +++ b/src/core/ngx_crc.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 86528ba1e..a545c61d7 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ @@ -29,7 +29,11 @@ ngx_tls_key_t ngx_core_tls_key; static ngx_connection_t dumb; /* STUB */ +#ifdef NGX_ERROR_LOG_PATH static ngx_str_t error_log = ngx_string(NGX_ERROR_LOG_PATH); +#else +static ngx_str_t error_log = ngx_null_string; +#endif ngx_cycle_t *ngx_init_cycle(ngx_cycle_t *old_cycle) diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h index f1e88b1ed..45b7b23b0 100644 --- a/src/core/ngx_cycle.h +++ b/src/core/ngx_cycle.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index 7ae77de6e..c7ee51372 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h index d6ca67db0..9a6fe6efa 100644 --- a/src/core/ngx_file.h +++ b/src/core/ngx_file.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_garbage_collector.c b/src/core/ngx_garbage_collector.c index ea2529aad..d73ca959f 100644 --- a/src/core/ngx_garbage_collector.c +++ b/src/core/ngx_garbage_collector.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_garbage_collector.h b/src/core/ngx_garbage_collector.h index b445944e9..72f97604d 100644 --- a/src/core/ngx_garbage_collector.h +++ b/src/core/ngx_garbage_collector.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c index 5000ee076..bf8a788ea 100644 --- a/src/core/ngx_inet.c +++ b/src/core/ngx_inet.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_inet.h b/src/core/ngx_inet.h index 5e30c9e33..d0e1f8dfb 100644 --- a/src/core/ngx_inet.h +++ b/src/core/ngx_inet.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_list.c b/src/core/ngx_list.c index 85e3b6459..236eff4f9 100644 --- a/src/core/ngx_list.c +++ b/src/core/ngx_list.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_list.h b/src/core/ngx_list.h index b65eff361..046bdee16 100644 --- a/src/core/ngx_list.h +++ b/src/core/ngx_list.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c index be899e3f7..07df34474 100644 --- a/src/core/ngx_log.c +++ b/src/core/ngx_log.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ @@ -112,7 +112,9 @@ void ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, if (err) { if (len > max - 50) { + /* leave a space for an error code */ + len = max - 50; errstr[len++] = '.'; errstr[len++] = '.'; @@ -222,40 +224,6 @@ void ngx_assert_core(ngx_log_t *log, const char *fmt, ...) #endif -#if 0 - -void ngx_log_stderr(ngx_event_t *ev) -{ - char errstr[MAX_ERROR_STR]; - ssize_t n; - ngx_err_t err; - - for ( ;; ) { - n = read((ngx_fd_t) ev->data, errstr, sizeof(errstr - 1)); - - if (n == -1) { - err = ngx_errno; - if (err == NGX_EAGAIN) { - return; - } - - ngx_log_error(NGX_LOG_ALERT, &ngx_log, err, "read() failed"); - return; - } - - if (n == 0) { - ngx_log_error(NGX_LOG_ALERT, &ngx_log, 0, "stderr clolsed"); - return; - } - - errstr[n] = '\0'; - ngx_log_error(NGX_LOG_STDERR, &ngx_log, 0, "%s", errstr); - } -} - -#endif - - ngx_log_t *ngx_log_init_errlog() { @@ -287,7 +255,8 @@ ngx_log_t *ngx_log_init_errlog() ngx_log.file = &ngx_stderr; ngx_log.log_level = NGX_LOG_ERR; -#if 0 +#ifdef NGX_ERROR_LOG_PATH + fd = ngx_open_file(NGX_ERROR_LOG_PATH, NGX_FILE_RDWR, NGX_FILE_CREATE_OR_OPEN|NGX_FILE_APPEND); @@ -315,6 +284,7 @@ ngx_log_t *ngx_log_init_errlog() } #endif + #endif return &ngx_log; @@ -405,19 +375,12 @@ static char *ngx_set_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) value = cf->args->elts; - if (value[1].len == 6 && ngx_strcmp(value[1].data, "stderr") == 0) { - cf->cycle->new_log->file->fd = ngx_stderr.fd; - cf->cycle->new_log->file->name.len = 0; - cf->cycle->new_log->file->name.data = NULL; - - } else { - cf->cycle->new_log->file->name = value[1]; + cf->cycle->new_log->file->name = value[1]; - if (ngx_conf_full_name(cf->cycle, &cf->cycle->new_log->file->name) + if (ngx_conf_full_name(cf->cycle, &cf->cycle->new_log->file->name) == NGX_ERROR) - { - return NGX_CONF_ERROR; - } + { + return NGX_CONF_ERROR; } return ngx_set_error_log_levels(cf, cf->cycle->new_log); diff --git a/src/core/ngx_log.h b/src/core/ngx_log.h index 782d28ae8..a3adb0449 100644 --- a/src/core/ngx_log.h +++ b/src/core/ngx_log.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c index f40dfd313..f0d66cb93 100644 --- a/src/core/ngx_output_chain.c +++ b/src/core/ngx_output_chain.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c index 47f9a8645..ee4d224ba 100644 --- a/src/core/ngx_palloc.c +++ b/src/core/ngx_palloc.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_palloc.h b/src/core/ngx_palloc.h index 3a3f244b3..53448f4f3 100644 --- a/src/core/ngx_palloc.h +++ b/src/core/ngx_palloc.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_parse.c b/src/core/ngx_parse.c index 8edcc5a61..dad9efcbd 100644 --- a/src/core/ngx_parse.c +++ b/src/core/ngx_parse.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_parse.h b/src/core/ngx_parse.h index 1423a97a3..44fff2e95 100644 --- a/src/core/ngx_parse.h +++ b/src/core/ngx_parse.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_radix_tree.c b/src/core/ngx_radix_tree.c index 15949e5e1..c1d349e02 100644 --- a/src/core/ngx_radix_tree.c +++ b/src/core/ngx_radix_tree.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_radix_tree.h b/src/core/ngx_radix_tree.h index 2e3319b36..5398d06eb 100644 --- a/src/core/ngx_radix_tree.h +++ b/src/core/ngx_radix_tree.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_rbtree.c b/src/core/ngx_rbtree.c index f3c7ac9d4..c94db13e8 100644 --- a/src/core/ngx_rbtree.c +++ b/src/core/ngx_rbtree.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_rbtree.h b/src/core/ngx_rbtree.h index 47ced3ea2..aa69556f8 100644 --- a/src/core/ngx_rbtree.h +++ b/src/core/ngx_rbtree.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_regex.c b/src/core/ngx_regex.c index 9cae52a89..27dad8d06 100644 --- a/src/core/ngx_regex.c +++ b/src/core/ngx_regex.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_regex.h b/src/core/ngx_regex.h index 1d19686af..f9bf8580f 100644 --- a/src/core/ngx_regex.h +++ b/src/core/ngx_regex.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c index 93d7565f6..7b23d3c14 100644 --- a/src/core/ngx_slab.c +++ b/src/core/ngx_slab.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_slab.h b/src/core/ngx_slab.h index 0ae71004a..f0e7da800 100644 --- a/src/core/ngx_slab.h +++ b/src/core/ngx_slab.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_spinlock.c b/src/core/ngx_spinlock.c index 16e6a5c81..dfa7da411 100644 --- a/src/core/ngx_spinlock.c +++ b/src/core/ngx_spinlock.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c index 21de8916b..3d6a9eb1d 100644 --- a/src/core/ngx_string.c +++ b/src/core/ngx_string.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h index 447542508..fbc88751a 100644 --- a/src/core/ngx_string.h +++ b/src/core/ngx_string.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_table.h b/src/core/ngx_table.h index 7315ea3a7..5e2f3a94f 100644 --- a/src/core/ngx_table.h +++ b/src/core/ngx_table.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_times.c b/src/core/ngx_times.c index 90ceaaeab..2ca31acc4 100644 --- a/src/core/ngx_times.c +++ b/src/core/ngx_times.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ diff --git a/src/core/ngx_times.h b/src/core/ngx_times.h index 5384b5319..e1d1515ee 100644 --- a/src/core/ngx_times.h +++ b/src/core/ngx_times.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2004 Igor Sysoev + * Copyright (C) Igor Sysoev */ |