Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  increase the polling period to not to break existing behaviours
This commit is contained in:
Anatol Belski 2014-09-29 17:28:27 +02:00
commit 231a311ecb

View File

@ -361,7 +361,7 @@ static size_t php_stdiop_read(php_stream *stream, char *buf, size_t count TSRMLS
if (0 == avail_read) {
usleep(100000);
}
} while (0 == avail_read && retry++ < 180);
} while (0 == avail_read && retry++ < 320);
/* Reduce the required data amount to what is available, otherwise read()
will block.*/