add changelog

actix · Mar 11, 2021 · 9a8e8d0 · 9a8e8d0
1 parent a93217c
commit 9a8e8d0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
@@ -4,7 +4,11 @@
 ### Chaged
 * `client::Connector` type now only have one generic type for `actix_service::Service`. [#2063]
 
+### Removed
+* Cookie handling. `actix-web` and `awc` retain cookie support. [#2065]
+
 [#2063]: https://github.com/actix/actix-web/pull/2063
+[#2065]: https://github.com/actix/actix-web/pull/2065
 
 
 ## 3.0.0-beta.4 - 2021-03-08

diff --git a/src/cookie_ext.rs b/src/cookie_ext.rs
@@ -9,7 +9,6 @@ struct Cookies(Vec<Cookie<'static>>);
 
 pub trait RequestCookieExt: HttpMessage {
     /// Load request cookies.
-    #[cfg(feature = "cookies")]
     fn cookies(&self) -> Result<Ref<'_, Vec<Cookie<'static>>>, CookieParseError> {
         if self.extensions().get::<Cookies>().is_none() {
             let mut cookies = Vec::new();
@@ -30,7 +29,6 @@ pub trait RequestCookieExt: HttpMessage {
     }
 
     /// Return request cookie.
-    #[cfg(feature = "cookies")]
     fn cookie(&self, name: &str) -> Option<Cookie<'static>> {
         if let Ok(cookies) = self.cookies() {
             for cookie in cookies.iter() {

diff --git a/src/lib.rs b/src/lib.rs
@@ -79,7 +79,6 @@ extern crate tls_rustls as rustls;
 mod app;
 mod app_service;
 mod config;
-mod cookie_ext;
 mod data;
 pub mod error;
 mod extract;
@@ -101,14 +100,14 @@ pub(crate) mod types;
 pub mod web;
 
 #[cfg(feature = "cookies")]
-pub use ::cookie;
+mod cookie_ext;
+
 pub use actix_http::Response as HttpResponse;
 pub use actix_http::{body, http, Error, HttpMessage, ResponseError, Result};
 pub use actix_rt as rt;
 pub use actix_web_codegen::*;
 
 pub use crate::app::App;
-pub use crate::cookie_ext::{RequestCookieExt, ResponseCookieExt};
 pub use crate::extract::FromRequest;
 pub use crate::request::HttpRequest;
 pub use crate::resource::Resource;
@@ -119,6 +118,12 @@ pub use crate::server::HttpServer;
 // TODO: is exposing the error directly really needed
 pub use crate::types::{Either, EitherExtractError};
 
+#[cfg(feature = "cookies")]
+pub use {
+    crate::cookie_ext::{RequestCookieExt, ResponseCookieExt},
+    ::cookie,
+};
+
 pub mod dev {
     //! The `actix-web` prelude for library developers
     //!