Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item13238: fixed content-type of response
  • Loading branch information
MichaelDaum committed Jan 29, 2015
1 parent bd08129 commit 5834aad
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion JsonRpcContrib/bin/jsonrpc
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
# Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# Copyright (C) 2011-2014 Michael Daum http://michaeldaumconsulting.com
# Copyright (C) 2011-2015 Michael Daum http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down
11 changes: 6 additions & 5 deletions JsonRpcContrib/data/System/JsonRpcContrib.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1418801119" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1422525481" format="1.1" version="1"}%
---+!! %TOPIC%
%SHORTDESCRIPTION%

Expand Down Expand Up @@ -219,14 +219,15 @@ If a namespace, method, or parameters are specified as part of a JSON-RPC reques
-->

| Author(s): | Michael Daum |
| Copyright: | © 2011-2014 Michael Daum http://michaeldaumconsulting.com |
| Copyright: | © 2011-2015 Michael Daum http://michaeldaumconsulting.com |
| License: | [[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]] |
| Release: | %$RELEASE% |
| Version: | %$VERSION% |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 17 Dec 2014: (2.20) | Foswikitask:Item13164: added support for gzip compression of http response<br />\
Foswikitask:Item13125: CGI changes for multi_param calls<br />\
Foswikitask:Item13065: Log jsonrpc events to Foswiki event.log |
| 29 Jan 2015: | Foswikitask:Item13238: fix content-type of response |
| 17 Dec 2014: | Foswikitask:Item13164: added support for gzip compression of http response<br />\
Foswikitask:Item13125: CGI changes for multi_param calls<br />\
Foswikitask:Item13065: Log jsonrpc events to Foswiki event.log |
| 28 Aug 2014: | don't use DEBUG constant to toggle local debug messages as it conflicts with Assert.pm |
| 11 Dec 2013: | removed dependency on JSON::XS |
| 30 May 2013: | added support for serialising objects, and rewrote some of the documentation (Foswiki:Main/CrawfordCurrie) |
Expand Down
6 changes: 3 additions & 3 deletions JsonRpcContrib/lib/Foswiki/Contrib/JsonRpcContrib.pm
@@ -1,6 +1,6 @@
# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
#
# JsonRpcContrib is Copyright (C) 2011-2014 Michael Daum http://michaeldaumconsulting.com
# JsonRpcContrib is Copyright (C) 2011-2015 Michael Daum http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -34,8 +34,8 @@ BEGIN {
=cut

our $VERSION = '2.20';
our $RELEASE = '2.20';
our $VERSION = '2.21';
our $RELEASE = '2.21';
our $SHORTDESCRIPTION = 'JSON-RPC interface for Foswiki';
our $NO_PREFS_IN_TOPIC = 1;
our $SERVER;
Expand Down
2 changes: 1 addition & 1 deletion JsonRpcContrib/lib/Foswiki/Contrib/JsonRpcContrib/Error.pm
@@ -1,6 +1,6 @@
# JSON-RPC for Foswiki
#
# Copyright (C) 2011-2014 Michael Daum http://michaeldaumconsulting.com
# Copyright (C) 2011-2015 Michael Daum http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down
Expand Up @@ -77,7 +77,7 @@ HERE
__END__
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
Copyright (C) 2011-2014 Michael Daum http://michaeldaumconsulting.com
Copyright (C) 2011-2015 Michael Daum http://michaeldaumconsulting.com
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down
@@ -1,6 +1,6 @@
# JSON-RPC for Foswiki
#
# Copyright (C) 2011-2014 Michael Daum http://michaeldaumconsulting.com
# Copyright (C) 2011-2015 Michael Daum http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions JsonRpcContrib/lib/Foswiki/Contrib/JsonRpcContrib/Response.pm
@@ -1,6 +1,6 @@
# JSON-RPC for Foswiki
#
# Copyright (C) 2011-2014 Michael Daum http://michaeldaumconsulting.com
# Copyright (C) 2011-2015 Michael Daum http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -48,7 +48,7 @@ sub print {
my $text = $this->encode();
my $hopts = {
'status' => $this->code() ? 500 : 200,
'Content-Type' => 'text/plain',
'Content-Type' => 'application/json',
};

my $encoding = $ENV{'HTTP_ACCEPT_ENCODING'} || 'gzip';
Expand Down
@@ -1,6 +1,6 @@
# JSON-RPC for Foswiki
#
# Copyright (C) 2011-2014 Michael Daum http://michaeldaumconsulting.com
# Copyright (C) 2011-2015 Michael Daum http://michaeldaumconsulting.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down

0 comments on commit 5834aad

Please sign in to comment.