Merge pull request #221 from mmd-osm/patch/mimetype

Use MIME type application/xml for better Rails compatibility
zerebubuth · Mar 1, 2020 · 9c7f91e · 9c7f91e
2 parents 908afd8 + ac49384
commit 9c7f91e
Show file tree

Hide file tree

Showing 99 changed files with 117 additions and 102 deletions.
diff --git 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
@@ -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
@@ -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<output_formatter> create_formatter(request &req,
                                               shared_ptr<output_buffer> out) {
   shared_ptr<output_formatter> 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<output_formatter>(new xml_formatter(xwriter));
 

diff --git 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
@@ -11,7 +11,7 @@ osm_responder::~osm_responder() = default;
 
 list<mime::type> osm_responder::types_available() const {
   list<mime::type> 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
@@ -222,7 +222,7 @@ osmchange_responder::~osmchange_responder() = default;
 
 list<mime::type> osmchange_responder::types_available() const {
   list<mime::type> 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
@@ -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 << "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n"

diff --git 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<string, mime::type> 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
@@ -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
@@ -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
@@ -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: 
 ---
 <osmChange version="0.6" generator="***" copyright="***" attribution="***" license="***">

diff --git 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: 
 ---
 <osmChange version="0.6" generator="***" copyright="***" attribution="***" license="***">

diff --git 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: 
 ---
 <osmChange version="0.6" generator="***" copyright="***" attribution="***" license="***">

diff --git 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: 
 ---
 <osmChange version="0.6" generator="***" copyright="***" attribution="***" license="***">

diff --git 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: 
 ---
 <osmChange version="0.6" generator="***" copyright="***" attribution="***" license="***">

diff --git 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: 
 ---
 <osmChange version="0.6" generator="***" copyright="***" attribution="***" license="***">

diff --git 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: 
 ---
 <osmChange version="0.6" generator="***" copyright="***" attribution="***" license="***">

diff --git 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: 
 ---
 <osmChange version="0.6" generator="***" copyright="***" attribution="***" license="***">

diff --git 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: 
 ---
 <osmChange version="0.6" generator="***" copyright="***" attribution="***" license="***"/>
diff --git 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: 
 ---
 <osm version="0.6" generator="***" copyright="***" attribution="***" license="***">

diff --git 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: 
 ---
 <osm version="0.6" generator="***" copyright="***" attribution="***" license="***">

diff --git 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: 
 ---
 <osm version="0.6" generator="***" copyright="***" attribution="***" license="***">

diff --git 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: 
 ---
 <osm version="0.6" generator="***" copyright="***" attribution="***" license="***">

diff --git 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
@@ -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
@@ -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
+---
+<osm version="0.6" generator="***" copyright="***" attribution="***" license="***">
+  <bounds maxlat="0.0000000" maxlon="0.0000000" minlat="0.0000000" minlon="0.0000000"/>
+</osm>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 ---
 <?xml version="1.0" encoding="utf-8" ?>
 <osmError>

diff --git 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
@@ -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
@@ -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
 ---