Make sure Application::InitializeBase() when RLIMIT_NOFILE is set to "unlimited".

Refs #6257

diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index 92a1541522d734d4dd0b005eb6afac4d59b4938b..802089567cf0431d1e429014bf9c798177db3d66 100644 (file)
--- a/lib/base/application.cpp
+++ b/lib/base/application.cpp
@@ -110,11 +110,17 @@ void Application::InitializeBase(void)
 {
 #ifndef _WIN32
        rlimit rl;
-       if (getrlimit(RLIMIT_NOFILE, &rl) >= 0)
-               for (rlim_t i = 3; i < rl.rlim_max; i++) {
+       if (getrlimit(RLIMIT_NOFILE, &rl) >= 0) {
+               rlim_t maxfds = rl.rlim_max;
+
+               if (maxfds == RLIM_INFINITY)
+                       maxfds = 65536;
+
+               for (rlim_t i = 3; i < maxfds; i++) {
                        if (close(i) >= 0)
                                std::cerr << "Closed FD " << i << " which we inherited from our parent process." << std::endl;
                }
+       }
 #endif /* _WIN32 */
 
        Utility::ExecuteDeferredInitializers();