diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2014-11-06 10:19:45 -0800 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2014-11-06 10:19:45 -0800 |
| commit | 2375d659d7ba006429d4b3a28cf8a158f24b30db (patch) | |
| tree | 608223966abbd29a02080b3cd99ca4847149c10a /sapi/phpdbg/phpdbg_io.c | |
| parent | 50756b515c76bb9c43a01bfce03207906f596005 (diff) | |
| parent | 8fccf0bac9eab67412612b2df14da58b9129c6b2 (diff) | |
| download | php-git-2375d659d7ba006429d4b3a28cf8a158f24b30db.tar.gz | |
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src: (142 commits)
Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
Update NEWS
Fixed bug #68331 - This was partial patch for https://wiki.php.net/rfc/session-lock-ini
fix dir separator in test
arg1-3 are not variable names to use; removed useless buffer variable
update NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
Initialize the offset table - PCRE may sometimes miss offsets
set default response code to 200
set default response code to 200
set default response code to 200
Fixed bug #66584 Segmentation fault on statement deallocation
Add credit
fix ZTS build
Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
Fixed Bug #68104 (Segfault while pre-evaluating a disabled function)
Temporarily disable wait/xml protocol...
don't try to send in the test results until we restored qa.php.net
Fix uninitialized value...
...
Diffstat (limited to 'sapi/phpdbg/phpdbg_io.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_io.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c index 6908a687d7..a2a5c5969f 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); } |