qiurui
/
qthttpserver
mirror of https://github.com/qt/qthttpserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not disconnect on HTTP CONNECT method 

According HTTP/1.1 specifications (RFC 7231) CONNECT is intended only
for use in requests to a proxy. That it is why http-parser sets the upgrade flag.

This patch will allow users to decide how to handle this.

Change-Id: Ic2d10ca4ab113b4cac85e14f15af7890d5773e98
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Mikhail Svetkin 2020-02-17 22:16:55 +01:00
parent 65ba5db9e0
commit a65cc1fa6e
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/httpserver/qhttpserverrequest.cpp
View File

@ -291,6 +291,8 @@ QHttpServerRequest::Method QHttpServerRequest::method() const
return QHttpServerRequest::Method::Options;
case HTTP_PATCH:
return QHttpServerRequest::Method::Patch;
case HTTP_CONNECT:
return QHttpServerRequest::Method::Connect;
default:
return QHttpServerRequest::Method::Unknown;
}

6
src/httpserver/qhttpserverrequest.h
View File

@ -65,8 +65,9 @@ public:
Head = 0x0010,
Options = 0x0020,
Patch = 0x0040,
Connect = 0x0080,
All = Get | Put | Delete | Post | Head | Options | Patch,
All = Get | Put | Delete | Post | Head | Options | Patch | Connect,
// Include upper-case aliases for the sake of parsing from strings:
GET = Get,
@ -75,7 +76,8 @@ public:
POST = Post,
HEAD = Head,
OPTIONS = Options,
PATCH = Patch
PATCH = Patch,
CONNECT = Connect
};
Q_ENUM(Method)
Q_DECLARE_FLAGS(Methods, Method)

9
tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp
View File

@ -252,7 +252,12 @@ void tst_QAbstractHttpServer::qtbug82053()
{
struct HttpServer : QAbstractHttpServer
{
bool handleRequest(const QHttpServerRequest &, QTcpSocket *) override { return false; }
bool wasConnectRequest{false};
bool handleRequest(const QHttpServerRequest &req, QTcpSocket *) override
{
wasConnectRequest = (req.method() == QHttpServerRequest::Method::Connect);
return false;
}
} server;
auto tcpServer = new QTcpServer;
tcpServer->listen();
@ -264,6 +269,8 @@ void tst_QAbstractHttpServer::qtbug82053()
client.write("CONNECT / HTTP/1.1\n\n");
client.waitForBytesWritten();
QTest::qWait(0);
QCOMPARE(client.state(), QAbstractSocket::ConnectedState);
QTRY_VERIFY(server.wasConnectRequest);
}
QT_END_NAMESPACE