Merge branch 'master' into master

CHANGES.md

@@ -8,6 +8,10 @@
 
 * Added `URLPath` option for logger
 
+* Added `ServiceRequest::app_data()`, returns `Data<T>`
+
+* Added `ServiceFromRequest::app_data()`, returns `Data<T>`
+
 ### Changed
 
 * Move multipart support to actix-multipart crate

src/service.rs

@@ -13,7 +13,7 @@ use actix_router::{Path, Resource, Url};
 use futures::future::{ok, FutureResult, IntoFuture};
 
 use crate::config::{AppConfig, ServiceConfig};
-use crate::data::RouteData;
+use crate::data::{Data, RouteData};
 use crate::request::HttpRequest;
 use crate::rmap::ResourceMap;
 
@@ -173,6 +173,16 @@ impl<P> ServiceRequest<P> {
     pub fn app_config(&self) -> &AppConfig {
         self.req.config()
     }
+
+    /// Get an application data stored with `App::data()` method during
+    /// application configuration.
+    pub fn app_data<T: 'static>(&self) -> Option<Data<T>> {
+        if let Some(st) = self.req.config().extensions().get::<Data<T>>() {
+            Some(st.clone())
+        } else {
+            None
+        }
+    }
 }
 
 impl<P> Resource<Url> for ServiceRequest<P> {
@@ -270,6 +280,16 @@ impl<P> ServiceFromRequest<P> {
         ServiceResponse::new(self.req, err.into().into())
     }
 
+    /// Get an application data stored with `App::data()` method during
+    /// application configuration.
+    pub fn app_data<T: 'static>(&self) -> Option<Data<T>> {
+        if let Some(st) = self.req.config().extensions().get::<Data<T>>() {
+            Some(st.clone())
+        } else {
+            None
+        }
+    }
+
     /// Load route data. Route data could be set during
     /// route configuration with `Route::data()` method.
     pub fn route_data<T: 'static>(&self) -> Option<&RouteData<T>> {