Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/network/kernel/qauthenticator.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the QtNetwork module of the Qt Toolkit.
     
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
     
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
     
    4747#include <qcryptographichash.h>
    4848#include <qhttp.h>
     49
    4950#include <qdatastream.h>
    5051#include <qendian.h>
     
    6465
    6566  \reentrant
    66   \ingroup io
     67  \ingroup
    6768  \inmodule QtNetwork
    6869
    6970  The QAuthenticator class is usually used in the
    70   \l{QHttp::}{authenticationRequired()} and
    71   \l{QHttp::}{proxyAuthenticationRequired()} signals of QHttp and
     71  \l{Q::}{authenticationRequired()} and
     72  \l{Q and
    7273  QAbstractSocket. The class provides a way to pass back the required
    7374  authentication information to the socket when accessing services that
    7475  require authentication.
     76
     77
     78
     79
     80
     81
     82
     83
     84
    7585
    7686  \sa QSslSocket
     
    503513    if (!opaque.isEmpty())
    504514        credentials += "opaque=\"" + opaque + "\", ";
    505     credentials += "response=\"" + response + "\"";
     515    credentials += "response=\"" + response + ;
    506516    if (!options.value("algorithm").isEmpty())
    507517        credentials += ", algorithm=" + options.value("algorithm");
     
    509519        credentials += ", qop=" + qop + ", ";
    510520        credentials += "nc=" + nonceCountString + ", ";
    511         credentials += "cnonce=\"" + cnonce + "\"";
     521        credentials += "cnonce=\"" + cnonce + ;
    512522    }
    513523
Note: See TracChangeset for help on using the changeset viewer.