pollita Fri Mar 24 22:27:13 2006 UTC
Modified files:
/php-src/ext/standard streamsfuncs.c
Log:
Allow bidirectional encoding option via single context param
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.70&r2=1.71&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.70
php-src/ext/standard/streamsfuncs.c:1.71
--- php-src/ext/standard/streamsfuncs.c:1.70 Fri Mar 24 21:37:42 2006
+++ php-src/ext/standard/streamsfuncs.c Fri Mar 24 22:27:13 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.70 2006/03/24 21:37:42 pollita Exp $ */
+/* $Id: streamsfuncs.c,v 1.71 2006/03/24 22:27:13 pollita Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -926,6 +926,20 @@
if (SUCCESS == zend_hash_find(Z_ARRVAL_P(params), "options",
sizeof("options"), (void**)&tmp)) {
parse_context_options(context, *tmp TSRMLS_CC);
}
+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(params), "encoding",
sizeof("encoding"), (void**)&tmp)) {
+ zval strval = **tmp;
+
+ if (context->input_encoding) {
+ efree(context->input_encoding);
+ }
+ if (context->output_encoding) {
+ efree(context->output_encoding);
+ }
+ zval_copy_ctor(&strval);
+ convert_to_string(&strval);
+ context->input_encoding = Z_STRVAL(strval);
+ context->output_encoding = estrdup(Z_STRVAL(strval));
+ }
if (SUCCESS == zend_hash_find(Z_ARRVAL_P(params), "input_encoding",
sizeof("input_encoding"), (void**)&tmp)) {
zval strval = **tmp;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
