clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

MFH: Fixed bug #47893 (CLI aborts on non blocking stdout)

Browse Source
This commit is contained in:
Arnaud Le Blanc 2009-04-07 16:11:19 +00:00
parent f0b4c7be5c
commit 95b308949c
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sapi/cli/php_cli.c
View File

@ -91,6 +91,12 @@
#include "php_getopt.h"
#ifndef PHP_WIN32
# define php_select(m, r, w, e, t) select(m, r, w, e, t)
#else
# include "win32/select.h"
#endif
PHPAPI extern char *php_ini_opened_path;
PHPAPI extern char *php_ini_scanned_files;
@ -224,15 +230,38 @@ static void print_extensions(TSRMLS_D) /* {{{ */
#define STDOUT_FILENO 1
#endif
static inline int sapi_cli_select(int fd)
{
fd_set wfd, dfd;
struct timeval tv;
int ret;
FD_ZERO(&wfd);
FD_ZERO(&dfd);
PHP_SAFE_FD_SET(fd, &wfd);
tv.tv_sec = FG(default_socket_timeout);
tv.tv_usec = 0;
ret = php_select(fd+1, &dfd, &wfd, &dfd, &tv);
return ret != -1;
}
static inline size_t sapi_cli_single_write(const char *str, uint str_length) /* {{{ */
{
#ifdef PHP_WRITE_STDOUT
long ret;
do {
ret = write(STDOUT_FILENO, str, str_length);
} while (ret <= 0 && errno == EAGAIN && sapi_cli_select(STDOUT_FILENO));
if (ret <= 0) {
return 0;
}
return ret;
#else
size_t ret;