[asterisk-commits] tilghman: branch 1.6.2 r215570 - in /branches/1.6.2: ./ main/Makefile main/app.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Sep  2 13:52:58 2009
New Revision: 215570

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=215570
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/Makefile
    branches/1.6.2/main/app.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/main/Makefile?view=diff&rev=215570&r1=215569&r2=215570
==============================================================================
--- branches/1.6.2/main/Makefile (original)
+++ branches/1.6.2/main/Makefile Wed Sep  2 13:52:58 2009
@@ -61,6 +61,7 @@
   ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
     ASTLINK=-Wl,-dynamic
   endif
+  ASTLINK+=-Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
 else
 # These are used for all but Darwin
   ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)

Modified: branches/1.6.2/main/app.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/main/app.c?view=diff&rev=215570&r1=215569&r2=215570
==============================================================================
--- branches/1.6.2/main/app.c (original)
+++ branches/1.6.2/main/app.c Wed Sep  2 13:52:58 2009
@@ -1988,7 +1988,7 @@
 	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