diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-02-03 19:27:24 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-02-03 19:27:24 +0000 |
| commit | 0a81f9a0bd36deac8707949acbcf92f612b60e8e (patch) | |
| tree | 9d27dabd3dbcffd2c40ed1e3d68477f74f4d7d32 /ext/session/mod_files.c | |
| parent | c3cd2d33ca89a6b2188e29cfbb1451818fd60024 (diff) | |
| parent | 55cefb2814bde5815a92e8820fff45e037fa8d4f (diff) | |
| download | php-git-0a81f9a0bd36deac8707949acbcf92f612b60e8e.tar.gz | |
Merge branch 'master' into jsond
Diffstat (limited to 'ext/session/mod_files.c')
| -rw-r--r-- | ext/session/mod_files.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 561d216adf..2db5159d91 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -159,6 +159,7 @@ static void ps_files_open(ps_files *data, const char *key) #if !defined(O_NOFOLLOW) || !defined(PHP_WIN32) struct stat sbuf; #endif + int ret; if (data->fd < 0 || !data->lastkey || strcmp(key, data->lastkey)) { if (data->lastkey) { @@ -201,7 +202,9 @@ static void ps_files_open(ps_files *data, const char *key) return; } #endif - flock(data->fd, LOCK_EX); + do { + ret = flock(data->fd, LOCK_EX); + } while (ret == -1 && errno == EINTR); #ifdef F_SETFD # ifndef FD_CLOEXEC |