fixed error output handler when 'pass' is choosed as output encoding.

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 7868a8b073528c3125a8afb02ab973d02efc96fa..6fd7508ab207f4a94a3d71c6d51f342807552cd0 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1472,6 +1472,10 @@ PHP_FUNCTION(mb_output_handler)
                        mbfl_buffer_converter_delete(MBSTRG(outconv));
                        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;