SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

http server fix

Browse Source
This commit is contained in:
Пелипенко Иван
2024-11-25 15:00:42 +03:00
parent 1acaf24df9
commit 58b3fa64bc
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/http_server/microhttpd_server_p.cpp
View File

@@ -88,7 +88,7 @@ bool MicrohttpdServerConnection::ready() {
return true; return true;
} }
} }
// piCout << "ready" << (int)method << path; // piCout << "ready" << (int)method << path << body.size();
MessageMutable req; MessageMutable req;
req.setMethod(method); req.setMethod(method);
req.setPath(path); req.setPath(path);
@@ -242,15 +242,16 @@ int answer_callback(void * cls,
conn->method = m; conn->method = m;
MHD_get_connection_values(connection, MHD_HEADER_KIND, (MHD_KeyValueIterator)header_iterate, *con_cls); MHD_get_connection_values(connection, MHD_HEADER_KIND, (MHD_KeyValueIterator)header_iterate, *con_cls);
MHD_get_connection_values(connection, MHD_GET_ARGUMENT_KIND, (MHD_KeyValueIterator)args_iterate, *con_cls); MHD_get_connection_values(connection, MHD_GET_ARGUMENT_KIND, (MHD_KeyValueIterator)args_iterate, *con_cls);
if (server->isBasicAuthEnabled() && !conn->authorized) {
if (!conn->checkBasicAuth()) return MHD_YES;
}
return MHD_YES;
} }
if (m == Method::Unknown) { if (m == Method::Unknown) {
return conn->sendReply(MessageMutable::fromCode(Code::MethodNotAllowed)); return conn->sendReply(MessageMutable::fromCode(Code::MethodNotAllowed));
} }
if (server->isBasicAuthEnabled() && !conn->authorized) {
if (!conn->checkBasicAuth()) return MHD_YES;
}
if (*upload_data_size) { if (*upload_data_size) {
if (!conn->postprocessor) { if (!conn->postprocessor) {

5
main.cpp
View File

@@ -29,9 +29,10 @@ int main(int argc, char * argv[]) {
}); });
server.registerUnhandled([](const PIHTTP::MessageConst & msg) -> PIHTTP::MessageMutable { server.registerUnhandled([](const PIHTTP::MessageConst & msg) -> PIHTTP::MessageMutable {
PIHTTP::MessageMutable ret; PIHTTP::MessageMutable ret;
piCout << "server rec:\n\tpath: %1\n\tmethod: %2\n\targs: %3\n\tbody: %4\n"_a.arg(msg.path()) piCout << "server rec:\n\tpath: %1\n\tmethod: %2\n\targs: %3\n\theaders: %4\n\tbody: %5\n"_a.arg(msg.path())
.arg((int)msg.method()) .arg((int)msg.method())
.arg(stringify(msg.arguments())) .arg(stringify(msg.arguments()))
.arg(PIStringList(msg.headers().map<PIString>([](PIString k, PIString v) { return k + " = " + v; })).join("\n\t\t"))
.arg(PIString::fromUTF8(msg.body())); .arg(PIString::fromUTF8(msg.body()));
ret.setCode(PIHTTP::Code::BadRequest); ret.setCode(PIHTTP::Code::BadRequest);
ret.setBody(PIByteArray::fromAscii("hello client! 0123456789")); ret.setBody(PIByteArray::fromAscii("hello client! 0123456789"));
@@ -40,7 +41,7 @@ int main(int argc, char * argv[]) {
PIHTTP::MessageMutable req; PIHTTP::MessageMutable req;
req.setBody(PIByteArray::fromAscii("hello server!")); req.setBody(PIByteArray::fromAscii("hello server!"));
auto * c = PIHTTPClient::create("http://u:p2@127.0.0.1:7777/api", PIHTTP::Method::Get, req); auto * c = PIHTTPClient::create("http://u:p@127.0.0.1:7777/api", PIHTTP::Method::Get, req);
c->onFinish([](PIHTTP::MessageConst msg) { c->onFinish([](PIHTTP::MessageConst msg) {
piCout << "client rec:\n\tcode: %5\n\tpath: %1\n\tmethod: %2\n\targs: %3\n\tbody: %4\n"_a.arg(msg.path()) piCout << "client rec:\n\tcode: %5\n\tpath: %1\n\tmethod: %2\n\targs: %3\n\tbody: %4\n"_a.arg(msg.path())
.arg((int)msg.method()) .arg((int)msg.method())