Merge branch 'PHP-5.6'

* PHP-5.6:
  revisit fix for bug #65272

Conflicts:
	ext/standard/file.c

diff --cc ext/standard/file.c
index 2d2bb2780842fb5a1e1f8b6884c20a12eee004e8,85f35d132379da1c1797c855ce501fe12967cb87..3599313a7130ec5004c7c505f63c8d2bafe45165
--- 1/ext/standard/file.c
--- 2/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;
        }

diff --cc ext/standard/flock_compat.c
Simple merge