diff options
Diffstat (limited to 'src/http')
| -rw-r--r-- | src/http/modules/ngx_http_log_handler.c | 32 | ||||
| -rw-r--r-- | src/http/ngx_http_core.c | 16 |
2 files changed, 33 insertions, 15 deletions
diff --git a/src/http/modules/ngx_http_log_handler.c b/src/http/modules/ngx_http_log_handler.c index 56ea8419e..4937ed0b8 100644 --- a/src/http/modules/ngx_http_log_handler.c +++ b/src/http/modules/ngx_http_log_handler.c @@ -20,15 +20,19 @@ int ngx_http_log_handler(ngx_http_request_t *r) char *line, *p; ngx_tm_t tm; + ngx_log_debug(r->connection->log, "log handler"); + + /* %a, 20:%c, 22:%d, 3:%s, 20:%b, 5*" ", "2/1: "\r\n" */ #if (WIN32) - len = 2 + 22 + 3 + 20 + 5 + 20 + 2; + len = 2 + 20 + 22 + 3 + 20 + 5 + + 2; #else - len = 2 + 22 + 3 + 20 + 5 + 20 + 1; + len = 2 + 20 + 22 + 3 + 20 + 5 + + 1; #endif len += r->connection->addr_text.len; len += r->request_line.len; + ngx_log_debug(r->connection->log, "log handler: %d" _ len); ngx_test_null(line, ngx_palloc(r->pool, len), NGX_ERROR); p = line; @@ -38,18 +42,30 @@ int ngx_http_log_handler(ngx_http_request_t *r) *p++ = ' '; + p += ngx_snprintf(p, 21, "%u", r->connection->number); + + *p++ = ' '; + + *p = '\0'; + ngx_log_debug(r->connection->log, "log handler: %s" _ line); + ngx_localtime(&tm); + ngx_log_debug(r->connection->log, "log handler: %s" _ line); + *p++ = '['; p += ngx_snprintf(p, 21, "%02d/%s/%d:%02d:%02d:%02d", - tm.ngx_tm_mday, months[tm.ngx_tm_mon], - tm.ngx_tm_year + 1900, + tm.ngx_tm_mday, months[tm.ngx_tm_mon - 1], + tm.ngx_tm_year, tm.ngx_tm_hour, tm.ngx_tm_min, tm.ngx_tm_sec); *p++ = ']'; *p++ = ' '; + *p = '\0'; + ngx_log_debug(r->connection->log, "log handler: %s" _ line); + *p++ = '"'; ngx_memcpy(p, r->request_line.data, r->request_line.len); p += r->request_line.len; @@ -63,9 +79,8 @@ int ngx_http_log_handler(ngx_http_request_t *r) p += ngx_snprintf(p, 21, QD_FMT, r->connection->sent); - *p++ = ' '; - - p += ngx_snprintf(p, 21, "%u", r->connection->number); + *p = '\0'; + ngx_log_debug(r->connection->log, "log handler: %s" _ line); #if (WIN32) *p++ = CR; *p++ = LF; @@ -73,6 +88,9 @@ int ngx_http_log_handler(ngx_http_request_t *r) *p++ = LF; #endif + *p = '\0'; + ngx_log_debug(r->connection->log, "log handler: %s" _ line); + write(1, line, len); return NGX_OK; diff --git a/src/http/ngx_http_core.c b/src/http/ngx_http_core.c index a0555e378..e4f97eef7 100644 --- a/src/http/ngx_http_core.c +++ b/src/http/ngx_http_core.c @@ -105,10 +105,10 @@ static int ngx_http_core_translate_handler(ngx_http_request_t *r) ngx_log_debug(r->connection->log, "HTTP filename: '%s'" _ r->file.name.data); -#if (WIN32) +#if (WIN9X) - /* There is no way to open file or directory in Win32 with - one syscall: CreateFile() returns ERROR_ACCESS_DENIED on directory, + /* There is no way to open file or directory in Win9X with + one syscall: Win9X has not FILE_FLAG_BACKUP_SEMANTICS flag. so we need to check its type before opening */ #if 0 /* OLD: ngx_file_type() is to be removed */ @@ -138,7 +138,7 @@ static int ngx_http_core_translate_handler(ngx_http_request_t *r) if (r->file.fd == NGX_INVALID_FILE) { err = ngx_errno; ngx_log_error(NGX_LOG_ERR, r->connection->log, ngx_errno, - "ngx_http_static_handler: " + "ngx_http_core_handler: " ngx_open_file_n " %s failed", r->file.name.data); if (err == NGX_ENOENT) @@ -150,12 +150,12 @@ static int ngx_http_core_translate_handler(ngx_http_request_t *r) if (!r->file.info_valid) { if (ngx_stat_fd(r->file.fd, &r->file.info) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_ERR, r->connection->log, ngx_errno, - "ngx_http_static_handler: " + "ngx_http_core_handler: " ngx_stat_fd_n " %s failed", r->file.name.data); if (ngx_close_file(r->file.fd) == NGX_FILE_ERROR) ngx_log_error(NGX_LOG_ERR, r->connection->log, ngx_errno, - "ngx_http_static_handler: " + "ngx_http_core_handler: " ngx_close_file_n " %s failed", r->file.name.data); return NGX_HTTP_INTERNAL_SERVER_ERROR; @@ -168,10 +168,10 @@ static int ngx_http_core_translate_handler(ngx_http_request_t *r) if (ngx_is_dir(r->file.info)) { ngx_log_debug(r->connection->log, "HTTP DIR: '%s'" _ r->file.name.data); -#if !(WIN32) +#if !(WIN9X) if (ngx_close_file(r->file.fd) == NGX_FILE_ERROR) ngx_log_error(NGX_LOG_ERR, r->connection->log, ngx_errno, - "ngx_http_static_handler: " + "ngx_http_core_handler: " ngx_close_file_n " %s failed", r->file.name.data); #endif |