cvs: php4(PHP_4_2_0) /ext/mbstring mbstring.c

hirokawa Sun Apr 14 04:12:37 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/mbstring mbstring.c Log: fixed error output handler when 'pass' is choosed as output encoding. Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.48.2.3 php4/ext/mbstring/mbstring.c:1.48.2.4 --- php4/ext/mbstring/mbstring.c:1.48.2.3 Fri Apr 12 11:07:48 2002 +++ php4/ext/mbstring/mbstring.c Sun Apr 14 04:12:36 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.48.2.3 2002/04/12 15:07:48 hirokawa Exp $ */ +/* $Id: mbstring.c,v 1.48.2.4 2002/04/14 08:12:36 hirokawa Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -1472,6 +1472,10 @@ 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;