History

Update HTTPConnection to not use QIODevice when given a QByteArray

Ryan Huffman committed 8 years ago

Commit bb8caa01 parent efa55c02 files · +38 −35Browse files

Showing the changes to libraries/embedded-webserver/src/HTTPConnection.cpp (1 of 2 files). Show all

Unified · Split

libraries/embedded-webserver/src/HTTPConnection.cpp+37−35
@@ -133,57 +133,33 @@ QList<FormData> HTTPConnection::parseFormData() const { · 132 unmodified lines
133133 }
134134
135135 void HTTPConnection::respond(const char* code, const QByteArray& content, const char* contentType, const Headers& headers) {
136− QByteArray data(content);
137− auto device { std::unique_ptr<QBuffer>(new QBuffer()) };
138− device->setBuffer(new QByteArray(content));
139− if (device->open(QIODevice::ReadOnly)) {
140− respond(code, std::move(device), contentType, headers);
141− } else {
142− qCritical() << "Error opening QBuffer to respond to " << _requestUrl.path();
143− }
136+ respondWithStatusAndHeaders(code, contentType, headers, content.size());
137+
138+ _socket->write(content);
139+
140+ _socket->disconnectFromHost();
141+
142+ // make sure we receive no further read notifications
143+ disconnect(_socket, &QTcpSocket::readyRead, this, nullptr);
144144 }
145145
146146 void HTTPConnection::respond(const char* code, std::unique_ptr<QIODevice> device, const char* contentType, const Headers& headers) {
147147 _responseDevice = std::move(device);
148148
149− _socket->write("HTTP/1.1 ");
150−
151149 if (_responseDevice->isSequential()) {
152150 qWarning() << "Error responding to HTTPConnection: sequential IO devices not supported";
153− _socket->write(StatusCode500);
154− _socket->write("\r\n");
151+ respondWithStatusAndHeaders(StatusCode500, contentType, headers, 0);
155152 _socket->disconnect(SIGNAL(readyRead()), this);
156153 _socket->disconnectFromHost();
157154 return;
158155 }
159156
160− _socket->write(code);
161− _socket->write("\r\n");
162−
163− for (Headers::const_iterator it = headers.constBegin(), end = headers.constEnd();
164− it != end; it++) {
165− _socket->write(it.key());
166− _socket->write(": ");
167− _socket->write(it.value());
168− _socket->write("\r\n");
169− }
170−
171− int csize = _responseDevice->size();
172− if (csize > 0) {
173− _socket->write("Content-Length: ");
174− _socket->write(QByteArray::number(csize));
175− _socket->write("\r\n");
176−
177− _socket->write("Content-Type: ");
178− _socket->write(contentType);
179− _socket->write("\r\n");
180− }
181− _socket->write("Connection: close\r\n\r\n");
157+ int totalToBeWritten = _responseDevice->size();
158+ respondWithStatusAndHeaders(code, contentType, headers, totalToBeWritten);
182159
183160 if (_responseDevice->atEnd()) {
184161 _socket->disconnectFromHost();
185162 } else {
186− int totalToBeWritten = csize;
187163 connect(_socket, &QTcpSocket::bytesWritten, this, [this, totalToBeWritten](size_t bytes) mutable {
188164 constexpr size_t HTTP_RESPONSE_CHUNK_SIZE = 1024 * 10;
189165 if (!_responseDevice->atEnd()) {
@@ -201,6 +177,32 @@ void HTTPConnection::respond(const char* code, std::unique_ptr<QIODevice> device · 11 unmodified lines
201177 disconnect(_socket, &QTcpSocket::readyRead, this, nullptr);
202178 }
203179
180+void HTTPConnection::respondWithStatusAndHeaders(const char* code, const char* contentType, const Headers& headers, int64_t contentLength) {
181+ _socket->write("HTTP/1.1 ");
182+
183+ _socket->write(code);
184+ _socket->write("\r\n");
185+
186+ for (Headers::const_iterator it = headers.constBegin(), end = headers.constEnd();
187+ it != end; it++) {
188+ _socket->write(it.key());
189+ _socket->write(": ");
190+ _socket->write(it.value());
191+ _socket->write("\r\n");
192+ }
193+
194+ if (contentLength > 0) {
195+ _socket->write("Content-Length: ");
196+ _socket->write(QByteArray::number(contentLength));
197+ _socket->write("\r\n");
198+
199+ _socket->write("Content-Type: ");
200+ _socket->write(contentType);
201+ _socket->write("\r\n");
202+ }
203+ _socket->write("Connection: close\r\n\r\n");
204+}
205+
204206 void HTTPConnection::readRequest() {
205207 if (!_socket->canReadLine()) {
206208 return;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t