Changeset 22404 for main/trunk/greenstone2/runtime-src

Timestamp:

07/14/10 15:45:00 (11 years ago)

Author:

mdewsnip

Message:

Added "newvalue.setencoding(1)" in two places in cgiutils::split_cgi_args(), otherwise multi-valued CGI arguments are not converted to Unicode in args_tounicode(). This is necessary if these values contain non-ASCII characters.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/cgiutils.cpp (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/cgiutils.cpp

@@ -369 +369 @@
 
       newvalue += "," + encode_commas(value);
+      newvalue.setencoding(1); // other encoding
       args.setarg (key, newvalue, cgiarg_t::cgi_arg);
     }
@@ -378 +379 @@
       if (args.lookupcgiarg(key).source == cgiarg_t::cgi_arg) newvalue += ",";
       newvalue += encode_commas(value);
+      newvalue.setencoding(1); // other encoding
       args.setarg (key, newvalue, cgiarg_t::cgi_arg);