wip

ntex-rs · Jun 22, 2024 · 6232082 · 6232082
1 parent 2b6329a
commit 6232082
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/ntex/src/http/h1/decoder.rs b/ntex/src/http/h1/decoder.rs
@@ -398,29 +398,29 @@ fn connection_type(val: &str) -> Option<ConnectionType> {
     let l = val.len();
     let bytes = val.as_bytes();
     for i in 0..bytes.len() {
-        if i <= S_CLOSE.len() {
+        if i >= S_CLOSE.len() {
             return None;
         }
         let result = match bytes[i] {
             b'k' | b'K' => {
                 let pos = i + S_KEEP_ALIVE.len();
-                if l > pos && val[i..pos].eq_ignore_ascii_case(S_KEEP_ALIVE) {
+                if l >= pos && val[i..pos].eq_ignore_ascii_case(S_KEEP_ALIVE) {
                     Some((ConnectionType::KeepAlive, pos))
                 } else {
                     None
                 }
             }
             b'c' | b'C' => {
                 let pos = i + S_CLOSE.len();
-                if l > pos && val[i..pos].eq_ignore_ascii_case(S_CLOSE) {
+                if l >= pos && val[i..pos].eq_ignore_ascii_case(S_CLOSE) {
                     Some((ConnectionType::Close, pos))
                 } else {
                     None
                 }
             }
             b'u' | b'U' => {
                 let pos = i + S_UPGRADE.len();
-                if l > pos && val[i..pos].eq_ignore_ascii_case(S_UPGRADE) {
+                if l >= pos && val[i..pos].eq_ignore_ascii_case(S_UPGRADE) {
                     Some((ConnectionType::Upgrade, pos))
                 } else {
                     None
@@ -432,7 +432,7 @@ fn connection_type(val: &str) -> Option<ConnectionType> {
         if let Some((t, pos)) = result {
             let next = pos + 1;
             if val.len() > next {
-                if matches!(bytes[next], b' ' | b',') {
+                if matches!(bytes[next], b' ' | b',' | b'\r' | b'\n') {
                     return Some(t);
                 }
             } else {