mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-21 19:51:50 +00:00
Set CLOEXEC on epoll and regular file fds
This commit is contained in:
1 parent
fbc56f4adf
commit
ca4c2c6c41
3 files changed
+6
-4
No files matched your search
+3
-2
@@ -1144,7 +1144,7 @@ static void p_list(const char *dir, void (*fn)(const char *, void *),
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void *p_open(const char *path, int flags) {
|
static void *p_open(const char *path, int flags) {
|
||||||
const char *mode = flags == MG_FS_READ ? "rb" : "a+b";
|
const char *mode = flags == MG_FS_READ ? "rbe" : "a+be"; // e for CLOEXEC
|
||||||
#if MG_ARCH == MG_ARCH_WIN32
|
#if MG_ARCH == MG_ARCH_WIN32
|
||||||
wchar_t b1[MG_PATH_MAX], b2[10];
|
wchar_t b1[MG_PATH_MAX], b2[10];
|
||||||
MultiByteToWideChar(CP_UTF8, 0, path, -1, b1, sizeof(b1) / sizeof(b1[0]));
|
MultiByteToWideChar(CP_UTF8, 0, path, -1, b1, sizeof(b1) / sizeof(b1[0]));
|
||||||
@@ -3806,7 +3806,8 @@ void mg_mgr_free(struct mg_mgr *mgr) {
|
|||||||
void mg_mgr_init(struct mg_mgr *mgr) {
|
void mg_mgr_init(struct mg_mgr *mgr) {
|
||||||
memset(mgr, 0, sizeof(*mgr));
|
memset(mgr, 0, sizeof(*mgr));
|
||||||
#if MG_ENABLE_EPOLL
|
#if MG_ENABLE_EPOLL
|
||||||
if ((mgr->epoll_fd = epoll_create1(0)) < 0) MG_ERROR(("epoll: %d", errno));
|
if ((mgr->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0)
|
||||||
|
MG_ERROR(("epoll_create1 errno %d", errno));
|
||||||
#else
|
#else
|
||||||
mgr->epoll_fd = -1;
|
mgr->epoll_fd = -1;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+1
-1
@@ -166,7 +166,7 @@ static void p_list(const char *dir, void (*fn)(const char *, void *),
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void *p_open(const char *path, int flags) {
|
static void *p_open(const char *path, int flags) {
|
||||||
const char *mode = flags == MG_FS_READ ? "rb" : "a+b";
|
const char *mode = flags == MG_FS_READ ? "rbe" : "a+be"; // e for CLOEXEC
|
||||||
#if MG_ARCH == MG_ARCH_WIN32
|
#if MG_ARCH == MG_ARCH_WIN32
|
||||||
wchar_t b1[MG_PATH_MAX], b2[10];
|
wchar_t b1[MG_PATH_MAX], b2[10];
|
||||||
MultiByteToWideChar(CP_UTF8, 0, path, -1, b1, sizeof(b1) / sizeof(b1[0]));
|
MultiByteToWideChar(CP_UTF8, 0, path, -1, b1, sizeof(b1) / sizeof(b1[0]));
|
||||||
|
|||||||
@@ -238,7 +238,8 @@ void mg_mgr_free(struct mg_mgr *mgr) {
|
|||||||
void mg_mgr_init(struct mg_mgr *mgr) {
|
void mg_mgr_init(struct mg_mgr *mgr) {
|
||||||
memset(mgr, 0, sizeof(*mgr));
|
memset(mgr, 0, sizeof(*mgr));
|
||||||
#if MG_ENABLE_EPOLL
|
#if MG_ENABLE_EPOLL
|
||||||
if ((mgr->epoll_fd = epoll_create1(0)) < 0) MG_ERROR(("epoll: %d", errno));
|
if ((mgr->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0)
|
||||||
|
MG_ERROR(("epoll_create1 errno %d", errno));
|
||||||
#else
|
#else
|
||||||
mgr->epoll_fd = -1;
|
mgr->epoll_fd = -1;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in new issue
Block a user