diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2002-04-14 08:18:55 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2002-04-14 08:18:55 +0000 |
| commit | d5158c20a47509c54f4635fb7ecf7e8d88ca5c79 (patch) | |
| tree | ced52633cdcc45c64839dec2811071252f55cda7 | |
| parent | 7c2811e1ab1eea7f73d1ddf8c257a9493a91f49b (diff) | |
| download | php-git-d5158c20a47509c54f4635fb7ecf7e8d88ca5c79.tar.gz | |
fixed error output handler when 'pass' is choosed as output encoding.
| -rw-r--r-- | ext/mbstring/mbstring.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index a776d4cb04..67a4501474 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1536,6 +1536,10 @@ PHP_FUNCTION(mb_output_handler) mbfl_buffer_converter_delete(MBSTRG(outconv) TSRMLS_CC); MBSTRG(outconv) = NULL; } + if (encoding == mbfl_no_encoding_pass) { + RETVAL_STRING(arg_string, 1); + return; + } /* if content-type is not yet set, set it and activate the converter */ if (SG(sapi_headers).send_default_content_type ) { mimetype = SG(default_mimetype) ? SG(default_mimetype) : SAPI_DEFAULT_MIMETYPE; |