aboutsummaryrefslogtreecommitdiff
path: root/src/os/unix/ngx_linux_init.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2004-11-20 19:52:20 +0000
committerIgor Sysoev <igor@sysoev.ru>2004-11-20 19:52:20 +0000
commitd43bee8ee939992404d59ae0fec248ce46abecb0 (patch)
tree6eb79a6902f147bedb8c85350cbdc68543115907 /src/os/unix/ngx_linux_init.c
parent13376e1538e2b29e436805c626f6837b34a482c5 (diff)
downloadnginx-d43bee8ee939992404d59ae0fec248ce46abecb0.tar.gz
nginx-d43bee8ee939992404d59ae0fec248ce46abecb0.zip
nginx-0.1.8-RELEASE importrelease-0.1.8
*) Bugfix: in the ngx_http_autoindex_module if the long file names were in the listing. *) Feature: the "^~" modifier in the location directive. *) Feature: the proxy_max_temp_file_size directive.
Diffstat (limited to 'src/os/unix/ngx_linux_init.c')
-rw-r--r--src/os/unix/ngx_linux_init.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/os/unix/ngx_linux_init.c b/src/os/unix/ngx_linux_init.c
index 3c7d34483..397d342f0 100644
--- a/src/os/unix/ngx_linux_init.c
+++ b/src/os/unix/ngx_linux_init.c
@@ -30,8 +30,9 @@ ngx_os_io_t ngx_os_io = {
ngx_int_t ngx_os_init(ngx_log_t *log)
{
- int name[2];
- size_t len;
+ int name[2];
+ size_t len;
+ ngx_err_t err;
name[0] = CTL_KERN;
name[1] = KERN_OSTYPE;
@@ -58,10 +59,16 @@ ngx_int_t ngx_os_init(ngx_log_t *log)
name[1] = KERN_RTSIGMAX;
len = sizeof(ngx_linux_rtsig_max);
if (sysctl(name, sizeof(name), &ngx_linux_rtsig_max, &len, NULL, 0) == -1) {
- ngx_log_error(NGX_LOG_INFO, log, ngx_errno,
- "sysctl(KERN_RTSIGMAX) failed");
- ngx_linux_rtsig_max = 0;
+ err = ngx_errno;
+
+ if (err != NGX_ENOTDIR) {
+ ngx_log_error(NGX_LOG_ALERT, log, err,
+ "sysctl(KERN_RTSIGMAX) failed");
+ return NGX_ERROR;
+ }
+
+ ngx_linux_rtsig_max = 0;
}
ngx_init_setproctitle(log);