diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-06-23 17:41:06 +0400 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-06-23 17:41:06 +0400 |
| commit | 85ef94ba857237882c7e68dea87a1dbc68a38fe7 (patch) | |
| tree | 1bc05e18adaabc75f91f1c7b34c7358e60b0efdc /src/core | |
| parent | 2e87bb645af1d3152c9961d49ca093d4cbfe630d (diff) | |
nginx-0.1.37-RELEASE importrelease-0.1.37
*) Change: now the "\n" is added to the end of the "nginx.pid" file.
*) Bugfix: the responses may be transferred not completely, if many
parts or the big parts were included by SSI.
*) Bugfix: if all backends had returned the 404 reponse and the
"http_404" parameter of the "proxy_next_upstream" or
"fastcgi_next_upstream" directives was used, then nginx started to
request all backends again.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_cycle.c | 2 | ||||
| -rw-r--r-- | src/core/ngx_string.c | 10 | ||||
| -rw-r--r-- | src/core/ngx_times.c | 6 |
4 files changed, 15 insertions, 5 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index 4e9ff796a..f9f1a061b 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.1.36" +#define NGINX_VER "nginx/0.1.37" #define NGINX_VAR "NGINX" #define NGX_NEWPID_EXT ".newbin" diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 57806437a..b67223a69 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -744,7 +744,7 @@ ngx_int_t ngx_create_pidfile(ngx_cycle_t *cycle, ngx_cycle_t *old_cycle) } if (!ngx_test_config) { - len = ngx_sprintf(pid, "%P", ngx_pid) - pid; + len = ngx_sprintf(pid, "%P%N", ngx_pid) - pid; if (ngx_write_file(&file, pid, len, 0) == NGX_ERROR) { return NGX_ERROR; diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c index 9cbf3c92a..e21a9fcdd 100644 --- a/src/core/ngx_string.c +++ b/src/core/ngx_string.c @@ -62,6 +62,7 @@ ngx_pstrdup(ngx_pool_t *pool, ngx_str_t *src) * %V pointer to ngx_str_t * %s null-terminated string * %Z '\0' + * %N '\n' * %c char * %% % * @@ -315,6 +316,15 @@ ngx_vsnprintf(u_char *buf, size_t max, const char *fmt, va_list args) continue; + case 'N': +#if (NGX_WIN32) + *buf++ = CR; +#endif + *buf++ = LF; + fmt++; + + continue; + case '%': *buf++ = '%'; fmt++; diff --git a/src/core/ngx_times.c b/src/core/ngx_times.c index f43987e85..3b0dc3759 100644 --- a/src/core/ngx_times.c +++ b/src/core/ngx_times.c @@ -60,11 +60,11 @@ ngx_thread_volatile ngx_str_t ngx_cached_http_log_time; static u_char cached_err_log_time[NGX_TIME_SLOTS] - [sizeof("1970/09/28 12:00:00")]; + [sizeof("1970/09/28 12:00:00")]; static u_char cached_http_time[NGX_TIME_SLOTS] - [sizeof("Mon, 28 Sep 1970 06:00:00 GMT")]; + [sizeof("Mon, 28 Sep 1970 06:00:00 GMT")]; static u_char cached_http_log_time[NGX_TIME_SLOTS] - [sizeof("28/Sep/1970:12:00:00 +0600")]; + [sizeof("28/Sep/1970:12:00:00 +0600")]; static char *week[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; |