test/drogon
1
0
Fork 0
mirror of https://gitee.com/an-tao/drogon.git synced 2024-12-12 12:25:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #165 from an-tao/dev

Browse Source 
Fix a bug that occurs when a path argument contains spaces
This commit is contained in:
An Tao 2019-05-31 10:05:19 +08:00 committed by GitHub
commit 0c3b1b5784
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/simple_example_test/main.cc
View File

@ -587,7 +587,7 @@ void doTest(const HttpClientPtr &client,
/// Test static function
req = HttpRequest::newHttpRequest();
req->setMethod(drogon::Get);
req->setPath("/api/v1/handle11/11/22/?p3=33");
req->setPath("/api/v1/handle11/11/2 2/?p3=3 x");
req->setParameter("p4", "44");
client->sendRequest(
req, [=](ReqResult result, const HttpResponsePtr &resp) {
@ -600,10 +600,10 @@ void doTest(const HttpClientPtr &client,
"<td>int p4</td>\n <td>44</td>") !=
std::string::npos &&
resp->getBody().find(
"<td>string p2</td>\n <td>22</td>") !=
"<td>string p2</td>\n <td>2 2</td>") !=
std::string::npos &&
resp->getBody().find(
"<td>string p3</td>\n <td>33</td>") !=
"<td>string p3</td>\n <td>3 x</td>") !=
std::string::npos)
{
outputGood(req, isHttps);

39
lib/inc/drogon/HttpBinder.h
View File

@ -68,7 +68,7 @@ class HttpBinderBase
{
public:
virtual void handleHttpRequest(
std::list<std::string> &pathParameter,
std::list<std::string> &pathArguments,
const HttpRequestPtr &req,
std::function<void(const HttpResponsePtr &)> &&callback) = 0;
virtual size_t paramCount() = 0;
@ -96,11 +96,11 @@ class HttpBinder : public HttpBinderBase
public:
typedef FUNCTION FunctionType;
virtual void handleHttpRequest(
std::list<std::string> &pathParameter,
std::list<std::string> &pathArguments,
const HttpRequestPtr &req,
std::function<void(const HttpResponsePtr &)> &&callback) override
{
run(pathParameter, req, std::move(callback));
run(pathArguments, req, std::move(callback));
}
virtual size_t paramCount() override
{
@ -131,9 +131,24 @@ class HttpBinder : public HttpBinderBase
static const size_t argument_count = traits::arity;
std::string _handlerName;
template <typename T>
void getHandlerArgumentValue(T &value, std::string &&p)
{
if (!p.empty())
{
std::stringstream ss(std::move(p));
ss >> value;
}
}
void getHandlerArgumentValue(std::string &value, std::string &&p)
{
value = std::move(p);
}
template <typename... Values, std::size_t Boundary = argument_count>
typename std::enable_if<(sizeof...(Values) < Boundary), void>::type run(
std::list<std::string> &pathParameter,
std::list<std::string> &pathArguments,
const HttpRequestPtr &req,
std::function<void(const HttpResponsePtr &)> &&callback,
Values &&... values)
@ -147,18 +162,14 @@ class HttpBinder : public HttpBinderBase
typedef typename std::remove_cv<typename std::remove_reference<
nth_argument_type<sizeof...(Values)>>::type>::type ValueType;
ValueType value = ValueType();
if (!pathParameter.empty())
if (!pathArguments.empty())
{
std::string v = std::move(pathParameter.front());
pathParameter.pop_front();
if (!v.empty())
{
std::stringstream ss(std::move(v));
ss >> value;
}
std::string v = std::move(pathArguments.front());
pathArguments.pop_front();
getHandlerArgumentValue(value, std::move(v));
}
run(pathParameter,
run(pathArguments,
req,
std::move(callback),
std::forward<Values>(values)...,
@ -166,7 +177,7 @@ class HttpBinder : public HttpBinderBase
}
template <typename... Values, std::size_t Boundary = argument_count>
typename std::enable_if<(sizeof...(Values) == Boundary), void>::type run(
std::list<std::string> &pathParameter,
std::list<std::string> &pathArguments,
const HttpRequestPtr &req,
std::function<void(const HttpResponsePtr &)> &&callback,
Values &&... values)