OPTIONS request 'Content-type' should not be json

minihttp/src/lib.rs

@@ -308,14 +308,6 @@ impl<M: jsonrpc::Metadata, S: jsonrpc::Middleware<M>> tokio_service::Service for
 			).boxed();
 		}
 
-		// Validate content type
-		let content_type = request.header("Content-type");
-		if !is_json(content_type) {
-			return future::ok(
-				res::invalid_content_type()
-			).boxed();
-		}
-
 		// Extract CORS headers
 		let origin = request.header("Origin");
 		let cors = cors::get_cors_header(origin, &self.cors_domains);
@@ -327,6 +319,14 @@ impl<M: jsonrpc::Metadata, S: jsonrpc::Middleware<M>> tokio_service::Service for
 			).boxed();
 		}
 
+		// Validate content type
+		let content_type = request.header("Content-type");
+		if !is_json(content_type) {
+			return future::ok(
+				res::invalid_content_type()
+			).boxed();
+		}
+
 		// Extract metadata
 		let metadata = self.meta_extractor.read_metadata(&request);
 

minihttp/src/tests.rs

@@ -87,6 +87,22 @@ fn should_return_method_not_allowed_for_get() {
 	assert_eq!(response.body, "Used HTTP Method is not allowed. POST or OPTIONS is required.\n".to_owned());
 }
 
+#[test]
+fn should_ignore_media_type_if_options() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		Method::Options,
+		Headers::new(),
+		"{}",
+	);
+
+	// then
+	assert_eq!(response.status, StatusCode::Ok);
+}
+
 #[test]
 fn should_return_unsupported_media_type_if_not_json() {
 	// given