diff --git a/include/cgimap/mime_types.hpp b/include/cgimap/mime_types.hpp index 073af5feb..4e8a1082e 100644 --- a/include/cgimap/mime_types.hpp +++ b/include/cgimap/mime_types.hpp @@ -11,7 +11,7 @@ namespace mime { enum type { unspecified_type, // a "null" type, used to indicate no choice. text_plain, - text_xml, + application_xml, #ifdef HAVE_YAJL application_json, #endif diff --git a/src/api06/changeset_update_handler.cpp b/src/api06/changeset_update_handler.cpp index f8afbdf2f..3079abb17 100644 --- a/src/api06/changeset_update_handler.cpp +++ b/src/api06/changeset_update_handler.cpp @@ -56,7 +56,7 @@ changeset_update_responder::~changeset_update_responder() = default; changeset_update_sel_responder::~changeset_update_sel_responder() = default; changeset_update_handler::changeset_update_handler(request &req, osm_changeset_id_t id_) - : payload_enabled_handler(mime::text_xml, + : payload_enabled_handler(mime::application_xml, http::method::PUT | http::method::OPTIONS), id(id_) {} diff --git a/src/choose_formatter.cpp b/src/choose_formatter.cpp index cddb2f061..dd7fc1f0d 100644 --- a/src/choose_formatter.cpp +++ b/src/choose_formatter.cpp @@ -118,7 +118,8 @@ struct http_accept_grammar }; /* = lit("* / *") [_val = mime::any_type] - | lit("text/xml") [_val = mime::text_xml] + | lit("text/xml") [_val = mime::application_xml] + | lit("application/xml") [_val = mime::application_xml] #ifdef HAVE_YAJL | lit("application/json")[_val = mime::application_json] #endif @@ -262,7 +263,7 @@ shared_ptr create_formatter(request &req, shared_ptr out) { shared_ptr o_formatter; - if (best_type == mime::text_xml) { + if (best_type == mime::application_xml) { auto *xwriter = new xml_writer(out, true); o_formatter = shared_ptr(new xml_formatter(xwriter)); diff --git a/src/mime_types.cpp b/src/mime_types.cpp index 6453f6397..b787d246e 100644 --- a/src/mime_types.cpp +++ b/src/mime_types.cpp @@ -11,8 +11,8 @@ string to_string(type t) { return "*/*"; } else if (text_plain == t) { return "text/plain"; - } else if (text_xml == t) { - return "text/xml"; + } else if (application_xml == t) { + return "application/xml"; #ifdef HAVE_YAJL } else if (application_json == t) { return "application/json"; @@ -33,8 +33,10 @@ type parse_from(const std::string &name) { t = any_type; } else if (name == "text/plain") { t = text_plain; - } else if (name == "text/xml") { - t = text_xml; + } else if (name == "text/xml") { // alias according to RFC 7303, section 9.2 + t = application_xml; + } else if (name == "application/xml") { + t = application_xml; #ifdef HAVE_YAJL } else if (name == "application/json") { t = application_json; diff --git a/src/osm_responder.cpp b/src/osm_responder.cpp index 265ed0e9b..34eaad7f5 100644 --- a/src/osm_responder.cpp +++ b/src/osm_responder.cpp @@ -11,7 +11,7 @@ osm_responder::~osm_responder() = default; list osm_responder::types_available() const { list types; - types.push_back(mime::text_xml); + types.push_back(mime::application_xml); #ifdef HAVE_YAJL types.push_back(mime::application_json); #endif diff --git a/src/osmchange_responder.cpp b/src/osmchange_responder.cpp index 4bb0ee265..0efeb6330 100644 --- a/src/osmchange_responder.cpp +++ b/src/osmchange_responder.cpp @@ -222,7 +222,7 @@ osmchange_responder::~osmchange_responder() = default; list osmchange_responder::types_available() const { list types; - types.push_back(mime::text_xml); + types.push_back(mime::application_xml); return types; } diff --git a/src/process_request.cpp b/src/process_request.cpp index 279186e5a..73a4dc3c9 100644 --- a/src/process_request.cpp +++ b/src/process_request.cpp @@ -116,7 +116,7 @@ void respond_error(const http::exception &e, request &r) { if (error_format && al::iequals(error_format, "xml")) { r.status(200) - .add_header("Content-Type", "text/xml; charset=utf-8"); + .add_header("Content-Type", "application/xml; charset=utf-8"); ostringstream ostr; ostr << "\r\n" diff --git a/src/routes.cpp b/src/routes.cpp index 936abb80f..4e64e4375 100644 --- a/src/routes.cpp +++ b/src/routes.cpp @@ -275,7 +275,7 @@ routes::~routes() = default; namespace { /** * figures out the mime type from the path specification, e.g: a resource ending - * in .xml should be text/xml, .json should be application/json, etc... + * in .xml should be application/xml, .json should be application/json, etc... */ pair resource_mime_type(const string &path) { @@ -293,7 +293,7 @@ namespace { std::size_t xml_found = path.rfind(".xml"); if (xml_found != string::npos && xml_found == path.length() - 4) { - return make_pair(path.substr(0, xml_found), mime::text_xml); + return make_pair(path.substr(0, xml_found), mime::application_xml); } } diff --git a/src/xml_formatter.cpp b/src/xml_formatter.cpp index 95f0130d1..615a0849c 100644 --- a/src/xml_formatter.cpp +++ b/src/xml_formatter.cpp @@ -32,7 +32,7 @@ xml_formatter::xml_formatter(xml_writer *w) : writer(w) {} xml_formatter::~xml_formatter() = default; -mime::type xml_formatter::mime_type() const { return mime::text_xml; } +mime::type xml_formatter::mime_type() const { return mime::application_xml; } void xml_formatter::start_document( const std::string &generator, const std::string &root_name) { diff --git a/test/anon.testcore/single_node.case b/test/anon.testcore/single_node.case index e65039c1a..8022bf07c 100644 --- a/test/anon.testcore/single_node.case +++ b/test/anon.testcore/single_node.case @@ -5,7 +5,7 @@ Request-Method: GET Request-URI: /api/0.6/map?bbox=-0.0005,-0.0005,0.0005,0.0005 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 Content-Disposition: attachment; filename="map.osm" Status: 200 OK --- diff --git a/test/changesets.testcore/download.case b/test/changesets.testcore/download.case index 15faf113a..5e8404189 100644 --- a/test/changesets.testcore/download.case +++ b/test/changesets.testcore/download.case @@ -3,7 +3,7 @@ Request-URI: /api/0.6/changeset/1/download Date: 2017-02-20T15:22:00Z --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/changesets.testcore/download_changeset_2.case b/test/changesets.testcore/download_changeset_2.case index 9f034d05c..e9d97fa7a 100644 --- a/test/changesets.testcore/download_changeset_2.case +++ b/test/changesets.testcore/download_changeset_2.case @@ -3,7 +3,7 @@ Request-URI: /api/0.6/changeset/3/download Date: 2017-03-13T09:54:00Z --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/changesets.testcore/download_changeset_4.case b/test/changesets.testcore/download_changeset_4.case index ee80be396..51fcd682e 100644 --- a/test/changesets.testcore/download_changeset_4.case +++ b/test/changesets.testcore/download_changeset_4.case @@ -5,7 +5,7 @@ Request-URI: /api/0.6/changeset/4/download Date: 2017-03-13T09:54:00Z --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/changesets.testcore/download_changeset_rel10.case b/test/changesets.testcore/download_changeset_rel10.case index 70d236b02..14025493d 100644 --- a/test/changesets.testcore/download_changeset_rel10.case +++ b/test/changesets.testcore/download_changeset_rel10.case @@ -3,7 +3,7 @@ Request-URI: /api/0.6/changeset/10/download Date: 2017-03-13T16:27:00Z --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/changesets.testcore/download_changeset_sort11.case b/test/changesets.testcore/download_changeset_sort11.case index 403bdd67f..b76cd3d07 100644 --- a/test/changesets.testcore/download_changeset_sort11.case +++ b/test/changesets.testcore/download_changeset_sort11.case @@ -5,7 +5,7 @@ Request-URI: /api/0.6/changeset/11/download Date: 2017-03-13T16:32:00Z --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/changesets.testcore/download_changeset_way6.case b/test/changesets.testcore/download_changeset_way6.case index bee384edc..c537ebb67 100644 --- a/test/changesets.testcore/download_changeset_way6.case +++ b/test/changesets.testcore/download_changeset_way6.case @@ -3,7 +3,7 @@ Request-URI: /api/0.6/changeset/6/download Date: 2017-03-13T15:43:00Z --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/changesets.testcore/download_changeset_way7.case b/test/changesets.testcore/download_changeset_way7.case index 99e119c50..b6e51ac9f 100644 --- a/test/changesets.testcore/download_changeset_way7.case +++ b/test/changesets.testcore/download_changeset_way7.case @@ -3,7 +3,7 @@ Request-URI: /api/0.6/changeset/7/download Date: 2017-03-13T15:44:00Z --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/changesets.testcore/download_changeset_way9.case b/test/changesets.testcore/download_changeset_way9.case index 67922a068..fccb86c0a 100644 --- a/test/changesets.testcore/download_changeset_way9.case +++ b/test/changesets.testcore/download_changeset_way9.case @@ -3,7 +3,7 @@ Request-URI: /api/0.6/changeset/9/download Date: 2017-03-13T16:12:00Z --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/changesets.testcore/empty.case b/test/changesets.testcore/empty.case index 017c3680a..c90cfc717 100644 --- a/test/changesets.testcore/empty.case +++ b/test/changesets.testcore/empty.case @@ -4,7 +4,7 @@ Request-URI: /api/0.6/changeset/2/download Date: 2017-03-13T16:58:00Z --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/changesets.testcore/read.case b/test/changesets.testcore/read.case index 710f6240d..540fb80f7 100644 --- a/test/changesets.testcore/read.case +++ b/test/changesets.testcore/read.case @@ -4,7 +4,7 @@ HTTP-X-Error-Format: xml Date: 2015-08-09T11:33:13Z --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/changesets.testcore/read_discussion.case b/test/changesets.testcore/read_discussion.case index 508fe1d75..bf4fc2a7e 100644 --- a/test/changesets.testcore/read_discussion.case +++ b/test/changesets.testcore/read_discussion.case @@ -4,7 +4,7 @@ HTTP-X-Error-Format: xml Date: 2015-08-09T11:33:13Z --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/changesets.testcore/read_nonpublic.case b/test/changesets.testcore/read_nonpublic.case index 7ca04fbc9..9d355c548 100644 --- a/test/changesets.testcore/read_nonpublic.case +++ b/test/changesets.testcore/read_nonpublic.case @@ -4,7 +4,7 @@ HTTP-X-Error-Format: xml Date: 2015-09-05T20:17:10Z --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/changesets.testcore/read_open.case b/test/changesets.testcore/read_open.case index cd05a0d9b..2057cac18 100644 --- a/test/changesets.testcore/read_open.case +++ b/test/changesets.testcore/read_open.case @@ -4,7 +4,7 @@ HTTP-X-Error-Format: xml Date: 2015-08-09T10:33:13Z --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/empty.testcore/accept_any.case b/test/empty.testcore/accept_any.case index 13ea4b116..5352d099e 100644 --- a/test/empty.testcore/accept_any.case +++ b/test/empty.testcore/accept_any.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/map?bbox=0,0,0,0 HTTP-Accept: * --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 Content-Disposition: attachment; filename="map.osm" Status: 200 OK --- diff --git a/test/empty.testcore/accept_any_any.case b/test/empty.testcore/accept_any_any.case index 61aa3b55e..41cc14d54 100644 --- a/test/empty.testcore/accept_any_any.case +++ b/test/empty.testcore/accept_any_any.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/map?bbox=0,0,0,0 HTTP-Accept: */* --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 Content-Disposition: attachment; filename="map.osm" Status: 200 OK --- diff --git a/test/empty.testcore/accept_application_xml.case b/test/empty.testcore/accept_application_xml.case new file mode 100644 index 000000000..20734ed9a --- /dev/null +++ b/test/empty.testcore/accept_application_xml.case @@ -0,0 +1,11 @@ +Request-Method: GET +Request-URI: /api/0.6/map?bbox=0,0,0,0 +HTTP-Accept: application/xml +--- +Content-Type: application/xml; charset=utf-8 +Content-Disposition: attachment; filename="map.osm" +Status: 200 OK +--- + + + diff --git a/test/empty.testcore/accept_josm_nonsense.case b/test/empty.testcore/accept_josm_nonsense.case index cbc8799b0..ca09a926a 100644 --- a/test/empty.testcore/accept_josm_nonsense.case +++ b/test/empty.testcore/accept_josm_nonsense.case @@ -4,7 +4,7 @@ Request-Method: GET Request-URI: /api/0.6/map?bbox=0,0,0,0 HTTP-Accept: text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 Content-Disposition: attachment; filename="map.osm" Status: 200 OK --- diff --git a/test/empty.testcore/accept_nil.case b/test/empty.testcore/accept_nil.case index 58c7e150f..172c6db16 100644 --- a/test/empty.testcore/accept_nil.case +++ b/test/empty.testcore/accept_nil.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/map?bbox=0,0,0,0 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 Content-Disposition: attachment; filename="map.osm" Status: 200 OK --- diff --git a/test/empty.testcore/accept_text_any.case b/test/empty.testcore/accept_text_any.case index d0e92b63c..e8512ee5a 100644 --- a/test/empty.testcore/accept_text_any.case +++ b/test/empty.testcore/accept_text_any.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/map?bbox=0,0,0,0 HTTP-Accept: text/* --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 Content-Disposition: attachment; filename="map.osm" Status: 200 OK --- diff --git a/test/empty.testcore/accept_text_xml.case b/test/empty.testcore/accept_text_xml.case index 88596b5a7..6f479fc95 100644 --- a/test/empty.testcore/accept_text_xml.case +++ b/test/empty.testcore/accept_text_xml.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/map?bbox=0,0,0,0 HTTP-Accept: text/xml --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 Content-Disposition: attachment; filename="map.osm" Status: 200 OK --- diff --git a/test/empty.testcore/http_origin.case b/test/empty.testcore/http_origin.case index 38a4d5170..eddabc095 100644 --- a/test/empty.testcore/http_origin.case +++ b/test/empty.testcore/http_origin.case @@ -3,7 +3,7 @@ Request-URI: /api/0.6/map?bbox=0,0,0,0 HTTP-Accept: * HTTP-Origin: http://localhost --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 Content-Disposition: attachment; filename="map.osm" Access-Control-Allow-Credentials: true Access-Control-Allow-Methods: GET, HEAD, OPTIONS diff --git a/test/map.testcore/empty_response.case b/test/map.testcore/empty_response.case index 111c38bcc..e12adcb9f 100644 --- a/test/map.testcore/empty_response.case +++ b/test/map.testcore/empty_response.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/map?bbox=-0.01,-0.01,-0.0005,-0.0005 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 Content-Disposition: attachment; filename="map.osm" Status: 200 OK --- diff --git a/test/map.testcore/multiple_node.case b/test/map.testcore/multiple_node.case index dc90fabee..d7c193923 100644 --- a/test/map.testcore/multiple_node.case +++ b/test/map.testcore/multiple_node.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/map?bbox=-0.0005,-0.0005,0.0015,0.0015 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 Content-Disposition: attachment; filename="map.osm" Status: 200 OK --- diff --git a/test/map.testcore/single_node.case b/test/map.testcore/single_node.case index ba0a72593..d960b80d1 100644 --- a/test/map.testcore/single_node.case +++ b/test/map.testcore/single_node.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/map?bbox=-0.0005,-0.0005,0.0005,0.0005 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 Content-Disposition: attachment; filename="map.osm" Status: 200 OK --- diff --git a/test/map.testcore/used_node.case b/test/map.testcore/used_node.case index 030fa67af..f4c1b1fb7 100644 --- a/test/map.testcore/used_node.case +++ b/test/map.testcore/used_node.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/map?bbox=0.2995,-0.0005,0.3005,0.3005 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 Content-Disposition: attachment; filename="map.osm" Status: 200 OK --- diff --git a/test/map.testcore/used_way.case b/test/map.testcore/used_way.case index 938947979..68a221aa0 100644 --- a/test/map.testcore/used_way.case +++ b/test/map.testcore/used_way.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/map?bbox=0.1995,-0.0005,0.2005,0.3005 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 Content-Disposition: attachment; filename="map.osm" Status: 200 OK --- diff --git a/test/message.testcore/map_400_xml.case b/test/message.testcore/map_400_xml.case index 1aaae439f..b35e0bb7e 100644 --- a/test/message.testcore/map_400_xml.case +++ b/test/message.testcore/map_400_xml.case @@ -3,7 +3,7 @@ Request-URI: /api/0.6/map HTTP-X-Error-Format: xml --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 --- diff --git a/test/node.testcore/large_id_1.case b/test/node.testcore/large_id_1.case index def4aba70..6d8744ee8 100644 --- a/test/node.testcore/large_id_1.case +++ b/test/node.testcore/large_id_1.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/node/8589934592 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/node.testcore/large_id_2.case b/test/node.testcore/large_id_2.case index f117de5eb..65cf92c40 100644 --- a/test/node.testcore/large_id_2.case +++ b/test/node.testcore/large_id_2.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/node/9223372036854775807 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/node.testcore/node_1.case b/test/node.testcore/node_1.case index 30b58b9d3..6d71cdd38 100644 --- a/test/node.testcore/node_1.case +++ b/test/node.testcore/node_1.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/node/1 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/node.testcore/node_2.case b/test/node.testcore/node_2.case index b02322cdd..766a82de5 100644 --- a/test/node.testcore/node_2.case +++ b/test/node.testcore/node_2.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/node/2 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/node.testcore/node_history.case b/test/node.testcore/node_history.case index b5f7c0a8a..134c489c5 100644 --- a/test/node.testcore/node_history.case +++ b/test/node.testcore/node_history.case @@ -3,7 +3,7 @@ Request-Method: GET Request-URI: /api/0.6/node/3/history --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/node.testcore/node_version.case b/test/node.testcore/node_version.case index d5345725f..5f056fb2e 100644 --- a/test/node.testcore/node_version.case +++ b/test/node.testcore/node_version.case @@ -3,7 +3,7 @@ Request-Method: GET Request-URI: /api/0.6/node/3/1 --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/node.testcore/node_version_deleted.case b/test/node.testcore/node_version_deleted.case index 162277a59..80defe619 100644 --- a/test/node.testcore/node_version_deleted.case +++ b/test/node.testcore/node_version_deleted.case @@ -3,7 +3,7 @@ Request-Method: GET Request-URI: /api/0.6/node/3/2 --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/node.testcore/nodes.case b/test/node.testcore/nodes.case index 8ac5890f3..0b1bb17f7 100644 --- a/test/node.testcore/nodes.case +++ b/test/node.testcore/nodes.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/nodes?nodes=1,2,3 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/node.testcore/nodes_dup.case b/test/node.testcore/nodes_dup.case index efc09214d..ef9845c2a 100644 --- a/test/node.testcore/nodes_dup.case +++ b/test/node.testcore/nodes_dup.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/nodes?nodes=1,1,1 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/node.testcore/nodes_dup2.case b/test/node.testcore/nodes_dup2.case index f225cbc14..5bc75c6db 100644 --- a/test/node.testcore/nodes_dup2.case +++ b/test/node.testcore/nodes_dup2.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/nodes?nodes=1,2,2,3 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/node.testcore/nodes_history.case b/test/node.testcore/nodes_history.case index 97711d699..584b51969 100644 --- a/test/node.testcore/nodes_history.case +++ b/test/node.testcore/nodes_history.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/nodes?nodes=3v1,3 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/node.testcore/nodes_history_dup.case b/test/node.testcore/nodes_history_dup.case index ec5215bef..3b7be738b 100644 --- a/test/node.testcore/nodes_history_dup.case +++ b/test/node.testcore/nodes_history_dup.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/nodes?nodes=3v2,3 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/node_relations.testcore/node_1.case b/test/node_relations.testcore/node_1.case index 874db65db..2213c8562 100644 --- a/test/node_relations.testcore/node_1.case +++ b/test/node_relations.testcore/node_1.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/node/1/relations --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/node_relations.testcore/node_2.case b/test/node_relations.testcore/node_2.case index 30f4383d1..818247964 100644 --- a/test/node_relations.testcore/node_2.case +++ b/test/node_relations.testcore/node_2.case @@ -3,7 +3,7 @@ Request-Method: GET Request-URI: /api/0.6/node/2/relations --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/node_ways.testcore/node_1.case b/test/node_ways.testcore/node_1.case index fcec3a62c..c2070d533 100644 --- a/test/node_ways.testcore/node_1.case +++ b/test/node_ways.testcore/node_1.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/node/1/ways --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/node_ways.testcore/node_2.case b/test/node_ways.testcore/node_2.case index 3a9e92f9c..10d8cc677 100644 --- a/test/node_ways.testcore/node_2.case +++ b/test/node_ways.testcore/node_2.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/node/2/ways --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/node_ways.testcore/node_4.case b/test/node_ways.testcore/node_4.case index 7318453ad..140b23b66 100644 --- a/test/node_ways.testcore/node_4.case +++ b/test/node_ways.testcore/node_4.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/node/4/ways --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/node_ways.testcore/node_5.case b/test/node_ways.testcore/node_5.case index ea82f3a51..a55f284dd 100644 --- a/test/node_ways.testcore/node_5.case +++ b/test/node_ways.testcore/node_5.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/node/5/ways --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/redactions.testcore/changeset_download.case b/test/redactions.testcore/changeset_download.case index d48b9f811..f11c19cf5 100644 --- a/test/redactions.testcore/changeset_download.case +++ b/test/redactions.testcore/changeset_download.case @@ -5,7 +5,7 @@ Request-URI: /api/0.6/changeset/2/download Date: 2017-03-13T16:47:00Z --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/redactions.testcore/changeset_download_moderator.case b/test/redactions.testcore/changeset_download_moderator.case index 5eb7dcb98..15619b145 100644 --- a/test/redactions.testcore/changeset_download_moderator.case +++ b/test/redactions.testcore/changeset_download_moderator.case @@ -7,7 +7,7 @@ Date: 2017-03-13T16:47:00Z Http-Authorization: OAuth realm="http://cgimap.example.com/api/0.6/changeset/2/download", oauth_consumer_key="heqfjrcolc", oauth_token="scgncknxqr", oauth_nonce="dqndteqmzduesxyjetrd", oauth_timestamp="1489423620", oauth_signature_method="HMAC-SHA1", oauth_version="1.0", oauth_signature="2KQpmh%2FAJi9xTpZvCIo82inmdho%3D" --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/redactions.testcore/node_history.case b/test/redactions.testcore/node_history.case index 620c7a3e2..922f62213 100644 --- a/test/redactions.testcore/node_history.case +++ b/test/redactions.testcore/node_history.case @@ -4,7 +4,7 @@ Request-Method: GET Request-URI: /api/0.6/node/1/history?show_redactions=true --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/redactions.testcore/node_history_moderator.case b/test/redactions.testcore/node_history_moderator.case index d5e7f188d..636ca4fd1 100644 --- a/test/redactions.testcore/node_history_moderator.case +++ b/test/redactions.testcore/node_history_moderator.case @@ -6,7 +6,7 @@ Date: 2017-02-03T17:11:00Z Http-Authorization: OAuth realm="http://cgimap.example.com/api/0.6/node/1/history", oauth_consumer_key="heqfjrcolc", oauth_token="scgncknxqr", oauth_nonce="ylxApRr7uw94cVGRwxbx", oauth_timestamp="1486141860", oauth_signature_method="HMAC-SHA1", oauth_version="1.0", oauth_signature="IcgPfe%2F4C4Rh5HlnZQg388bn5Fo%3D" --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/redactions.testcore/node_version_moderator.case b/test/redactions.testcore/node_version_moderator.case index 2f193e5a0..0b873ac0e 100644 --- a/test/redactions.testcore/node_version_moderator.case +++ b/test/redactions.testcore/node_version_moderator.case @@ -6,7 +6,7 @@ Date: 2017-01-23T20:25:00Z Http-Authorization: OAuth realm="http://cgimap.example.com/api/0.6/node/1/2", oauth_consumer_key="heqfjrcolc", oauth_token="scgncknxqr", oauth_nonce="ykvbwrcver", oauth_timestamp="1485203100", oauth_signature_method="HMAC-SHA1", oauth_version="1.0", oauth_signature="NzUgxE%2B%2BueNwfnHtbLyJBTxdVus%3D" --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/redactions.testcore/nodes_moderator.case b/test/redactions.testcore/nodes_moderator.case index 842912c8c..7dc948250 100644 --- a/test/redactions.testcore/nodes_moderator.case +++ b/test/redactions.testcore/nodes_moderator.case @@ -6,7 +6,7 @@ Date: 2017-02-03T17:22:00Z Http-Authorization: OAuth realm="http://cgimap.example.com/api/0.6/nodes", oauth_consumer_key="heqfjrcolc", oauth_token="scgncknxqr", oauth_nonce="X1VcT5srCUFk7NMbDBBi", oauth_timestamp="1486142520", oauth_signature_method="HMAC-SHA1", oauth_version="1.0", oauth_signature="LanUZRlaRV7uJYaXgTJ30Mqog3M%3D" --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/redactions.testcore/relation_history.case b/test/redactions.testcore/relation_history.case index 0a2d59142..3c13212d9 100644 --- a/test/redactions.testcore/relation_history.case +++ b/test/redactions.testcore/relation_history.case @@ -4,7 +4,7 @@ Request-Method: GET Request-URI: /api/0.6/relation/1/history --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/redactions.testcore/relation_history_moderator.case b/test/redactions.testcore/relation_history_moderator.case index 149e3aec5..70494a495 100644 --- a/test/redactions.testcore/relation_history_moderator.case +++ b/test/redactions.testcore/relation_history_moderator.case @@ -6,7 +6,7 @@ Date: 2017-02-03T17:15:00Z Http-Authorization: OAuth realm="http://cgimap.example.com/api/0.6/relation/1/history", oauth_consumer_key="heqfjrcolc", oauth_token="scgncknxqr", oauth_nonce="i89B012BEg0Y5KHiiG5j", oauth_timestamp="1486142100", oauth_signature_method="HMAC-SHA1", oauth_version="1.0", oauth_signature="dI%2F6nEplWIcCUtwXul3LYC8ZuZI%3D" --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/redactions.testcore/relation_version_moderator.case b/test/redactions.testcore/relation_version_moderator.case index 82e75fa0a..9acb4831b 100644 --- a/test/redactions.testcore/relation_version_moderator.case +++ b/test/redactions.testcore/relation_version_moderator.case @@ -7,7 +7,7 @@ Date: 2017-02-03T16:37:00Z Http-Authorization: OAuth realm="http://cgimap.example.com/api/0.6/relation/1/2", oauth_consumer_key="heqfjrcolc", oauth_token="scgncknxqr", oauth_nonce="OFP9OGKNWTfBUw7hvB3A", oauth_timestamp="1486139820", oauth_signature_method="HMAC-SHA1", oauth_version="1.0", oauth_signature="N9V4%2FqNx5an7gOmmL4MhDBfKec0%3D" --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/redactions.testcore/relations_moderator.case b/test/redactions.testcore/relations_moderator.case index b8340eed8..9a546bb69 100644 --- a/test/redactions.testcore/relations_moderator.case +++ b/test/redactions.testcore/relations_moderator.case @@ -6,7 +6,7 @@ Date: 2017-02-03T17:26:00Z Http-Authorization: OAuth realm="http://cgimap.example.com/api/0.6/relations", oauth_consumer_key="heqfjrcolc", oauth_token="scgncknxqr", oauth_nonce="s5ikn2rEXP8sEY4yWioL", oauth_timestamp="1486142760", oauth_signature_method="HMAC-SHA1", oauth_version="1.0", oauth_signature="OQMjxYyDtdnAkz%2Fz%2FYVN7cQDj6w%3D" --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/redactions.testcore/way_history.case b/test/redactions.testcore/way_history.case index 6de5c8d45..835c1a2a2 100644 --- a/test/redactions.testcore/way_history.case +++ b/test/redactions.testcore/way_history.case @@ -4,7 +4,7 @@ Request-Method: GET Request-URI: /api/0.6/way/1/history --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/redactions.testcore/way_history_moderator.case b/test/redactions.testcore/way_history_moderator.case index 68e23619b..54b31be2e 100644 --- a/test/redactions.testcore/way_history_moderator.case +++ b/test/redactions.testcore/way_history_moderator.case @@ -6,7 +6,7 @@ Date: 2017-02-03T17:13:00Z Http-Authorization: OAuth realm="http://cgimap.example.com/api/0.6/way/1/history", oauth_consumer_key="heqfjrcolc", oauth_token="scgncknxqr", oauth_nonce="EsHFWX0Ru330NARIKysY", oauth_timestamp="1486141980", oauth_signature_method="HMAC-SHA1", oauth_version="1.0", oauth_signature="Mkx4Sg%2BXWQkd7P0lhmPyszo2zIo%3D" --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/redactions.testcore/way_version_moderator.case b/test/redactions.testcore/way_version_moderator.case index af28a272f..6e9238118 100644 --- a/test/redactions.testcore/way_version_moderator.case +++ b/test/redactions.testcore/way_version_moderator.case @@ -7,7 +7,7 @@ Date: 2017-02-03T16:31:00Z Http-Authorization: OAuth realm="http://cgimap.example.com/api/0.6/way/1/2", oauth_consumer_key="heqfjrcolc", oauth_token="scgncknxqr", oauth_nonce="ng8dUT94UOvYmX98sAof", oauth_timestamp="1486139460", oauth_signature_method="HMAC-SHA1", oauth_version="1.0", oauth_signature="QnliNV2%2BjeQWVDPZUXwTxrc%2BhDQ%3D" --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/redactions.testcore/ways_moderator.case b/test/redactions.testcore/ways_moderator.case index d2c20bf2a..2292e4054 100644 --- a/test/redactions.testcore/ways_moderator.case +++ b/test/redactions.testcore/ways_moderator.case @@ -6,7 +6,7 @@ Date: 2017-02-03T17:24:00Z Http-Authorization: OAuth realm="http://cgimap.example.com/api/0.6/ways", oauth_consumer_key="heqfjrcolc", oauth_token="scgncknxqr", oauth_nonce="sD8ADXbFprXuraBKHyH5", oauth_timestamp="1486142640", oauth_signature_method="HMAC-SHA1", oauth_version="1.0", oauth_signature="fQdcQw1OdVF%2BEhrPrFzxCD3c5Y0%3D" --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/relation.testcore/large_id_1.case b/test/relation.testcore/large_id_1.case index f8729876b..18946a20a 100644 --- a/test/relation.testcore/large_id_1.case +++ b/test/relation.testcore/large_id_1.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/relation/8589934592 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/relation.testcore/large_id_2.case b/test/relation.testcore/large_id_2.case index 456812602..d32ece341 100644 --- a/test/relation.testcore/large_id_2.case +++ b/test/relation.testcore/large_id_2.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/relation/9223372036854775807 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/relation.testcore/relation_1.case b/test/relation.testcore/relation_1.case index 1e10de23e..bf7b638bc 100644 --- a/test/relation.testcore/relation_1.case +++ b/test/relation.testcore/relation_1.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/relation/1 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/relation.testcore/relation_history.case b/test/relation.testcore/relation_history.case index 1651b2b85..ac76233ff 100644 --- a/test/relation.testcore/relation_history.case +++ b/test/relation.testcore/relation_history.case @@ -3,7 +3,7 @@ Request-Method: GET Request-URI: /api/0.6/relation/2/history --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/relation.testcore/relation_version.case b/test/relation.testcore/relation_version.case index ebc029877..e4534fb93 100644 --- a/test/relation.testcore/relation_version.case +++ b/test/relation.testcore/relation_version.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/relation/2/1 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/relation.testcore/relation_version_deleted.case b/test/relation.testcore/relation_version_deleted.case index f871d6141..01d4cbe9e 100644 --- a/test/relation.testcore/relation_version_deleted.case +++ b/test/relation.testcore/relation_version_deleted.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/relation/2/2 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/relation.testcore/relations.case b/test/relation.testcore/relations.case index 2cb3b1d5f..275bdd5b1 100644 --- a/test/relation.testcore/relations.case +++ b/test/relation.testcore/relations.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/relations?relations=1,2 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/relation.testcore/relations_historic.case b/test/relation.testcore/relations_historic.case index 0a5bad596..2842efad5 100644 --- a/test/relation.testcore/relations_historic.case +++ b/test/relation.testcore/relations_historic.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/relations?relations=2v1,2 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/relation.testcore/relations_historic_dup.case b/test/relation.testcore/relations_historic_dup.case index 95ae9cc77..30aaa09ed 100644 --- a/test/relation.testcore/relations_historic_dup.case +++ b/test/relation.testcore/relations_historic_dup.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/relations?relations=2v2,2 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/relation_full.testcore/relation_1.case b/test/relation_full.testcore/relation_1.case index 87a7f5400..c0f57d15c 100644 --- a/test/relation_full.testcore/relation_1.case +++ b/test/relation_full.testcore/relation_1.case @@ -3,7 +3,7 @@ Request-Method: GET Request-URI: /api/0.6/relation/1/full --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/relation_full.testcore/relation_4.case b/test/relation_full.testcore/relation_4.case index 625c5fcac..b55a49071 100644 --- a/test/relation_full.testcore/relation_4.case +++ b/test/relation_full.testcore/relation_4.case @@ -3,7 +3,7 @@ Request-Method: GET Request-URI: /api/0.6/relation/4/full --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/relation_full.testcore/relation_5.case b/test/relation_full.testcore/relation_5.case index 4cb344bfa..4cb380dac 100644 --- a/test/relation_full.testcore/relation_5.case +++ b/test/relation_full.testcore/relation_5.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/relation/5/full --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/relation_full.testcore/relation_6.case b/test/relation_full.testcore/relation_6.case index ffc5e98c6..d575f5da5 100644 --- a/test/relation_full.testcore/relation_6.case +++ b/test/relation_full.testcore/relation_6.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/relation/6/full --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/relation_full.testcore/relation_7.case b/test/relation_full.testcore/relation_7.case index 11b9846de..50ab7b3d0 100644 --- a/test/relation_full.testcore/relation_7.case +++ b/test/relation_full.testcore/relation_7.case @@ -3,7 +3,7 @@ Request-Method: GET Request-URI: /api/0.6/relation/7/full --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/relation_relations.testcore/relation_1.case b/test/relation_relations.testcore/relation_1.case index 0a2332ca0..f51fb5ea6 100644 --- a/test/relation_relations.testcore/relation_1.case +++ b/test/relation_relations.testcore/relation_1.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/relation/1/relations --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/relation_relations.testcore/relation_2.case b/test/relation_relations.testcore/relation_2.case index f674acd1a..11392eb46 100644 --- a/test/relation_relations.testcore/relation_2.case +++ b/test/relation_relations.testcore/relation_2.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/relation/2/relations --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/relation_relations.testcore/relation_3.case b/test/relation_relations.testcore/relation_3.case index 878d85010..953b95127 100644 --- a/test/relation_relations.testcore/relation_3.case +++ b/test/relation_relations.testcore/relation_3.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/relation/3/relations --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/test_core.cpp b/test/test_core.cpp index fbc8fee96..818a27af7 100644 --- a/test/test_core.cpp +++ b/test/test_core.cpp @@ -451,6 +451,7 @@ void check_response(std::istream &expected, std::istream &actual) { const std::string content_type = expected_headers.find("Content-Type")->second; if (content_type.substr(0, 8) == "text/xml" || + content_type.substr(0, 15) == "application/xml" || content_type.substr(0, 9) == "text/html") { check_content_body_xml(expected, actual); diff --git a/test/way.testcore/large_id_1.case b/test/way.testcore/large_id_1.case index 91b96b69c..56b0edd19 100644 --- a/test/way.testcore/large_id_1.case +++ b/test/way.testcore/large_id_1.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/way/8589934592 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/way.testcore/large_id_2.case b/test/way.testcore/large_id_2.case index 74b4fb8bc..4d5db13c2 100644 --- a/test/way.testcore/large_id_2.case +++ b/test/way.testcore/large_id_2.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/way/9223372036854775807 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/way.testcore/way_1.case b/test/way.testcore/way_1.case index 50456f72c..488a7ee52 100644 --- a/test/way.testcore/way_1.case +++ b/test/way.testcore/way_1.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/way/1 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/way.testcore/way_history.case b/test/way.testcore/way_history.case index 2a7d747d7..635e858a9 100644 --- a/test/way.testcore/way_history.case +++ b/test/way.testcore/way_history.case @@ -3,7 +3,7 @@ Request-Method: GET Request-URI: /api/0.6/way/2/history --- Status: 200 OK -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: --- diff --git a/test/way.testcore/way_version.case b/test/way.testcore/way_version.case index 06f98ef1b..67dd137d2 100644 --- a/test/way.testcore/way_version.case +++ b/test/way.testcore/way_version.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/way/2/1 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/way.testcore/way_version_deleted.case b/test/way.testcore/way_version_deleted.case index 25df4b401..db423a249 100644 --- a/test/way.testcore/way_version_deleted.case +++ b/test/way.testcore/way_version_deleted.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/way/2/2 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/way.testcore/ways.case b/test/way.testcore/ways.case index f8526e90a..b3c20225f 100644 --- a/test/way.testcore/ways.case +++ b/test/way.testcore/ways.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/ways?ways=1,2 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/way.testcore/ways_history.case b/test/way.testcore/ways_history.case index 209bca922..15b80c3b5 100644 --- a/test/way.testcore/ways_history.case +++ b/test/way.testcore/ways_history.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/ways?ways=2v1,2 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/way.testcore/ways_history_dup.case b/test/way.testcore/ways_history_dup.case index 18710bd04..2a3aeb89b 100644 --- a/test/way.testcore/ways_history_dup.case +++ b/test/way.testcore/ways_history_dup.case @@ -2,7 +2,7 @@ Request-Method: GET Request-URI: /api/0.6/ways?ways=2v2,2 --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/way_full.testcore/way_1.case b/test/way_full.testcore/way_1.case index 4fb09f841..afdd19504 100644 --- a/test/way_full.testcore/way_1.case +++ b/test/way_full.testcore/way_1.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/way/1/full --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/way_relations.testcore/way_1.case b/test/way_relations.testcore/way_1.case index 05fdd3eb0..84228bccb 100644 --- a/test/way_relations.testcore/way_1.case +++ b/test/way_relations.testcore/way_1.case @@ -1,7 +1,7 @@ Request-Method: GET Request-URI: /api/0.6/way/1/relations --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK --- diff --git a/test/way_relations.testcore/way_2.case b/test/way_relations.testcore/way_2.case index f22817e89..616b79053 100644 --- a/test/way_relations.testcore/way_2.case +++ b/test/way_relations.testcore/way_2.case @@ -3,7 +3,7 @@ Request-Method: GET Request-URI: /api/0.6/way/2/relations --- -Content-Type: text/xml; charset=utf-8 +Content-Type: application/xml; charset=utf-8 !Content-Disposition: Status: 200 OK ---