mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated HttpConnectionHandler for a better support of UIWebView connections when data plan is used

Browse Source
This commit is contained in:
Luis Ángel San Martín 2015-05-24 19:32:14 +02:00
parent d310289b21
commit 401c1ab1d9
1 changed files with 59 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
YACReaderLibrary/server/lib/bfHttpServer/httpconnectionhandler.cpp
View File

@ -99,66 +99,72 @@ void HttpConnectionHandler::disconnected() {
} }
void HttpConnectionHandler::read() { void HttpConnectionHandler::read() {
while (socket.bytesAvailable()) {
#ifdef SUPERVERBOSE #ifdef SUPERVERBOSE
qDebug("HttpConnectionHandler (%p): read input",this); qDebug("HttpConnectionHandler (%p): read input",this);
#endif #endif
// Create new HttpRequest object if necessary // Create new HttpRequest object if necessary
if (!currentRequest) { if (!currentRequest) {
currentRequest=new HttpRequest(settings); currentRequest=new HttpRequest(settings);
}
// Collect data for the request object
while (socket.bytesAvailable() && currentRequest->getStatus()!=HttpRequest::complete && currentRequest->getStatus()!=HttpRequest::abort) {
currentRequest->readFromSocket(socket);
if (currentRequest->getStatus()==HttpRequest::waitForBody) {
// Restart timer for read timeout, otherwise it would
// expire during large file uploads.
int readTimeout=settings->value("readTimeout",10000).toInt();
readTimer.start(readTimeout);
}
}
// If the request is aborted, return error message and close the connection
if (currentRequest->getStatus()==HttpRequest::abort) {
socket.write("HTTP/1.1 413 entity too large\r\nConnection: close\r\n\r\n413 Entity too large\r\n");
socket.disconnectFromHost();
delete currentRequest;
currentRequest=0;
return;
}
// If the request is complete, let the request mapper dispatch it
if (currentRequest->getStatus()==HttpRequest::complete) {
readTimer.stop();
qDebug("HttpConnectionHandler (%p): received request",this);
HttpResponse response(&socket);
//response.setHeader("Connection","close"); No funciona bien con NSURLConnection
try {
requestHandler->service(*currentRequest, response);
}
catch (...) {
qCritical("HttpConnectionHandler (%p): An uncatched exception occured in the request handler",this);
} }
// Finalize sending the response if not already done // Collect data for the request object
if (!response.hasSentLastPart()) { while (socket.bytesAvailable() && currentRequest->getStatus()!=HttpRequest::complete && currentRequest->getStatus()!=HttpRequest::abort) {
response.write(QByteArray(),true); currentRequest->readFromSocket(socket);
if (currentRequest->getStatus()==HttpRequest::waitForBody) {
// Restart timer for read timeout, otherwise it would
// expire during large file uploads.
int readTimeout=settings->value("readTimeout",10000).toInt();
readTimer.start(readTimeout);
}
} }
socket.disconnectFromHost(); //CAMBIADO sólo se van a soportar conexiones NO persistentes // If the request is aborted, return error message and close the connection
if (currentRequest->getStatus()==HttpRequest::abort) {
socket.write("HTTP/1.1 413 entity too large\r\nConnection: close\r\n\r\n413 Entity too large\r\n");
socket.disconnectFromHost();
delete currentRequest;
currentRequest=0;
return;
}
// Close the connection after delivering the response, if requested // If the request is complete, let the request mapper dispatch it
//if (QString::compare(currentRequest->getHeader("Connection"),"close",Qt::CaseInsensitive)==0) { if (currentRequest->getStatus()==HttpRequest::complete) {
// socket.disconnectFromHost(); readTimer.stop();
//} qDebug("HttpConnectionHandler (%p): received request",this);
//else { HttpResponse response(&socket);
// // Start timer for next request //response.setHeader("Connection","close"); No funciona bien con NSURLConnection
// int readTimeout=settings->value("readTimeout",10000).toInt(); try {
// readTimer.start(readTimeout); requestHandler->service(*currentRequest, response);
//} }
// Prepare for next request catch (...) {
delete currentRequest; qCritical("HttpConnectionHandler (%p): An uncatched exception occured in the request handler",this);
currentRequest=0; }
// Finalize sending the response if not already done
if (!response.hasSentLastPart()) {
response.write(QByteArray(),true);
}
//socket.disconnectFromHost(); //CAMBIADO sólo se van a soportar conexiones NO persistentes
// Close the connection after delivering the response, if requested
if (QString::compare(currentRequest->getHeader("Connection"),"close",Qt::CaseInsensitive)==0) {
socket.disconnectFromHost();
}
else {
// Start timer for next request
int readTimeout=settings->value("readTimeout",10000).toInt();
readTimer.start(readTimeout);
}
// Prepare for next request
delete currentRequest;
currentRequest=0;
}
else
{
qDebug("HttpConnectionHandler (%p): received request",this);
}
} }
} }