From 4ddc7c52d6c00239f97e85c7fc5c20a0f87d3539 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sat, 31 Dec 2011 13:40:49 +0100 Subject: 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 --- tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 44 -------------------------- 1 file changed, 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() { -- cgit v0.12