diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-02 09:44:02 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-02 09:44:02 +0000 |
| commit | 3e798c4a5f143ca46feab994d5f446c15aef8e98 (patch) | |
| tree | e1196b654c889dc5de45fda5c99a2d1873a4008f /sapi/phpdbg/phpdbg_io.c | |
| parent | e077735b03fd2339b2d663d29557cfb5ab2d5eff (diff) | |
| parent | 935b5cb11ed672c42b2a77e10be752702e474e7f (diff) | |
| download | php-git-3e798c4a5f143ca46feab994d5f446c15aef8e98.tar.gz | |
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src: (146 commits)
Flush stderr on win32 in cli_log_message
Fixed bug #73154
FIx bug #70213
Fix dom class can't be inherited by the internal class
Another try at making concat_003 more reliable
Fix flaky openssl_pkey_new test
Make Opcache tests using the cli server more reliable
Revert "Fix #73530: Unsetting result set may reset other result set"
define php_ap_map_http_request_error function for older httpd only
add old versions of httpd support
Disable AppVeyor fast_finish
Makes the sapi web server and curl tests more reliable
Fixes the curl tests to be more reliable in Travis CI
Interpretation of curl_setopt values for boolean parameters
Fixes #65689. PDO_Firebrid / exec() does not free allocated statement.
Fix alpn_ctx leaking in openssl
Fixed bug #73373 (deflate_add does not verify that output was not truncated)
Fix IS_UNDEF comparisons in opcache
Fixed bug #73704 (phpdbg shows the wrong line in files with shebang)
Increase timing quota for small string concat test
...
Diffstat (limited to 'sapi/phpdbg/phpdbg_io.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_io.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c index b2f4ba7c0d..65a14d0ccb 100644 --- a/sapi/phpdbg/phpdbg_io.c +++ b/sapi/phpdbg/phpdbg_io.c @@ -149,7 +149,7 @@ recv_once: #endif if (got_now == -1) { - quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, ZEND_STRL("Read operation timed out!\n")); + zend_quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, ZEND_STRL("Read operation timed out!\n")); return -1; } i -= got_now; @@ -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---")); + zend_quiet_write(sock, ZEND_STRL("\r---Type <return> to continue or q <return> to quit---")); phpdbg_consume_stdin_line(buf); if (*buf == 'q') { break; @@ -305,7 +305,7 @@ PHPDBG_API int phpdbg_create_listenable_socket(const char *addr, unsigned short wrote = snprintf(buf, 128, "Could not translate address '%s'", addr); buf[wrote] = '\0'; - quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, buf, strlen(buf)); + zend_quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, buf, strlen(buf)); return sock; } else { @@ -315,7 +315,7 @@ PHPDBG_API int phpdbg_create_listenable_socket(const char *addr, unsigned short wrote = snprintf(buf, 256, "Host '%s' not found. %s", addr, estrdup(gai_strerror(rc))); buf[wrote] = '\0'; - quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, buf, strlen(buf)); + zend_quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, buf, strlen(buf)); return sock; #ifndef PHP_WIN32 @@ -330,7 +330,7 @@ PHPDBG_API int phpdbg_create_listenable_socket(const char *addr, unsigned short wrote = sprintf(buf, "Unable to create socket"); buf[wrote] = '\0'; - quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, buf, strlen(buf)); + zend_quiet_write(PHPDBG_G(io)[PHPDBG_STDERR].fd, buf, strlen(buf)); return sock; } |