cvs: php-src /main/streams streams.c
| From: | Sara Golemon | Date: | Fri, 14 Jul 2006 19:14:40 +0000 |
| Subject: | cvs: php-src /main/streams streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-39233@lists.php.net to get a copy of this message | ||
pollita Fri Jul 14 19:14:40 2006 UTC
Modified files:
/php-src/main/streams streams.c
Log:
#38105 (1/3) Backward logic, filter_product == IS_STRING means the wrapper HAS applied
pre-filtering
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.128&r2=1.129&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.128 php-src/main/streams/streams.c:1.129
--- php-src/main/streams/streams.c:1.128 Thu Jul 13 11:58:42 2006
+++ php-src/main/streams/streams.c Fri Jul 14 19:14:40 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.128 2006/07/13 11:58:42 tony2001 Exp $ */
+/* $Id: streams.c,v 1.129 2006/07/14 19:14:40 pollita Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -2303,7 +2303,7 @@
/* Output encoding on text mode streams defaults to utf8 unless specified in context parameter */
if (stream && strchr(implicit_mode, 't') && UG(unicode)) {
/* Only apply implicit unicode.to. filter if the wrapper didn't do it for us */
- if ((php_stream_filter_product(&stream->writefilters, IS_UNICODE) == IS_STRING) &&
+ if ((php_stream_filter_product(&stream->writefilters, IS_UNICODE) == IS_UNICODE)
&&
(strchr(implicit_mode, 'w') || strchr(implicit_mode, 'a') ||
strchr(implicit_mode, '+'))) {
char *encoding = (context && context->output_encoding) ? context->output_encoding
: "utf8";