From d5158c20a47509c54f4635fb7ecf7e8d88ca5c79 Mon Sep 17 00:00:00 2001 From: Rui Hirokawa Date: Sun, 14 Apr 2002 08:18:55 +0000 Subject: [PATCH] fixed error output handler when 'pass' is choosed as output encoding. --- ext/mbstring/mbstring.c | 4 ++++ 1 file changed, 4 insertions(+) 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; -- 2.50.1