diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2015-02-03 14:04:03 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2015-02-03 14:04:03 +0900 |
| commit | 4dd7851208af77588b55bfcb4987f6fc16217784 (patch) | |
| tree | 8a4cad874046c7109982a7b254f85440d80a6c30 | |
| parent | 2983ef3c4822c089d1e3de463c12bd8437125d6c (diff) | |
| parent | b41a6c6f055e87d87b42bfd87fbad14a23134e4e (diff) | |
| download | php-git-4dd7851208af77588b55bfcb4987f6fc16217784.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
| -rw-r--r-- | ext/session/mod_files.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 0ce73bd56c..195104f391 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -121,7 +121,8 @@ static void ps_files_close(ps_files *data) static void ps_files_open(ps_files *data, const char *key TSRMLS_DC) { char buf[MAXPATHLEN]; - struct stat sbuf; + struct stat sbuf; + int ret; if (data->fd < 0 || !data->lastkey || strcmp(key, data->lastkey)) { if (data->lastkey) { @@ -164,7 +165,9 @@ static void ps_files_open(ps_files *data, const char *key TSRMLS_DC) 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 |