diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-02 18:52:58 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-02 18:52:58 +0000 |
| commit | f815b687c0a616abdb04012dfde1e03e1d1d9f73 (patch) | |
| tree | b4c953e98be42e0c3f213e5dd4b670fc049017f7 /main/app.c | |
| parent | e99a6737cc22f6e646b348a0d966656cc146ea5b (diff) | |
Merged revisions 215567 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r215567 | tilghman | 2009-09-02 13:37:25 -0500 (Wed, 02 Sep 2009) | 9 lines
Close up to the soft open file limit (same on Linux, but varies drastically on OS X).
Also, a Makefile fix for Darwin (OS X).
(closes issue #14542)
Reported by: jtodd
Patches:
20090901__issue14542.diff.txt uploaded by tilghman (license 14)
Tested by: jtodd, tilghman
Change-type: bugfix
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@215570 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/app.c')
| -rw-r--r-- | main/app.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/app.c b/main/app.c index 46cacbd46..14cabe026 100644 --- a/main/app.c +++ b/main/app.c @@ -1988,7 +1988,7 @@ void ast_close_fds_above_n(int n) struct rlimit rl; getrlimit(RLIMIT_NOFILE, &rl); null = open("/dev/null", O_RDONLY); - for (x = n + 1; x < rl.rlim_max; x++) { + for (x = n + 1; x < rl.rlim_cur; x++) { if (x != null) { /* Side effect of dup2 is that it closes any existing fd without error. * This prevents valgrind and other debugging tools from sending up |