diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/http/01_http.js | 7 | ||||
| -rw-r--r-- | ext/http/lib.rs | 11 |
2 files changed, 11 insertions, 7 deletions
diff --git a/ext/http/01_http.js b/ext/http/01_http.js index 8c4f08aab..4e6b8fc00 100644 --- a/ext/http/01_http.js +++ b/ext/http/01_http.js @@ -93,7 +93,12 @@ let body = null; if (typeof requestRid === "number") { SetPrototypeAdd(this.managedResources, requestRid); - body = createRequestBodyStream(this, requestRid); + // There might be a body, but we don't expose it for GET/HEAD requests. + // It will be closed automatically once the request has been handled and + // the response has been sent. + if (method !== "GET" && method !== "HEAD") { + body = createRequestBodyStream(this, requestRid); + } } const innerRequest = newInnerRequest( diff --git a/ext/http/lib.rs b/ext/http/lib.rs index a4e908537..09874fccc 100644 --- a/ext/http/lib.rs +++ b/ext/http/lib.rs @@ -29,6 +29,7 @@ use hyper::http; use hyper::server::conn::Http; use hyper::service::Service as HyperService; use hyper::Body; +use hyper::Method; use hyper::Request; use hyper::Response; use serde::Deserialize; @@ -243,13 +244,11 @@ fn prepare_next_request( let url = req_url(&req, scheme, addr)?; let is_websocket = is_websocket_request(&req); - let has_body = if let Some(exact_size) = req.size_hint().exact() { - exact_size > 0 - } else { - true - }; + let can_have_body = !matches!(*req.method(), Method::GET | Method::HEAD); + let has_body = + is_websocket || (can_have_body && req.size_hint().exact() != Some(0)); - let maybe_request_rid = if is_websocket || has_body { + let maybe_request_rid = if has_body { let request_rid = state.resource_table.add(RequestResource { conn_rid, inner: AsyncRefCell::new(RequestOrStreamReader::Request(Some(req))), |