From 3c3359f512818104b6367aa11605dde1e69d071f Mon Sep 17 00:00:00 2001 From: eidheim Date: Wed, 29 Jun 2016 00:34:58 +0200 Subject: [PATCH] Improvements to default_resource examples --- http_examples.cpp | 11 +++-------- https_examples.cpp | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/http_examples.cpp b/http_examples.cpp index 9ee6753..259e1c5 100644 --- a/http_examples.cpp +++ b/http_examples.cpp @@ -106,10 +106,10 @@ int main() { auto ifs=make_shared(); ifs->open(path.string(), ifstream::in | ios::binary); - if(ifs) { + if(*ifs) { //read and send 128 KB at a time streamsize buffer_size=131072; - auto buffer=make_shared>(buffer_size); + auto buffer=make_shared >(buffer_size); ifs->seekg(0, ios::end); auto length=ifs->tellg(); @@ -117,12 +117,7 @@ int main() { ifs->seekg(0, ios::beg); *response << "HTTP/1.1 200 OK\r\nContent-Length: " << length << "\r\n\r\n"; - server.send(response, [&server, response, ifs, buffer](const boost::system::error_code &ec) { - if(!ec) - default_resource_send(server, response, ifs, buffer); - else - cerr << "Connection interrupted" << endl; - }); + default_resource_send(server, response, ifs, buffer); return; } } diff --git a/https_examples.cpp b/https_examples.cpp index 7097083..7c2af86 100644 --- a/https_examples.cpp +++ b/https_examples.cpp @@ -106,10 +106,10 @@ int main() { auto ifs=make_shared(); ifs->open(path.string(), ifstream::in | ios::binary); - if(ifs) { + if(*ifs) { //read and send 128 KB at a time streamsize buffer_size=131072; - auto buffer=make_shared>(buffer_size); + auto buffer=make_shared >(buffer_size); ifs->seekg(0, ios::end); auto length=ifs->tellg(); @@ -117,12 +117,7 @@ int main() { ifs->seekg(0, ios::beg); *response << "HTTP/1.1 200 OK\r\nContent-Length: " << length << "\r\n\r\n"; - server.send(response, [&server, response, ifs, buffer](const boost::system::error_code &ec) { - if(!ec) - default_resource_send(server, response, ifs, buffer); - else - cerr << "Connection interrupted" << endl; - }); + default_resource_send(server, response, ifs, buffer); return; } }