yuzu/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib synced 2024-11-21 14:29:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed PRI request problem

Browse source
This commit is contained in:
yhirose 2019-10-03 13:41:33 -04:00
parent 1f86e41d97
commit dcdb0d047b
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
httplib.h
View file

@ -2322,7 +2322,7 @@ inline void Server::stop() {
} }
inline bool Server::parse_request_line(const char *s, Request &req) { inline bool Server::parse_request_line(const char *s, Request &req) {
static std::regex re("(GET|HEAD|POST|PUT|PATCH|DELETE|OPTIONS) " static std::regex re("(GET|HEAD|POST|PUT|DELETE|CONNECT|OPTIONS|TRACE|PATCH|PRI) "
"(([^?]+)(?:\\?(.+?))?) (HTTP/1\\.[01])\r\n"); "(([^?]+)(?:\\?(.+?))?) (HTTP/1\\.[01])\r\n");
std::cmatch m; std::cmatch m;
@ -2614,13 +2614,15 @@ inline bool Server::routing(Request &req, Response &res) {
return dispatch_request(req, res, post_handlers_); return dispatch_request(req, res, post_handlers_);
} else if (req.method == "PUT") { } else if (req.method == "PUT") {
return dispatch_request(req, res, put_handlers_); return dispatch_request(req, res, put_handlers_);
} else if (req.method == "PATCH") {
return dispatch_request(req, res, patch_handlers_);
} else if (req.method == "DELETE") { } else if (req.method == "DELETE") {
return dispatch_request(req, res, delete_handlers_); return dispatch_request(req, res, delete_handlers_);
} else if (req.method == "OPTIONS") { } else if (req.method == "OPTIONS") {
return dispatch_request(req, res, options_handlers_); return dispatch_request(req, res, options_handlers_);
} else if (req.method == "PATCH") {
return dispatch_request(req, res, patch_handlers_);
} }
res.status = 400;
return false; return false;
} }
@ -2682,7 +2684,7 @@ Server::process_request(Stream &strm, bool last_connection,
req.set_header("REMOTE_ADDR", strm.get_remote_addr()); req.set_header("REMOTE_ADDR", strm.get_remote_addr());
// Body // Body
if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH") { if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH" || req.method == "PRI") {
if (!detail::read_content(strm, req, payload_max_length_, res.status, if (!detail::read_content(strm, req, payload_max_length_, res.status,
Progress(), [&](const char *buf, size_t n) { Progress(), [&](const char *buf, size_t n) {
if (req.body.size() + n > req.body.max_size()) { if (req.body.size() + n > req.body.max_size()) {
@ -2720,7 +2722,7 @@ Server::process_request(Stream &strm, bool last_connection,
if (routing(req, res)) { if (routing(req, res)) {
if (res.status == -1) { res.status = req.ranges.empty() ? 200 : 206; } if (res.status == -1) { res.status = req.ranges.empty() ? 200 : 206; }
} else { } else {
res.status = 404; if (res.status == -1) { res.status = 404; }
} }
return write_response(strm, last_connection, req, res); return write_response(strm, last_connection, req, res);

2
test/test.cc
View file

@ -1396,7 +1396,7 @@ TEST_F(ServerTest, NoMultipleHeaders) {
TEST_F(ServerTest, HTTP2Magic) { TEST_F(ServerTest, HTTP2Magic) {
Request req; Request req;
req.method = "PRI"; req.method = "PRI";
req.path = "/"; req.path = "*";
req.body = "SM"; req.body = "SM";
auto res = std::make_shared<Response>(); auto res = std::make_shared<Response>();