jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed io_test (out of stack?), also fixed concurrent sync requests count on request error.

Browse source
This commit is contained in:
eidheim 2017-07-07 17:36:27 +02:00
commit 6c6f30302a
3 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
client_http.hpp
View file

@ -137,10 +137,10 @@ namespace SimpleWeb {
std::shared_ptr<Response> request(const std::string &method, const std::string &path = std::string("/"),
string_view content = "", const CaseInsensitiveMultimap &header = CaseInsensitiveMultimap()) {
std::shared_ptr<Response> response;
request(method, path, content, header, [&response](std::shared_ptr<Response> response_, const error_code &ec) {
error_code ec;
request(method, path, content, header, [&response, &ec](std::shared_ptr<Response> response_, const error_code &ec_) {
response = response_;
if(ec)
throw system_error(ec);
ec = ec_;
});
{
@ -150,10 +150,14 @@ namespace SimpleWeb {
io_service->run();
{
std::unique_lock<std::mutex> lock(concurrent_synchronous_requests_mutex);
if(--concurrent_synchronous_requests == 0)
--concurrent_synchronous_requests;
if(!concurrent_synchronous_requests)
io_service->reset();
}
if(ec)
throw system_error(ec);
return response;
}
@ -163,10 +167,10 @@ namespace SimpleWeb {
std::shared_ptr<Response> request(const std::string &method, const std::string &path, std::istream &content,
const CaseInsensitiveMultimap &header = CaseInsensitiveMultimap()) {
std::shared_ptr<Response> response;
request(method, path, content, header, [&response](std::shared_ptr<Response> response_, const error_code &ec) {
error_code ec;
request(method, path, content, header, [&response, &ec](std::shared_ptr<Response> response_, const error_code &ec_) {
response = response_;
if(ec)
throw system_error(ec);
ec = ec_;
});
{
@ -176,10 +180,14 @@ namespace SimpleWeb {
io_service->run();
{
std::unique_lock<std::mutex> lock(concurrent_synchronous_requests_mutex);
if(--concurrent_synchronous_requests == 0)
--concurrent_synchronous_requests;
if(!concurrent_synchronous_requests)
io_service->reset();
}
if(ec)
throw system_error(ec);
return response;
}