Fix embedded-svc

Author: showier-drastic

edge-http/src/io/server.rs

@@ -871,7 +871,7 @@ mod embedded_svc_compat {
             message: Option<&str>,
             headers: &[(&str, &str)],
         ) -> Result<(), Self::Error> {
-            super::Connection::initiate_response(self, status, message, headers).await
+            super::Connection::initiate_response(self, status, message.unwrap_or(""), headers).await
         }
 
         fn is_response_initiated(&self) -> bool {
@@ -896,7 +896,7 @@ mod embedded_svc_compat {
             &self,
             connection: &mut super::Connection<'b, T, N>,
         ) -> Result<(), Self::Error> {
-            connection.initiate_response(404, None, &[]).await
+            connection.initiate_response(404, "", &[]).await
         }
     }
 
@@ -916,12 +916,7 @@ mod embedded_svc_compat {
             let headers = connection.headers().ok();
 
             if let Some(headers) = headers {
-                if headers.path.map(|path| self.path == path).unwrap_or(false)
-                    && headers
-                        .method
-                        .map(|method| self.method == method.into())
-                        .unwrap_or(false)
-                {
+                if headers.path == self.path && headers.method == self.method.into() {
                     return self.handler.handle(connection).await;
                 }
             }

edge-http/src/lib.rs

@@ -1377,11 +1377,11 @@ mod embedded_svc_compat {
 
     impl<'b, const N: usize> embedded_svc::http::Query for super::RequestHeaders<'b, N> {
         fn uri(&self) -> &'_ str {
-            self.path.unwrap_or("")
+            self.path
         }
 
         fn method(&self) -> Method {
-            self.method.unwrap_or(super::Method::Get).into()
+            self.method.into()
         }
     }
 
@@ -1393,11 +1393,15 @@ mod embedded_svc_compat {
 
     impl<'b, const N: usize> embedded_svc::http::Status for super::ResponseHeaders<'b, N> {
         fn status(&self) -> u16 {
-            self.code.unwrap_or(200)
+            self.code
         }
 
         fn status_message(&self) -> Option<&'_ str> {
-            self.reason
+            if self.reason != "" {
+                Some(self.reason)
+            } else {
+                None
+            }
         }
     }