From 65255e8cff64819ee45cfcbcebb049abf4f1f756 Mon Sep 17 00:00:00 2001 From: Max Kanat-Alexander Date: Fri, 26 Feb 2010 23:49:34 -0800 Subject: Bug 547601: Make the JSON-RPC interface return UTF-8 data correctly. r=dkl, a=mkanat --- Bugzilla/WebService/Server/JSONRPC.pm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'Bugzilla') diff --git a/Bugzilla/WebService/Server/JSONRPC.pm b/Bugzilla/WebService/Server/JSONRPC.pm index cc3e8058e..35eda1af1 100644 --- a/Bugzilla/WebService/Server/JSONRPC.pm +++ b/Bugzilla/WebService/Server/JSONRPC.pm @@ -35,13 +35,23 @@ sub new { Bugzilla->_json_server($self); $self->dispatch(WS_DISPATCH); $self->return_die_message(1); - $self->json->allow_blessed(1); - $self->json->convert_blessed(1); # Default to JSON-RPC 1.0 $self->version(0); return $self; } +sub create_json_coder { + my $self = shift; + my $json = $self->SUPER::create_json_coder(@_); + $json->allow_blessed(1); + $json->convert_blessed(1); + # This may seem a little backwards, but what this really means is + # "don't convert our utf8 into byte strings, just leave it as a + # utf8 string." + $json->utf8(0) if Bugzilla->params->{'utf8'}; + return $json; +} + # Override the JSON::RPC method to return our CGI object instead of theirs. sub cgi { return Bugzilla->cgi; } -- cgit v1.2.3-24-g4f1b