summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2017-12-17 20:05:01 +0000
committerdakkar <dakkar@thenautilus.net>2017-12-17 20:05:01 +0000
commit134f1d4be4194125c3a687b7ecfd6588426716a6 (patch)
tree411892105433def4ce2db316b85744c9d55d7568
parentrewrite URLs to allow optional '.view' (diff)
downloadUltramarine-134f1d4be4194125c3a687b7ecfd6588426716a6.tar.gz
Ultramarine-134f1d4be4194125c3a687b7ecfd6588426716a6.tar.bz2
Ultramarine-134f1d4be4194125c3a687b7ecfd6588426716a6.zip
Subsonic returns text/xml
why not application/xml, dammit?
-rw-r--r--lib/Ultramarine/Middleware/SetContentType.pm62
-rw-r--r--lib/Ultramarine/Serialiser/XML.pm62
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Ultramarine/Middleware/SetContentType.pm6 b/lib/Ultramarine/Middleware/SetContentType.pm6
index a3fab94..600e2ae 100644
--- a/lib/Ultramarine/Middleware/SetContentType.pm6
+++ b/lib/Ultramarine/Middleware/SetContentType.pm6
@@ -4,7 +4,7 @@ use Cro::HTTP::BodySerializerSelector;
use Ultramarine::Serialiser::XML;
my %types = (
- xml => 'application/xml',
+ xml => 'text/xml',
json => 'application/json',
jsonp => 'application/javascript',
);
diff --git a/lib/Ultramarine/Serialiser/XML.pm6 b/lib/Ultramarine/Serialiser/XML.pm6
index 7bb14b8..2d04427 100644
--- a/lib/Ultramarine/Serialiser/XML.pm6
+++ b/lib/Ultramarine/Serialiser/XML.pm6
@@ -7,7 +7,7 @@ class Ultramarine::Serialiser::XML
method is-applicable(Cro::HTTP::Message $message, $body --> Bool) {
with $message.content-type {
- (.type eq 'application' && .subtype eq 'xml' || .suffix eq 'xml') &&
+ (.type eq 'application'|'text' && .subtype eq 'xml' || .suffix eq 'xml') &&
($body ~~ Map || $body ~~ List)
}
else {