diff options
author | Ilia Alshanetsky <iliaa@php.net> | 2005-04-06 13:57:30 +0000 |
---|---|---|
committer | Ilia Alshanetsky <iliaa@php.net> | 2005-04-06 13:57:30 +0000 |
commit | a7ae41bf899fb22cda4008322e0847def49abeac (patch) | |
tree | 12e15a7c7720530359ad5da37564afeef1268275 /main/streams/plain_wrapper.c | |
parent | 997690b1325f8aeeb39eddb08ed53de17860a985 (diff) | |
download | php-git-a7ae41bf899fb22cda4008322e0847def49abeac.tar.gz |
Fixed bug #31363 (broken non-blocking flock()).
# Patch by ian at snork dot net
Diffstat (limited to 'main/streams/plain_wrapper.c')
-rw-r--r-- | main/streams/plain_wrapper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index baa4c95087..ad362cf45f 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -578,7 +578,7 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void return 0; } - if (!flock(fd, value) || (errno == EWOULDBLOCK && value & LOCK_NB)) { + if (!flock(fd, value)) { data->lock_flag = value; return 0; } else { |