aboutsummaryrefslogtreecommitdiffstats
path: root/src/kvilib/net/KviHttpRequest.cpp
diff options
context:
space:
mode:
authorGravatar Robert Förster2014-11-21 14:34:32 +0000
committerGravatar Robert Förster2014-11-21 14:34:32 +0000
commit43e0468a233a49b1010f34c5ce888204fa4e9416 (patch)
treeb1f97b1b9fdfc72677b935d34e26c70fa7030feb /src/kvilib/net/KviHttpRequest.cpp
parentTrivial typo (diff)
downloadKVIrc-43e0468a233a49b1010f34c5ce888204fa4e9416.tar.gz
KVIrc-43e0468a233a49b1010f34c5ce888204fa4e9416.tar.bz2
KVIrc-43e0468a233a49b1010f34c5ce888204fa4e9416.zip
- massive trailing whitespace cleanup (yes, one of these "you can hate me for that" commits)
- apply patch by d00p: show the correct protocol version instead of just "SSLv3/TLSv1", thanks! - fix compilation on qt 5.4 on windows git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6398 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/kvilib/net/KviHttpRequest.cpp')
-rw-r--r--src/kvilib/net/KviHttpRequest.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/kvilib/net/KviHttpRequest.cpp b/src/kvilib/net/KviHttpRequest.cpp
index 98bf7b91a..d85e4d7f6 100644
--- a/src/kvilib/net/KviHttpRequest.cpp
+++ b/src/kvilib/net/KviHttpRequest.cpp
@@ -77,7 +77,7 @@ KviHttpRequest::KviHttpRequest()
KviHttpRequest::~KviHttpRequest()
{
resetInternalStatus();
-
+
KVI_ASSERT(!(m_p->pSocket));
KVI_ASSERT(!(m_p->pFile));
@@ -212,12 +212,12 @@ void KviHttpRequest::closeSocket()
m_p->pSocket->abort();
m_p->pSocket->close();
-
+
// This can be called from a socket handler slot
m_p->pSocket->deleteLater();
-
+
//delete m_p->pSocket;
-
+
m_p->pSocket = NULL;
}
@@ -272,9 +272,9 @@ void KviHttpRequest::slotSocketConnected()
);
KviCString szMethod;
-
+
bool bIsPost = false;
-
+
if(m_eProcessingType == HeadersOnly)
szMethod = "HEAD";
else if(m_szPostData.isEmpty())
@@ -349,7 +349,7 @@ void KviHttpRequest::slotSocketReadDataReady()
}
// FIXME: Avoid double-buffering here!
-
+
KviDataBuffer oBuffer(iBytes);
int iRead = m_p->pSocket->read((char *)(oBuffer.data()),iBytes);
@@ -361,7 +361,7 @@ void KviHttpRequest::slotSocketReadDataReady()
slotSocketDisconnected();
return;
}
-
+
// FIXME
// well... otherwise just wait.
// FIXME ?
@@ -438,7 +438,7 @@ bool KviHttpRequest::doConnect()
delete m_p->pConnectTimeoutTimer;
m_p->pConnectTimeoutTimer = NULL;
}
-
+
m_p->pConnectTimeoutTimer = new QTimer();
m_p->pConnectTimeoutTimer->setSingleShot(true);
QObject::connect(m_p->pConnectTimeoutTimer,SIGNAL(timeout()),this,SLOT(slotConnectionTimedOut()));
@@ -459,7 +459,7 @@ bool KviHttpRequest::doConnect()
);
*/
-
+
return true;
}
@@ -727,9 +727,9 @@ bool KviHttpRequest::processHeader(KviCString &szHeader)
{
// this is not "OK" and not "Partial content"
// Error, redirect or something confusing
-
+
// FIXME: Handle 30x codes by re-issuing the request with the new URI ?
-
+
if(m_eProcessingType != HeadersOnly)
{
// this is an error then