From 7ebf75817bb335725935d02b5a98fda70946488c Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Thu, 30 Jun 2016 09:49:26 +0200
Subject: [PATCH] Minor cleanup: removed a set_timeout_on_socket version that
 is no longer needed

---
 client_http.hpp     |  2 +-
 server_http.hpp     | 21 +++------------------
 test/parse_test.cpp |  2 +-
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/client_http.hpp b/client_http.hpp
index 2703102..6423087 100644
--- a/client_http.hpp
+++ b/client_http.hpp
@@ -65,7 +65,7 @@ namespace SimpleWeb {
                 write_stream << "Content-Length: " << content.size() << "\r\n";
             write_stream << "\r\n";
             
-             try {
+            try {
                 connect();
                 
                 boost::asio::write(*socket, write_buffer);
diff --git a/server_http.hpp b/server_http.hpp
index 2ffde4b..8da4623 100644
--- a/server_http.hpp
+++ b/server_http.hpp
@@ -81,12 +81,10 @@ namespace SimpleWeb {
             unsigned short remote_endpoint_port;
             
         private:
-            Request(boost::asio::io_service &io_service): content(streambuf), strand(io_service) {}
+            Request(): content(streambuf) {}
             
             boost::asio::streambuf streambuf;
             
-            boost::asio::strand strand;
-            
             void read_remote_endpoint_data(socket_type& socket) {
                 try {
                     remote_endpoint_address=socket.lowest_layer().remote_endpoint().address().to_string();
@@ -216,23 +214,10 @@ namespace SimpleWeb {
             return timer;
         }
         
-        std::shared_ptr<boost::asio::deadline_timer> set_timeout_on_socket(std::shared_ptr<socket_type> socket, std::shared_ptr<Request> request, long seconds) {
-            std::shared_ptr<boost::asio::deadline_timer> timer(new boost::asio::deadline_timer(io_service));
-            timer->expires_from_now(boost::posix_time::seconds(seconds));
-            timer->async_wait(request->strand.wrap([socket](const boost::system::error_code& ec){
-                if(!ec) {
-                    boost::system::error_code ec;
-                    socket->lowest_layer().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
-                    socket->lowest_layer().close();
-                }
-            }));
-            return timer;
-        }
-        
         void read_request_and_content(std::shared_ptr<socket_type> socket) {
             //Create new streambuf (Request::streambuf) for async_read_until()
             //shared_ptr is used to pass temporary objects to the asynchronous functions
-            std::shared_ptr<Request> request(new Request(io_service));
+            std::shared_ptr<Request> request(new Request());
             request->read_remote_endpoint_data(*socket);
 
             //Set timeout on the following boost::asio::async-read or write function
@@ -359,7 +344,7 @@ namespace SimpleWeb {
             //Set timeout on the following boost::asio::async-read or write function
             std::shared_ptr<boost::asio::deadline_timer> timer;
             if(timeout_content>0)
-                timer=set_timeout_on_socket(socket, request, timeout_content);
+                timer=set_timeout_on_socket(socket, timeout_content);
 
             auto response=std::shared_ptr<Response>(new Response(socket), [this, request, timer](Response *response_ptr) {
                 auto response=std::shared_ptr<Response>(response_ptr);
diff --git a/test/parse_test.cpp b/test/parse_test.cpp
index 77bdc27..eba533d 100644
--- a/test/parse_test.cpp
+++ b/test/parse_test.cpp
@@ -13,7 +13,7 @@ public:
     void accept() {}
     
     bool parse_request_test() {
-        std::shared_ptr<Request> request(new Request(io_service));
+        std::shared_ptr<Request> request(new Request());
         
         stringstream ss;
         ss << "GET /test/ HTTP/1.1\r\n";