berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

clear conn_data on HttpRequest drop 

fixes #2740
This commit is contained in:
Rob Ede 2022-04-23 12:43:50 +01:00
parent 56b9c0d08e
commit 3f43f10589
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actix-web/src/request.rs
View File

@ -381,12 +381,16 @@ impl Drop for HttpRequest {
inner.app_data.truncate(1); inner.app_data.truncate(1);
// Inner is borrowed mut here and; get req data mutably to reduce borrow check. Also // Inner is borrowed mut here and; get req data mutably to reduce borrow check. Also
// we know the req_data Rc will not have any cloned at this point to unwrap is okay. // we know the req_data Rc will not have any clones at this point to unwrap is okay.
Rc::get_mut(&mut inner.extensions) Rc::get_mut(&mut inner.extensions)
.unwrap() .unwrap()
.get_mut() .get_mut()
.clear(); .clear();
// We can't use the same trick as req data because the conn_data is held by the
// dispatcher, too.
inner.conn_data = None;
// a re-borrow of pool is necessary here. // a re-borrow of pool is necessary here.
let req = Rc::clone(&self.inner); let req = Rc::clone(&self.inner);
self.app_state().pool().push(req); self.app_state().pool().push(req);
@ -761,10 +765,8 @@ mod tests {
assert_eq!(body, Bytes::from_static(b"1")); assert_eq!(body, Bytes::from_static(b"1"));
} }
// allow deprecated App::data
#[allow(deprecated)]
#[actix_rt::test] #[actix_rt::test]
async fn test_extensions_dropped() { async fn test_app_data_dropped() {
struct Tracker { struct Tracker {
pub dropped: bool, pub dropped: bool,
} }
@ -780,7 +782,7 @@ mod tests {
let tracker = Rc::new(RefCell::new(Tracker { dropped: false })); let tracker = Rc::new(RefCell::new(Tracker { dropped: false }));
{ {
let tracker2 = Rc::clone(&tracker); let tracker2 = Rc::clone(&tracker);
let srv = init_service(App::new().data(10u32).service(web::resource("/").to( let srv = init_service(App::new().service(web::resource("/").to(
move |req: HttpRequest| { move |req: HttpRequest| {
req.extensions_mut().insert(Foo { req.extensions_mut().insert(Foo {
tracker: Rc::clone(&tracker2), tracker: Rc::clone(&tracker2),