diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-12 21:59:46 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-12 21:59:46 (GMT) |
| commit | f129de853154dc1d72cb5651606ca009c3b1f814 (patch) | |
| tree | 8d500bcf8e6ef1f6a5f4ea0bc63f1810e6b167ff /tests/auto/qsslcertificate/tst_qsslcertificate.cpp | |
| parent | 1aa4cfab2d437210b8c0b064fa3bd071e53374c1 (diff) | |
| parent | 0293aff5c44202e5c62e229b74d8bd0bf9206185 (diff) | |
| download | Qt-f129de853154dc1d72cb5651606ca009c3b1f814.zip Qt-f129de853154dc1d72cb5651606ca009c3b1f814.tar.gz Qt-f129de853154dc1d72cb5651606ca009c3b1f814.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
Diffstat (limited to 'tests/auto/qsslcertificate/tst_qsslcertificate.cpp')
| -rw-r--r-- | tests/auto/qsslcertificate/tst_qsslcertificate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp index b16b3cc..9cd9f39 100644 --- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp @@ -771,7 +771,7 @@ void tst_QSslCertificate::nulInSan() QVERIFY(!dnssan.isEmpty()); QVERIFY(dnssan != "www.bank.com"); - static const char realSAN[] = "www.bank.com\0.badguy.com"; + static const char realSAN[] = "www.bank.com\0www.badguy.com"; QCOMPARE(dnssan, QString::fromLatin1(realSAN, sizeof realSAN - 1)); } |