Avoid errors when stopping the server if using internal select

Sebastiano Merlino · Sebastiano Merlino · commit a8797c12e4be · 2015-12-28T00:07:32.000+01:00
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -649,9 +649,19 @@ bool webserver::stop()
         }
         threads.clear();
         typedef vector<details::daemon_item*>::const_iterator daemon_item_it;
+
+        if(start_method == http_utils::INTERNAL_SELECT)
+        {
+            for(daemon_item_it it = daemons.begin(); it != daemons.end(); ++it)
+                MHD_quiesce_daemon((*it)->daemon);
+        }
+
         for(daemon_item_it it = daemons.begin(); it != daemons.end(); ++it)
             delete *it;
         daemons.clear();
+
+        shutdown(bind_socket, 2);
+
         return true;
     }
     else
diff --git a/test/Makefile.am b/test/Makefile.am
@@ -19,11 +19,12 @@
 LDADD = $(top_builddir)/src/libhttpserver.la
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver/
 METASOURCES = AUTO
-check_PROGRAMS = basic http_utils
+check_PROGRAMS = basic http_utils threaded
 
 MOSTLYCLEANFILES = *.gcda *.gcno *.gcov
 
 basic_SOURCES = integ/basic.cpp 
+threaded_SOURCES = integ/threaded.cpp
 http_utils_SOURCES = unit/http_utils_test.cpp
 
 noinst_HEADERS = littletest.hpp
diff --git a/test/integ/threaded.cpp b/test/integ/threaded.cpp
@@ -0,0 +1,74 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011, 2012, 2013, 2014, 2015 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+#include "littletest.hpp"
+#include <curl/curl.h>
+#include <string>
+#include <map>
+#include "httpserver.hpp"
+
+using namespace httpserver;
+using namespace std;
+
+class ok_resource : public http_resource
+{
+    public:
+        void render_GET(const http_request& req, http_response** res)
+        {
+            *res = new http_response(http_response_builder("OK", 200, "text/plain").string_response());
+        }
+};
+
+LT_BEGIN_SUITE(threaded_suite)
+
+    webserver* ws;
+
+    void set_up()
+    {
+        ws = new webserver(create_webserver(8080).max_threads(5));
+        ws->start(false);
+    }
+
+    void tear_down()
+    {
+        ws->stop();
+        delete ws;
+    }
+LT_END_SUITE(threaded_suite)
+
+LT_BEGIN_AUTO_TEST(threaded_suite, base)
+    ok_resource* resource = new ok_resource();
+    ws->register_resource("base", resource);
+    curl_global_init(CURL_GLOBAL_ALL);
+    std::string s;
+    CURL* curl;
+    CURLcode res;
+
+    curl = curl_easy_init();
+    curl_easy_setopt(curl, CURLOPT_URL, "localhost:8080/base");
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+    curl_easy_cleanup(curl);
+LT_END_AUTO_TEST(base)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
