From 9306631d6e3345e4a79a66f79886b67157fe751a Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Fri, 11 May 2018 21:19:48 -0700
Subject: [PATCH] Fix segfault in ServerSettings::get_response_builder()
---
CHANGES.md | 5 +++++
Cargo.toml | 2 +-
src/server/settings.rs | 13 ++++++++++++-
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index df577a99..f0f7cd7e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,10 @@
# Changes
+## 0.6.4 (2018-05-11)
+
+* Fix segfault in ServerSettings::get_response_builder()
+
+
## 0.6.3 (2018-05-10)
* Add `Router::with_async()` method for async handler registration.
diff --git a/Cargo.toml b/Cargo.toml
index 24a50051..6fd07355 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "actix-web"
-version = "0.6.3"
+version = "0.6.4"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust."
readme = "README.md"
diff --git a/src/server/settings.rs b/src/server/settings.rs
index cd17681b..f75033c1 100644
--- a/src/server/settings.rs
+++ b/src/server/settings.rs
@@ -16,7 +16,6 @@ use body::Body;
use httpresponse::{HttpResponse, HttpResponseBuilder, HttpResponsePool};
/// Various server settings
-#[derive(Clone)]
pub struct ServerSettings {
addr: Option<net::SocketAddr>,
secure: bool,
@@ -28,6 +27,18 @@ pub struct ServerSettings {
unsafe impl Sync for ServerSettings {}
unsafe impl Send for ServerSettings {}
+impl Clone for ServerSettings {
+ fn clone(&self) -> Self {
+ ServerSettings {
+ addr: self.addr,
+ secure: self.secure,
+ host: self.host.clone(),
+ cpu_pool: self.cpu_pool.clone(),
+ responses: HttpResponsePool::pool(),
+ }
+ }
+}
+
struct InnerCpuPool {
cpu_pool: UnsafeCell<Option<CpuPool>>,
}