MFH: - Use FD_CLOEXEC with fcntl() and make sure it is always defined

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index 8dcfca7976ed1dc0ebcde7d0784063939df03ad5..53188d871fa19fc07dc7a3fe3a479a53724f1549 100644 (file)
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -162,8 +162,11 @@ static void ps_files_open(ps_files *data, const char *key TSRMLS_DC)
                        flock(data->fd, LOCK_EX);
 
 #ifdef F_SETFD
-                       if (fcntl(data->fd, F_SETFD, 1)) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "fcntl(%d, F_SETFD, 1) failed: %s (%d)", data->fd, strerror(errno), errno);
+#ifndef FD_CLOEXEC
+#define FD_CLOEXEC 1
+#endif
+                       if (fcntl(data->fd, F_SETFD, FD_CLOEXEC)) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "fcntl(%d, F_SETFD, FD_CLOEXEC) failed: %s (%d)", data->fd, strerror(errno), errno);
                        }
 #endif
                } else {