From d293ae2a691fb6f9b9981346643e56932114d2da Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Sat, 15 Jun 2019 22:12:20 +0600
Subject: [PATCH] fix nested resource map registration #915

---
 CHANGES.md   |  4 ++++
 src/rmap.rs  |  3 ++-
 src/scope.rs | 20 ++++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1f34b7977..87729eb6a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,10 @@
 
 * Re-apply patch from #637 #894
 
+### Fixed
+
+* HttpRequest::url_for is broken with nested scopes #915
+
 
 ## [1.0.0] - 2019-06-05
 
diff --git a/src/rmap.rs b/src/rmap.rs
index 6a543b75c..cad62dca0 100644
--- a/src/rmap.rs
+++ b/src/rmap.rs
@@ -38,7 +38,8 @@ impl ResourceMap {
     pub(crate) fn finish(&self, current: Rc<ResourceMap>) {
         for (_, nested) in &self.patterns {
             if let Some(ref nested) = nested {
-                *nested.parent.borrow_mut() = Some(current.clone())
+                *nested.parent.borrow_mut() = Some(current.clone());
+                nested.finish(nested.clone());
             }
         }
     }
diff --git a/src/scope.rs b/src/scope.rs
index ad97fcb62..400da668d 100644
--- a/src/scope.rs
+++ b/src/scope.rs
@@ -1135,4 +1135,24 @@ mod tests {
         let body = read_body(resp);
         assert_eq!(body, &b"https://youtube.com/watch/xxxxxx"[..]);
     }
+
+    #[test]
+    fn test_url_for_nested() {
+        let mut srv = init_service(App::new().service(web::scope("/a").service(
+            web::scope("/b").service(web::resource("/c/{stuff}").name("c").route(
+                web::get().to(|req: HttpRequest| {
+                    HttpResponse::Ok()
+                        .body(format!("{}", req.url_for("c", &["12345"]).unwrap()))
+                }),
+            )),
+        )));
+        let req = TestRequest::with_uri("/a/b/c/test").to_request();
+        let resp = call_service(&mut srv, req);
+        assert_eq!(resp.status(), StatusCode::OK);
+        let body = read_body(resp);
+        assert_eq!(
+            body,
+            Bytes::from_static(b"http://localhost:8080/a/b/c/12345")
+        );
+    }
 }