summaryrefslogtreecommitdiff
path: root/src/os/unix
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-02-21 09:44:08 +0000
committerJonathan Kolb <jon@b0g.us>2011-02-21 09:44:08 +0000
commit88f3a051fd196735cdf47a67ddc14cf298cbfe63 (patch)
tree75152dc461e0b9a5f567451970ddf2abf324b988 /src/os/unix
parente52b136dd7a6ad34b361b8b48eef7cbaa48282ca (diff)
downloadnginx-88f3a051fd196735cdf47a67ddc14cf298cbfe63.tar.gz
Changes with nginx 0.9.5 21 Feb 2011v0.9.5
*) Change: now nginx uses a default listen backlog value -1 on Linux. Thanks to Andrei Nigmatulin. *) Feature: the "utf8" parameter of "geoip_country" and "geoip_city" directives. Thanks to Denis F. Latypoff. *) Bugfix: in a default "proxy_redirect" directive if "proxy_pass" directive has no URI part. Thanks to Maxim Dounin. *) Bugfix: an "error_page" directive did not work with nonstandard error codes; the bug had appeared in 0.8.53. Thanks to Maxim Dounin.
Diffstat (limited to 'src/os/unix')
-rw-r--r--src/os/unix/ngx_files.c2
-rw-r--r--src/os/unix/ngx_linux_config.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index c50e2014b..89ab8d6bc 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -245,7 +245,7 @@ ngx_set_file_time(u_char *name, ngx_fd_t fd, time_t s)
{
struct timeval tv[2];
- tv[0].tv_sec = s;
+ tv[0].tv_sec = ngx_time();
tv[0].tv_usec = 0;
tv[1].tv_sec = s;
tv[1].tv_usec = 0;
diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h
index cf45e54a1..556651c8e 100644
--- a/src/os/unix/ngx_linux_config.h
+++ b/src/os/unix/ngx_linux_config.h
@@ -88,7 +88,7 @@ typedef struct iocb ngx_aiocb_t;
#endif
-#define NGX_LISTEN_BACKLOG 511
+#define NGX_LISTEN_BACKLOG -1
#if defined TCP_DEFER_ACCEPT && !defined NGX_HAVE_DEFERRED_ACCEPT