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

Merge branch 'PHP-7.0' into PHP-7.1

Browse Source
This commit is contained in:
Bob Weinand 2016-11-20 14:18:54 +01:00
commit b7fee22e73
9 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_execute_API.c
View File

@ -1201,7 +1201,7 @@ static void zend_timeout_handler(int dummy) /* {{{ */
output_len = snprintf(log_buffer, sizeof(log_buffer), "\nFatal error: Maximum execution time of " ZEND_LONG_FMT "+" ZEND_LONG_FMT " seconds exceeded (terminated) in %s on line %d\n", EG(timeout_seconds), EG(hard_timeout), error_filename, error_lineno);
if (output_len > 0) {
write(2, log_buffer, MIN(output_len, sizeof(log_buffer)));
quiet_write(2, log_buffer, MIN(output_len, sizeof(log_buffer)));
}
_exit(1);
}

2
Zend/zend_portability.h
View File

@ -125,6 +125,8 @@
# define ZEND_IGNORE_VALUE(x) ((void) (x))
#endif
#define quiet_write(...) ZEND_IGNORE_VALUE(write(__VA_ARGS__))
/* all HAVE_XXX test have to be after the include of zend_config above */
#if defined(HAVE_LIBDL) && !defined(ZEND_WIN32)

2
sapi/fpm/fpm/fpm_log.c
View File

@ -467,7 +467,7 @@ int fpm_log_write(char *log_format) /* {{{ */
if (!test && strlen(buffer) > 0) {
buffer[len] = '\n';
write(fpm_log_fd, buffer, len + 1);
quiet_write(fpm_log_fd, buffer, len + 1);
}
return 0;

4
sapi/fpm/fpm/fpm_main.c
View File

@ -1864,7 +1864,7 @@ consult the installation file that came with this distribution, or visit \n\
if (fpm_globals.send_config_pipe[1]) {
int writeval = 0;
zlog(ZLOG_DEBUG, "Sending \"0\" (error) to parent via fd=%d", fpm_globals.send_config_pipe[1]);
write(fpm_globals.send_config_pipe[1], &writeval, sizeof(writeval));
quiet_write(fpm_globals.send_config_pipe[1], &writeval, sizeof(writeval));
close(fpm_globals.send_config_pipe[1]);
}
return FPM_EXIT_CONFIG;
@ -1873,7 +1873,7 @@ consult the installation file that came with this distribution, or visit \n\
if (fpm_globals.send_config_pipe[1]) {
int writeval = 1;
zlog(ZLOG_DEBUG, "Sending \"1\" (OK) to parent via fd=%d", fpm_globals.send_config_pipe[1]);
write(fpm_globals.send_config_pipe[1], &writeval, sizeof(writeval));
quiet_write(fpm_globals.send_config_pipe[1], &writeval, sizeof(writeval));
close(fpm_globals.send_config_pipe[1]);
}
fpm_is_running = 1;

2
sapi/fpm/fpm/fpm_signals.c
View File

@ -174,7 +174,7 @@ static void sig_handler(int signo) /* {{{ */
saved_errno = errno;
s = sig_chars[signo];
write(sp[1], &s, sizeof(s));
quiet_write(sp[1], &s, sizeof(s));
errno = saved_errno;
}
/* }}} */

4
sapi/fpm/fpm/zlog.c
View File

@ -186,11 +186,11 @@ void vzlog(const char *function, int line, int flags, const char *fmt, va_list a
#endif
{
buf[len++] = '\n';
write(zlog_fd > -1 ? zlog_fd : STDERR_FILENO, buf, len);
quiet_write(zlog_fd > -1 ? zlog_fd : STDERR_FILENO, buf, len);
}
if (zlog_fd != STDERR_FILENO && zlog_fd != -1 && !launched && (flags & ZLOG_LEVEL_MASK) >= ZLOG_NOTICE) {
write(STDERR_FILENO, buf, len);
quiet_write(STDERR_FILENO, buf, len);
}
}
/* }}} */

1
sapi/phpdbg/phpdbg.c
View File

@ -29,6 +29,7 @@
#include "zend_alloc.h"
#include "phpdbg_eol.h"
#include "phpdbg_print.h"
#include "phpdbg_help.h"
#include "ext/standard/basic_functions.h"

2
sapi/phpdbg/phpdbg.h
View File

@ -116,8 +116,6 @@
#define memcpy(...) memcpy_tmp(__VA_ARGS__)
#endif
#define quiet_write(...) ZEND_IGNORE_VALUE(write(__VA_ARGS__))
#if !defined(PHPDBG_WEBDATA_TRANSFER_H) && !defined(PHPDBG_WEBHELPER_H)
#ifdef ZTS

2
sapi/phpdbg/phpdbg_io.c
View File

@ -203,7 +203,7 @@ static int phpdbg_output_pager(int sock, const char *ptr, int len) {
if (memchr(p, '\n', endp - p)) {
char buf[PHPDBG_MAX_CMD];
write(sock, ZEND_STRL("\r---Type <return> to continue or q <return> to quit---"));
quiet_write(sock, ZEND_STRL("\r---Type <return> to continue or q <return> to quit---"));
phpdbg_consume_stdin_line(buf);
if (*buf == 'q') {
break;