commit 888ea84ce09973b5a7b50dc131fbdfa9fafa703d
author Igor Sysoev <igor@sysoev.ru> Sun Dec 24 18:13:06 2006 +0000
committer Igor Sysoev <igor@sysoev.ru> Sun Dec 24 18:13:06 2006 +0000
tree bbfa678333601ae1a66e3565ba02d7799683ee3e
parent b4887b289e5ef3fd18b135f970ff0f6d24f3d8a4

worker_rlimit_core supports size in K, M, and G

src/core/nginx.c

diff --git a/src/core/nginx.c b/src/core/nginx.c
index 26ed69e..47dafe1 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -109,7 +109,7 @@
 
     { ngx_string("worker_rlimit_core"),
       NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
+      ngx_conf_set_size_slot,
       0,
       offsetof(ngx_core_conf_t, rlimit_core),
       NULL },
@@ -620,7 +620,7 @@
     ccf->debug_points = NGX_CONF_UNSET;
 
     ccf->rlimit_nofile = NGX_CONF_UNSET;
-    ccf->rlimit_core = NGX_CONF_UNSET;
+    ccf->rlimit_core = NGX_CONF_UNSET_SIZE;
     ccf->rlimit_sigpending = NGX_CONF_UNSET;
 
     ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT;

src/core/ngx_cycle.h

diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index e1a35eb..677132e 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -68,8 +68,8 @@
      ngx_int_t                debug_points;
 
      ngx_int_t                rlimit_nofile;
-     ngx_int_t                rlimit_core;
      ngx_int_t                rlimit_sigpending;
+     size_t                   rlimit_core;
 
      int                      priority;
 

src/os/unix/ngx_process_cycle.c

diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index a262ba5..da4828f 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -787,7 +787,7 @@
             }
         }
 
-        if (ccf->rlimit_core != NGX_CONF_UNSET) {
+        if (ccf->rlimit_core != NGX_CONF_UNSET_SIZE) {
             rlmt.rlim_cur = (rlim_t) ccf->rlimit_core;
             rlmt.rlim_max = (rlim_t) ccf->rlimit_core;