From: Anatol Belski <ab@php.net>
Date: Sat, 21 Feb 2015 13:16:06 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7aec946ddb8b295c7db149774d1e6d28981198bc;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  revisit fix for bug #65272

Conflicts:
	ext/standard/file.c
---

7aec946ddb8b295c7db149774d1e6d28981198bc
diff --cc ext/standard/file.c
index 2d2bb27808,85f35d1323..3599313a71
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@@ -359,12 -364,8 +359,8 @@@ PHP_FUNCTION(flock
  	/* flock_values contains all possible actions if (operation & 4) we won't block on the lock */
  	act = flock_values[act - 1] | (operation & PHP_LOCK_NB ? LOCK_NB : 0);
  	if (php_stream_lock(stream, act)) {
- #ifdef PHP_WIN32
- 		if (operation && errno == ERROR_INVALID_BLOCK && wouldblock) {
- #else
 -		if (operation && errno == EWOULDBLOCK && wouldblock && PZVAL_IS_REF(wouldblock)) {
 -			Z_LVAL_P(wouldblock) = 1;
 +		if (operation && errno == EWOULDBLOCK && wouldblock) {
- #endif
 +			ZVAL_LONG(wouldblock, 1);
  		}
  		RETURN_FALSE;
  	}