walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'acesso-patch-1'

This commit is contained in:
Tatsuhiro Tsujikawa 2015-01-23 21:17:33 +09:00
parent 064bfcc9d2 7ea8037ee1
commit 3a94ad709c
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/shrpx_config.cc
View File

@ -242,8 +242,17 @@ read_tls_ticket_key_file(const std::vector<std::string> &files) {
} }
FILE *open_file_for_write(const char *filename) { FILE *open_file_for_write(const char *filename) {
#if defined O_CLOEXEC
auto fd = open(filename, O_WRONLY | O_CLOEXEC | O_CREAT | O_TRUNC, auto fd = open(filename, O_WRONLY | O_CLOEXEC | O_CREAT | O_TRUNC,
S_IRUSR | S_IWUSR); S_IRUSR | S_IWUSR);
#else
auto fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
// We get race condition if execve is called at the same time.
if (fd != -1) {
util::make_socket_closeonexec(fd);
}
#endif
if (fd == -1) { if (fd == -1) {
LOG(ERROR) << "Failed to open " << filename LOG(ERROR) << "Failed to open " << filename
<< " for writing. Cause: " << strerror(errno); << " for writing. Cause: " << strerror(errno);