com php-src: Fix possibly unclosed <stream> tags: sapi/phpdbg/p hpdbg_io.c sapi/phpdbg/phpdbg_out.c

From: Date: Tue, 28 Oct 2014 16:25:45 +0000
Subject: com php-src: Fix possibly unclosed <stream> tags: sapi/phpdbg/p hpdbg_io.c sapi/phpdbg/phpdbg_out.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82743@lists.php.net to get a copy of this message
Commit: cc3587f4a30a3a33f6043c919cf8ef11ba33087b Author: Bob Weinand <bobwei9@hotmail.com> Tue, 28 Oct 2014 13:20:43 +0100 Parents: 79c66e7cd20e9e89c932781c93e2c880a6318ecd Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cc3587f4a30a3a33f6043c919cf8ef11ba33087b Log: Fix possibly unclosed <stream> tags Changed paths: M sapi/phpdbg/phpdbg_io.c M sapi/phpdbg/phpdbg_out.c Diff: diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c index 6908a68..a2a5c59 100644 --- a/sapi/phpdbg/phpdbg_io.c +++ b/sapi/phpdbg/phpdbg_io.c @@ -187,10 +187,6 @@ PHPDBG_API int phpdbg_mixed_read(int sock, char *ptr, int len, int tmo TSRMLS_DC PHPDBG_API int phpdbg_mixed_write(int sock, const char *ptr, int len TSRMLS_DC) { - if (PHPDBG_G(flags) & PHPDBG_DISCARD_OUTPUT) { - return 0; - } - if (PHPDBG_G(flags) & PHPDBG_IS_REMOTE) { return phpdbg_send_bytes(sock, ptr, len); } diff --git a/sapi/phpdbg/phpdbg_out.c b/sapi/phpdbg/phpdbg_out.c index 365708c..7e1dc7b 100644 --- a/sapi/phpdbg/phpdbg_out.c +++ b/sapi/phpdbg/phpdbg_out.c @@ -1168,6 +1168,10 @@ PHPDBG_API int phpdbg_output_err_buf(const char *tag, const char *xmlfmt, const va_list args; int errbuf_active = PHPDBG_G(err_buf).active; + if (PHPDBG_G(flags) & PHPDBG_DISCARD_OUTPUT) { + return 0; + } + PHPDBG_G(err_buf).active = 0; #ifdef ZTS @@ -1188,6 +1192,10 @@ PHPDBG_API int phpdbg_print(int type TSRMLS_DC, int fd, const char *tag, const c va_list args; int len; + if (PHPDBG_G(flags) & PHPDBG_DISCARD_OUTPUT) { + return 0; + } + va_start(args, strfmt); len = phpdbg_vprint(type TSRMLS_CC, fd, tag, xmlfmt, strfmt, args); va_end(args); @@ -1198,6 +1206,10 @@ PHPDBG_API int phpdbg_print(int type TSRMLS_DC, int fd, const char *tag, const c PHPDBG_API int phpdbg_xml_internal(int fd TSRMLS_DC, const char *fmt, ...) { int len = 0; + if (PHPDBG_G(flags) & PHPDBG_DISCARD_OUTPUT) { + return 0; + } + if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) { va_list args; char *buffer; @@ -1243,6 +1255,10 @@ PHPDBG_API int phpdbg_out_internal(int fd TSRMLS_DC, const char *fmt, ...) { int buflen; int len = 0; + if (PHPDBG_G(flags) & PHPDBG_DISCARD_OUTPUT) { + return 0; + } + va_start(args, fmt); buflen = phpdbg_xml_vasprintf(&buffer, fmt, 0, args TSRMLS_CC); va_end(args);

« previous php.cvs (#82743) next »