From: Rui Hirokawa <hirokawa@php.net>
Date: Sun, 14 Apr 2002 08:12:36 +0000 (+0000)
Subject: fixed error output handler when 'pass' is choosed as output encoding.
X-Git-Tag: php-4.2.0RC4~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7f90433782d2deec6c3c1d0e4e91b3ad4fb0e5d;p=php

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

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 7868a8b073..6fd7508ab2 100644
--- 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;