diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:51:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:51:07 +0200 |
| commit | 553b494db72588d065114bbe1ee5949dd2d58963 (patch) | |
| tree | 7f5dea22f5fe75267c7ef2162a46b80ec42edcbb | |
| parent | 0310d0d71287f78339c47daaff7598a30d2f08f8 (diff) | |
| parent | 0d592678bad23a77f35c109253a0263664e69812 (diff) | |
| download | qtwebkit-553b494db72588d065114bbe1ee5949dd2d58963.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I33f49683dbb3f99f4149accfeddeea95b309657f
| -rw-r--r-- | Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp | 4 | ||||
| -rw-r--r-- | Source/WebCore/platform/network/qt/QtMIMETypeSniffer.cpp | 4 | ||||
| -rw-r--r-- | Source/WebKit2/WebProcess.pro | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp index e24d0b1c8..e07bc76a9 100644 --- a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp +++ b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp @@ -683,6 +683,10 @@ void QNetworkReplyHandler::forwardData() { ASSERT(m_replyWrapper && m_replyWrapper->reply() && !wasAborted() && !m_replyWrapper->wasRedirected()); + // reply may be closed if reply->close() or reply->abort() is called + if (!m_replyWrapper->reply()->isReadable()) + return; + ResourceHandleClient* client = m_resourceHandle->client(); if (!client) return; diff --git a/Source/WebCore/platform/network/qt/QtMIMETypeSniffer.cpp b/Source/WebCore/platform/network/qt/QtMIMETypeSniffer.cpp index 60ab727ce..bd119a8e1 100644 --- a/Source/WebCore/platform/network/qt/QtMIMETypeSniffer.cpp +++ b/Source/WebCore/platform/network/qt/QtMIMETypeSniffer.cpp @@ -41,6 +41,10 @@ QtMIMETypeSniffer::QtMIMETypeSniffer(QNetworkReply* reply, const QString& advert bool QtMIMETypeSniffer::sniff() { + // reply may be closed if reply->close() or reply->abort() is called + if (!m_reply->isReadable()) + return true; + // See QNetworkReplyWrapper::setFinished(). const bool isReplyFinished = m_reply->property("_q_isFinished").toBool(); diff --git a/Source/WebKit2/WebProcess.pro b/Source/WebKit2/WebProcess.pro index b832cb479..3463b9431 100644 --- a/Source/WebKit2/WebProcess.pro +++ b/Source/WebKit2/WebProcess.pro @@ -5,7 +5,7 @@ # ------------------------------------------------------------------- TEMPLATE = app - +!build_pass:contains(QT_CONFIG, debug_and_release):contains(QT_CONFIG, build_all): CONFIG += release TARGET = QtWebProcess DESTDIR = $${ROOT_BUILD_DIR}/bin |