diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.c | 7 | ||||
| -rw-r--r-- | src/core/ngx_conf_file.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_config.h | 3 | ||||
| -rw-r--r-- | src/core/ngx_file.c | 7 | ||||
| -rw-r--r-- | src/core/ngx_times.c | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index f63eeccaa..be95637b0 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -70,12 +70,9 @@ ngx_module_t ngx_core_module = { }; -ngx_int_t ngx_max_module; +ngx_uint_t ngx_max_module; -ngx_int_t ngx_process; -ngx_pid_t ngx_pid; -ngx_pid_t ngx_new_binary; -ngx_int_t ngx_inherited; +ngx_uint_t ngx_inherited; int main(int argc, char *const *argv) diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index 353e0989c..01080cc15 100644 --- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -274,7 +274,7 @@ char *ngx_conf_set_enum_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); char *ngx_conf_set_bitmask_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); -extern ngx_int_t ngx_max_module; +extern ngx_uint_t ngx_max_module; extern ngx_module_t *ngx_modules[]; diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h index 3d44f1ea4..448e63ab6 100644 --- a/src/core/ngx_config.h +++ b/src/core/ngx_config.h @@ -77,7 +77,10 @@ typedef int ngx_flag_t; /* TODO: auto */ #define NGX_INT32_LEN sizeof("-2147483648") - 1 #define NGX_INT64_LEN sizeof("-9223372036854775808") - 1 +#if 0 #define NGX_TIME_T_LEN sizeof("-2147483648") - 1 +#endif +#define NGX_TIME_T_LEN sizeof("-9223372036854775808") - 1 #define NGX_OFF_T_LEN sizeof("-9223372036854775808") - 1 diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index 0e9344e10..ef92a0ab1 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -76,11 +76,12 @@ int ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, continue; } - if (err != NGX_ENOENT + if ((path->level[0] == 0) + || (err != NGX_ENOENT #if (WIN32) - && err != NGX_ENOTDIR + && err != NGX_ENOTDIR #endif - ) { + )) { ngx_log_error(NGX_LOG_CRIT, file->log, err, ngx_open_tempfile_n " \"%s\" failed", file->name.data); diff --git a/src/core/ngx_times.c b/src/core/ngx_times.c index 097186a25..ac2a3a9db 100644 --- a/src/core/ngx_times.c +++ b/src/core/ngx_times.c @@ -31,7 +31,7 @@ static u_char cached_http_log_time0[] = "28/Sep/1970:12:00:00 +0600"; static u_char cached_http_log_time1[] = "28/Sep/1970:12:00:00 +0600"; -static char *week[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fir", "Sat" }; +static char *week[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; static char *months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; |