cvs: php4 /ext/mbstring mbstring.c
| From: | Rui Hirokawa | Date: | Sun, 14 Apr 2002 08:18:55 +0000 |
| Subject: | cvs: php4 /ext/mbstring mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11131@lists.php.net to get a copy of this message | ||
hirokawa Sun Apr 14 04:18:55 2002 EDT
Modified files:
/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.61 php4/ext/mbstring/mbstring.c:1.62
--- php4/ext/mbstring/mbstring.c:1.61 Fri Apr 12 12:17:15 2002
+++ php4/ext/mbstring/mbstring.c Sun Apr 14 04:18:55 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.61 2002/04/12 16:17:15 helly Exp $ */
+/* $Id: mbstring.c,v 1.62 2002/04/14 08:18:55 hirokawa Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -1536,6 +1536,10 @@
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;