~ubuntu-branches/ubuntu/karmic/arora/karmic

« back to all changes in this revision

Viewing changes to src/network/networkaccessmanager.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Roderick B. Greening
  • Date: 2009-10-05 12:44:10 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20091005124410-upkpwpiq4pwihapj
Tags: 0.10.1-0ubuntu1
New release

Show diffs side-by-side

added added

removed removed

Lines of Context:
88
88
#include <qsslerror.h>
89
89
#include <qdatetime.h>
90
90
 
 
91
// #define NETWORKACCESSMANAGER_DEBUG
 
92
 
91
93
NetworkAccessManager::NetworkAccessManager(QObject *parent)
92
94
    : NetworkAccessManagerProxy(parent)
93
95
    , m_adblockNetwork(0)
165
167
    QList<QSslCertificate> ca_list = sslCfg.caCertificates();
166
168
    QList<QSslCertificate> ca_new = QSslCertificate::fromData(settings.value(QLatin1String("CaCertificates")).toByteArray());
167
169
    ca_list += ca_new;
168
 
 
169
170
    sslCfg.setCaCertificates(ca_list);
170
171
    QSslConfiguration::setDefaultConfiguration(sslCfg);
171
172
#endif
196
197
 
197
198
void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthenticator *auth)
198
199
{
 
200
#ifdef NETWORKACCESSMANAGER_DEBUG
 
201
    qDebug() << __FUNCTION__ << reply;
 
202
#endif
199
203
    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
200
204
 
201
205
    QDialog dialog(mainWindow);
220
224
 
221
225
void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth)
222
226
{
 
227
#ifdef NETWORKACCESSMANAGER_DEBUG
 
228
    qDebug() << __FUNCTION__;
 
229
#endif
223
230
    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
224
231
 
225
232
    QDialog dialog(mainWindow);
269
276
 
270
277
void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError> &error)
271
278
{
 
279
#ifdef NETWORKACCESSMANAGER_DEBUG
 
280
    qDebug() << __FUNCTION__;
 
281
#endif
272
282
    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
273
283
 
274
284
    QSettings settings;
339
349
    }
340
350
 
341
351
    QNetworkReply *reply = 0;
342
 
 
343
352
    // Check if there is a valid handler registered for the requested URL scheme
344
353
    if (m_schemeHandlers.contains(request.url().scheme()))
345
354
        reply = m_schemeHandlers[request.url().scheme()]->createRequest(op, request, outgoingData);