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

Use boost regex instead of std, because of buggy glibc++ in RHEL7

Browse source
This commit is contained in:
David Björkevik 2015-09-28 16:59:03 +02:00
commit 57cc062223
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -15,7 +15,7 @@ else()
endif() endif()
#Only tested with versions 1.55 and 1.56 #Only tested with versions 1.55 and 1.56
find_package(Boost 1.54.0 COMPONENTS system thread coroutine context filesystem REQUIRED) find_package(Boost 1.54.0 COMPONENTS regex system thread coroutine context filesystem REQUIRED)
message("Boost include dir: ${Boost_INCLUDE_DIR}") message("Boost include dir: ${Boost_INCLUDE_DIR}")
message("Boost libraries: ${Boost_LIBRARIES}") message("Boost libraries: ${Boost_LIBRARIES}")
include_directories(${Boost_INCLUDE_DIR}) include_directories(${Boost_INCLUDE_DIR})

12
server_http.hpp
View file

@ -3,8 +3,8 @@
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/asio/spawn.hpp> #include <boost/asio/spawn.hpp>
#include <boost/regex.hpp>
#include <regex>
#include <unordered_map> #include <unordered_map>
#include <thread> #include <thread>
#include <functional> #include <functional>
@ -65,7 +65,7 @@ namespace SimpleWeb {
std::unordered_multimap<std::string, std::string> header; std::unordered_multimap<std::string, std::string> header;
std::smatch path_match; boost::smatch path_match;
std::string remote_endpoint_address; std::string remote_endpoint_address;
unsigned short remote_endpoint_port; unsigned short remote_endpoint_port;
@ -93,7 +93,7 @@ namespace SimpleWeb {
std::function<void(typename ServerBase<socket_type>::Response&, std::shared_ptr<typename ServerBase<socket_type>::Request>)> > default_resource; std::function<void(typename ServerBase<socket_type>::Response&, std::shared_ptr<typename ServerBase<socket_type>::Request>)> > default_resource;
private: private:
std::vector<std::pair<std::string, std::vector<std::pair<std::regex, std::vector<std::pair<std::string, std::vector<std::pair<boost::regex,
std::function<void(typename ServerBase<socket_type>::Response&, std::shared_ptr<typename ServerBase<socket_type>::Request>)> > > > > opt_resource; std::function<void(typename ServerBase<socket_type>::Response&, std::shared_ptr<typename ServerBase<socket_type>::Request>)> > > > > opt_resource;
public: public:
@ -114,7 +114,7 @@ namespace SimpleWeb {
it=opt_resource.begin()+(opt_resource.size()-1); it=opt_resource.begin()+(opt_resource.size()-1);
it->first=res_method.first; it->first=res_method.first;
} }
it->second.emplace_back(std::regex(res.first), res_method.second); it->second.emplace_back(boost::regex(res.first), res_method.second);
} }
} }
@ -269,8 +269,8 @@ namespace SimpleWeb {
for(auto& res: opt_resource) { for(auto& res: opt_resource) {
if(request->method==res.first) { if(request->method==res.first) {
for(auto& res_path: res.second) { for(auto& res_path: res.second) {
std::smatch sm_res; boost::smatch sm_res;
if(std::regex_match(request->path, sm_res, res_path.first)) { if(boost::regex_match(request->path, sm_res, res_path.first)) {
request->path_match=std::move(sm_res); request->path_match=std::move(sm_res);
write_response(socket, request, res_path.second); write_response(socket, request, res_path.second);
return; return;