summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2011-12-31 12:40:49 (GMT)
committerSergio Ahumada <sergio.ahumada@nokia.com>2011-12-31 12:40:49 (GMT)
commit4ddc7c52d6c00239f97e85c7fc5c20a0f87d3539 (patch)
treedcdd3ad2039cac04014477f0971bee64c6ec42d3
parente20f4b18d9626d49d0e019354229cb43d4e3182b (diff)
downloadQt-4ddc7c52d6c00239f97e85c7fc5c20a0f87d3539.zip
Qt-4ddc7c52d6c00239f97e85c7fc5c20a0f87d3539.tar.gz
Qt-4ddc7c52d6c00239f97e85c7fc5c20a0f87d3539.tar.bz2
Revert "Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny"
This reverts commit b070ad6a9804b6a7387f848c2e1721c16b8ccc62. Regarding the comments on b070ad6a9804b6a7387f848c2e1721c16b8ccc62 in 4.7, this should not be merged into 4.8 since the internals have changed. Conflicts: src/network/access/qnetworkaccesshttpbackend.cpp
-rw-r--r--tests/auto/qnetworkreply/tst_qnetworkreply.cpp44
1 files changed, 0 insertions, 44 deletions
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index ebf667f..371ac57 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -345,8 +345,6 @@ private Q_SLOTS:
void getAndThenDeleteObject_data();
void getAndThenDeleteObject();
- void deleteManagerWhileGetIsInProgress();
-
void symbianOpenCDataUrlCrash();
void getFromHttpIntoBuffer_data();
@@ -5661,48 +5659,6 @@ void tst_QNetworkReply::getAndThenDeleteObject()
}
}
-void tst_QNetworkReply::deleteManagerWhileGetIsInProgress()
-{
- // yes, this will leak if the testcase fails. I don't care. It must not fail then :P
- QNetworkAccessManager *manager = new QNetworkAccessManager();
- QNetworkRequest request("http://" + QtNetworkSettings::serverName() + "/qtest/bigfile");
- QNetworkReply *reply = manager->get(request);
- reply->setReadBufferSize(1024);
-
- // Reset reply's parent to allow it to outlive the manager
- reply->setParent(0);
-
- // Wait until a buffer is received
- int totalWait = 0;
- while (!reply->bytesAvailable()) {
- QTest::qWait(20);
- totalWait += 20;
- QVERIFY( totalWait <= 5*1000);
- }
-
- QVERIFY(reply->bytesAvailable());
- QCOMPARE(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), 200);
- QVERIFY(!reply->isFinished()); // must not be finished
-
- // Read the data to request next buffer's worth from the server
- (void)reply->readAll();
-
- QSignalSpy replyFinishedSpy(reply, SIGNAL(finished()));
-
- // Delete the manager
- delete manager;
- manager = 0;
-
- // Wait to allow reply to process any pending events
- QTest::qWait(100);
-
- // The reply should be finished
- QVERIFY(reply->isFinished());
- QCOMPARE(replyFinishedSpy.count(), 1);
-
- delete reply;
-}
-
// see https://bugs.webkit.org/show_bug.cgi?id=38935
void tst_QNetworkReply::symbianOpenCDataUrlCrash()
{