From 15b371a7a86d559ee2db578eb2d0943b33935e8a Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Mon, 28 Jan 2008 17:37:36 +0000 Subject: [PATCH] synced with main repository --- NetSSL_OpenSSL/.project | 4 +- .../Poco/Net/AcceptCertificateHandler.h | 2 +- .../Poco/Net/CertificateHandlerFactory.h | 2 +- .../Poco/Net/CertificateHandlerFactoryMgr.h | 2 +- .../Poco/Net/ConsoleCertificateHandler.h | 2 +- NetSSL_OpenSSL/include/Poco/Net/Context.h | 2 +- .../include/Poco/Net/HTTPSClientSession.h | 2 +- .../Poco/Net/HTTPSSessionInstantiator.h | 2 +- .../include/Poco/Net/HTTPSStreamFactory.h | 2 +- .../Poco/Net/InvalidCertificateHandler.h | 2 +- .../include/Poco/Net/KeyConsoleHandler.h | 2 +- .../include/Poco/Net/KeyFileHandler.h | 2 +- NetSSL_OpenSSL/include/Poco/Net/NetSSL.h | 2 +- .../include/Poco/Net/PrivateKeyFactory.h | 2 +- .../include/Poco/Net/PrivateKeyFactoryMgr.h | 2 +- .../Poco/Net/PrivateKeyPassphraseHandler.h | 2 +- .../include/Poco/Net/SSLException.h | 2 +- .../include/Poco/Net/SSLInitializer.h | 2 +- NetSSL_OpenSSL/include/Poco/Net/SSLManager.h | 2 +- .../include/Poco/Net/SecureServerSocket.h | 2 +- .../include/Poco/Net/SecureServerSocketImpl.h | 2 +- .../include/Poco/Net/SecureSocketImpl.h | 2 +- .../include/Poco/Net/SecureStreamSocket.h | 2 +- .../include/Poco/Net/SecureStreamSocketImpl.h | 2 +- NetSSL_OpenSSL/include/Poco/Net/Utility.h | 2 +- .../include/Poco/Net/VerificationErrorArgs.h | 2 +- .../include/Poco/Net/X509Certificate.h | 2 +- .../HTTPSTimeServer/src/HTTPSTimeServer.cpp | 4 +- NetSSL_OpenSSL/samples/Makefile | 2 +- .../samples/download/src/download.cpp | 2 +- .../src/AcceptCertificateHandler.cpp | 2 +- .../src/CertificateHandlerFactory.cpp | 2 +- .../src/CertificateHandlerFactoryMgr.cpp | 2 +- .../src/ConsoleCertificateHandler.cpp | 2 +- NetSSL_OpenSSL/src/Context.cpp | 2 +- NetSSL_OpenSSL/src/HTTPSClientSession.cpp | 2 +- .../src/HTTPSSessionInstantiator.cpp | 2 +- NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp | 2 +- .../src/InvalidCertificateHandler.cpp | 2 +- NetSSL_OpenSSL/src/KeyConsoleHandler.cpp | 2 +- NetSSL_OpenSSL/src/KeyFileHandler.cpp | 2 +- NetSSL_OpenSSL/src/PrivateKeyFactory.cpp | 2 +- NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp | 2 +- .../src/PrivateKeyPassphraseHandler.cpp | 2 +- NetSSL_OpenSSL/src/SSLException.cpp | 2 +- NetSSL_OpenSSL/src/SSLInitializer.cpp | 4 +- NetSSL_OpenSSL/src/SSLManager.cpp | 2 +- NetSSL_OpenSSL/src/SecureServerSocket.cpp | 2 +- NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp | 2 +- NetSSL_OpenSSL/src/SecureSocketImpl.cpp | 2 +- NetSSL_OpenSSL/src/SecureStreamSocket.cpp | 2 +- NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp | 2 +- NetSSL_OpenSSL/src/Utility.cpp | 2 +- NetSSL_OpenSSL/src/VerificationErrorArgs.cpp | 2 +- NetSSL_OpenSSL/src/X509Certificate.cpp | 2 +- .../testsuite/TestSuite_vs71.vcproj | 118 ++++++++++++ .../testsuite/TestSuite_vs80.vcproj | 179 +++++++++++++++++- NetSSL_OpenSSL/testsuite/src/Driver.cpp | 2 +- .../testsuite/src/HTTPSClientSessionTest.cpp | 20 +- .../testsuite/src/HTTPSClientSessionTest.h | 3 +- .../testsuite/src/HTTPSClientTestSuite.cpp | 2 +- .../testsuite/src/HTTPSClientTestSuite.h | 2 +- .../testsuite/src/HTTPSServerTest.cpp | 2 +- .../testsuite/src/HTTPSServerTest.h | 2 +- .../testsuite/src/HTTPSServerTestSuite.cpp | 2 +- .../testsuite/src/HTTPSServerTestSuite.h | 2 +- .../testsuite/src/HTTPSStreamFactoryTest.cpp | 2 +- .../testsuite/src/HTTPSStreamFactoryTest.h | 2 +- .../testsuite/src/HTTPSTestServer.cpp | 2 +- .../testsuite/src/HTTPSTestServer.h | 2 +- .../testsuite/src/NetSSLTestSuite.cpp | 2 +- .../testsuite/src/NetSSLTestSuite.h | 2 +- .../testsuite/src/TCPServerTest.cpp | 2 +- NetSSL_OpenSSL/testsuite/src/TCPServerTest.h | 2 +- .../testsuite/src/TCPServerTestSuite.cpp | 2 +- .../testsuite/src/TCPServerTestSuite.h | 2 +- NetSSL_OpenSSL/testsuite/src/WinDriver.cpp | 2 +- 77 files changed, 395 insertions(+), 77 deletions(-) diff --git a/NetSSL_OpenSSL/.project b/NetSSL_OpenSSL/.project index e14173116..2032a5fd4 100644 --- a/NetSSL_OpenSSL/.project +++ b/NetSSL_OpenSSL/.project @@ -1,8 +1,10 @@ - NetSSL_OpenSSL + Net + Foundation + NetSSL_OpenSSL diff --git a/NetSSL_OpenSSL/include/Poco/Net/AcceptCertificateHandler.h b/NetSSL_OpenSSL/include/Poco/Net/AcceptCertificateHandler.h index c2c50891b..0fbf1f223 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/AcceptCertificateHandler.h +++ b/NetSSL_OpenSSL/include/Poco/Net/AcceptCertificateHandler.h @@ -1,7 +1,7 @@ // // AcceptCertificateHandler.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/AcceptCertificateHandler.h#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/AcceptCertificateHandler.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h b/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h index f92dab678..c9150961d 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h +++ b/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h @@ -1,7 +1,7 @@ // // CertificateHandlerFactory.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactoryMgr.h b/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactoryMgr.h index 26ec8e656..45f110cb4 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactoryMgr.h +++ b/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactoryMgr.h @@ -1,7 +1,7 @@ // // CertificateHandlerFactoryMgr.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactoryMgr.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactoryMgr.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h b/NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h index 332aa814e..176e7c389 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h +++ b/NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h @@ -1,7 +1,7 @@ // // ConsoleCertificateHandler.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/Context.h b/NetSSL_OpenSSL/include/Poco/Net/Context.h index 6d569b620..16e94ee68 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/Context.h +++ b/NetSSL_OpenSSL/include/Poco/Net/Context.h @@ -1,7 +1,7 @@ // // Context.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/Context.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/Context.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h b/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h index 3ea6a4130..1d461e6a9 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h +++ b/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h @@ -1,7 +1,7 @@ // // HTTPSClientSession.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h#8 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h#1 $ // // Library: NetSSL_OpenSSL // Package: HTTPSClient diff --git a/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h b/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h index d9bfad142..3d3dfb3f2 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h +++ b/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h @@ -1,7 +1,7 @@ // // HTTPSSessionInstantiator.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h#1 $ // // Library: NetSSL_OpenSSL // Package: HTTPSClient diff --git a/NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h b/NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h index 53335fda9..62e552168 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h +++ b/NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h @@ -1,7 +1,7 @@ // // HTTPSStreamFactory.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h#1 $ // // Library: NetSSL_OpenSSL // Package: HTTPSClient diff --git a/NetSSL_OpenSSL/include/Poco/Net/InvalidCertificateHandler.h b/NetSSL_OpenSSL/include/Poco/Net/InvalidCertificateHandler.h index 617394e16..020e8a34a 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/InvalidCertificateHandler.h +++ b/NetSSL_OpenSSL/include/Poco/Net/InvalidCertificateHandler.h @@ -1,7 +1,7 @@ // // InvalidCertificateHandler.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/InvalidCertificateHandler.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/InvalidCertificateHandler.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/KeyConsoleHandler.h b/NetSSL_OpenSSL/include/Poco/Net/KeyConsoleHandler.h index 806759dce..1f679490e 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/KeyConsoleHandler.h +++ b/NetSSL_OpenSSL/include/Poco/Net/KeyConsoleHandler.h @@ -1,7 +1,7 @@ // // KeyConsoleHandler.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/KeyConsoleHandler.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/KeyConsoleHandler.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h b/NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h index 30d2f6cce..efc74e8fa 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h +++ b/NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h @@ -1,7 +1,7 @@ // // KeyFileHandler.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h b/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h index 314cdcef6..edfb35bf4 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h +++ b/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h @@ -1,7 +1,7 @@ // // NetSSL.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h index 25288d7ed..1b1da6507 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h +++ b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h @@ -1,7 +1,7 @@ // // PrivateKeyFactory.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactoryMgr.h b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactoryMgr.h index 868081470..cbb505446 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactoryMgr.h +++ b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactoryMgr.h @@ -1,7 +1,7 @@ // // PrivateKeyFactoryMgr.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactoryMgr.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactoryMgr.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h index 96d730eec..7f6fdf6d4 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h +++ b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h @@ -1,7 +1,7 @@ // // PrivateKeyPassphraseHandler.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/SSLException.h b/NetSSL_OpenSSL/include/Poco/Net/SSLException.h index 00107eade..74d45e9c2 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SSLException.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SSLException.h @@ -1,7 +1,7 @@ // // SSLException.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/SSLException.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/SSLException.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/SSLInitializer.h b/NetSSL_OpenSSL/include/Poco/Net/SSLInitializer.h index f7a3bf8b3..386c0242e 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SSLInitializer.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SSLInitializer.h @@ -1,7 +1,7 @@ // // SSLInitializer.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/SSLInitializer.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/SSLInitializer.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h b/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h index 368ee70a5..10cefcb9f 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h @@ -1,7 +1,7 @@ // // SSLManager.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h b/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h index 6e4e1c198..3e533701b 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h @@ -1,7 +1,7 @@ // // SecureServerSocket.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLSockets diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocketImpl.h b/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocketImpl.h index f151bd087..86b19b80f 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocketImpl.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocketImpl.h @@ -1,7 +1,7 @@ // // SecureServerSocketImpl.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocketImpl.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocketImpl.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLSockets diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h b/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h index 0f92a3bbf..3fbcb6098 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h @@ -1,7 +1,7 @@ // // SecureSocketImpl.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLSockets diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h index 1b225ba86..f38c86d1a 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h @@ -1,7 +1,7 @@ // // SecureStreamSocket.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLSockets diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h index 23de9e9dd..71b68bb14 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h @@ -1,7 +1,7 @@ // // SecureStreamSocketImpl.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLSockets diff --git a/NetSSL_OpenSSL/include/Poco/Net/Utility.h b/NetSSL_OpenSSL/include/Poco/Net/Utility.h index 07928b371..d4f54817d 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/Utility.h +++ b/NetSSL_OpenSSL/include/Poco/Net/Utility.h @@ -1,7 +1,7 @@ // // Utility.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/Utility.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/Utility.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/VerificationErrorArgs.h b/NetSSL_OpenSSL/include/Poco/Net/VerificationErrorArgs.h index 998fc07e8..7126e81b0 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/VerificationErrorArgs.h +++ b/NetSSL_OpenSSL/include/Poco/Net/VerificationErrorArgs.h @@ -1,7 +1,7 @@ // // VerificationErrorArgs.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/VerificationErrorArgs.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/VerificationErrorArgs.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h b/NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h index efaa72a72..d79927cec 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h +++ b/NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h @@ -1,7 +1,7 @@ // // X509Certificate.h // -// $Id: //poco/Main/NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp b/NetSSL_OpenSSL/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp index 1dc458ed5..9690d5cfe 100644 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp +++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp @@ -1,7 +1,7 @@ // // TimeServer.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp#5 $ +// $Id: //poco/svn/NetSSL_OpenSSL/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp#1 $ // // This sample demonstrates the HTTPServer and related classes. // @@ -100,7 +100,7 @@ public: response.setContentType("text/html"); std::ostream& ostr = response.send(); - ostr << "HTTPTimeServer powered by C++ Portable Components"; + ostr << "HTTPTimeServer powered by POCO C++ Libraries"; ostr << ""; ostr << "

"; ostr << dt; diff --git a/NetSSL_OpenSSL/samples/Makefile b/NetSSL_OpenSSL/samples/Makefile index 787fcda96..3a59cf298 100644 --- a/NetSSL_OpenSSL/samples/Makefile +++ b/NetSSL_OpenSSL/samples/Makefile @@ -1,7 +1,7 @@ # # Makefile # -# $Id: //poco/Main/NetSSL_OpenSSL/samples/Makefile#2 $ +# $Id: //poco/svn/NetSSL_OpenSSL/samples/Makefile#1 $ # # Makefile for Poco NetSSL Samples # diff --git a/NetSSL_OpenSSL/samples/download/src/download.cpp b/NetSSL_OpenSSL/samples/download/src/download.cpp index 871a3c6ff..1371aa326 100644 --- a/NetSSL_OpenSSL/samples/download/src/download.cpp +++ b/NetSSL_OpenSSL/samples/download/src/download.cpp @@ -1,7 +1,7 @@ // // download.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/samples/download/src/download.cpp#6 $ +// $Id: //poco/svn/NetSSL_OpenSSL/samples/download/src/download.cpp#1 $ // // This sample demonstrates the URIStreamOpener class. // diff --git a/NetSSL_OpenSSL/src/AcceptCertificateHandler.cpp b/NetSSL_OpenSSL/src/AcceptCertificateHandler.cpp index 1ce494590..6e8f57dce 100644 --- a/NetSSL_OpenSSL/src/AcceptCertificateHandler.cpp +++ b/NetSSL_OpenSSL/src/AcceptCertificateHandler.cpp @@ -1,7 +1,7 @@ // // AcceptCertificateHandler.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/AcceptCertificateHandler.cpp#10 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/AcceptCertificateHandler.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/src/CertificateHandlerFactory.cpp b/NetSSL_OpenSSL/src/CertificateHandlerFactory.cpp index ee3d6e752..e6e1b5dc7 100644 --- a/NetSSL_OpenSSL/src/CertificateHandlerFactory.cpp +++ b/NetSSL_OpenSSL/src/CertificateHandlerFactory.cpp @@ -1,7 +1,7 @@ // // CertificateHandlerFactory.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/CertificateHandlerFactory.cpp#8 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/CertificateHandlerFactory.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp b/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp index 664576a89..60951f5f6 100644 --- a/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp +++ b/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp @@ -1,7 +1,7 @@ // // CertificateHandlerFactoryMgr.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp#9 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/src/ConsoleCertificateHandler.cpp b/NetSSL_OpenSSL/src/ConsoleCertificateHandler.cpp index 1a1e87b71..2227d41ab 100644 --- a/NetSSL_OpenSSL/src/ConsoleCertificateHandler.cpp +++ b/NetSSL_OpenSSL/src/ConsoleCertificateHandler.cpp @@ -1,7 +1,7 @@ // // ConsoleCertificateHandler.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/ConsoleCertificateHandler.cpp#10 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/ConsoleCertificateHandler.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/src/Context.cpp b/NetSSL_OpenSSL/src/Context.cpp index 777e3bdb5..1b86fdf13 100644 --- a/NetSSL_OpenSSL/src/Context.cpp +++ b/NetSSL_OpenSSL/src/Context.cpp @@ -1,7 +1,7 @@ // // Context.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/Context.cpp#14 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/Context.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp index 3916cf108..b71377ec8 100644 --- a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp +++ b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp @@ -1,7 +1,7 @@ // // HTTPSClientSession.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/HTTPSClientSession.cpp#12 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/HTTPSClientSession.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: HTTPSClient diff --git a/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp b/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp index d77b4168e..5c2e50ce8 100644 --- a/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp +++ b/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp @@ -1,7 +1,7 @@ // // HTTPSSessionInstantiator.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp#8 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: HTTPSClient diff --git a/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp b/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp index 7d4146c6a..371c2bde1 100644 --- a/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp +++ b/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp @@ -1,7 +1,7 @@ // // HTTPSStreamFactory.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp#8 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: HTTPSClient diff --git a/NetSSL_OpenSSL/src/InvalidCertificateHandler.cpp b/NetSSL_OpenSSL/src/InvalidCertificateHandler.cpp index 620a9682d..3bc0fbbbe 100644 --- a/NetSSL_OpenSSL/src/InvalidCertificateHandler.cpp +++ b/NetSSL_OpenSSL/src/InvalidCertificateHandler.cpp @@ -1,7 +1,7 @@ // // InvalidCertificateHandler.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/InvalidCertificateHandler.cpp#10 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/InvalidCertificateHandler.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/src/KeyConsoleHandler.cpp b/NetSSL_OpenSSL/src/KeyConsoleHandler.cpp index 3ec32384d..1557d43bf 100644 --- a/NetSSL_OpenSSL/src/KeyConsoleHandler.cpp +++ b/NetSSL_OpenSSL/src/KeyConsoleHandler.cpp @@ -1,7 +1,7 @@ // // KeyConsoleHandler.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/KeyConsoleHandler.cpp#10 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/KeyConsoleHandler.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/src/KeyFileHandler.cpp b/NetSSL_OpenSSL/src/KeyFileHandler.cpp index 49b99a7bf..912573d78 100644 --- a/NetSSL_OpenSSL/src/KeyFileHandler.cpp +++ b/NetSSL_OpenSSL/src/KeyFileHandler.cpp @@ -1,7 +1,7 @@ // // KeyFileHandler.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/KeyFileHandler.cpp#11 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/KeyFileHandler.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/src/PrivateKeyFactory.cpp b/NetSSL_OpenSSL/src/PrivateKeyFactory.cpp index be65d7ec8..40c603668 100644 --- a/NetSSL_OpenSSL/src/PrivateKeyFactory.cpp +++ b/NetSSL_OpenSSL/src/PrivateKeyFactory.cpp @@ -1,7 +1,7 @@ // // PrivateKeyFactory.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/PrivateKeyFactory.cpp#8 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/PrivateKeyFactory.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp b/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp index a8a917b26..1bba712c0 100644 --- a/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp +++ b/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp @@ -1,7 +1,7 @@ // // PrivateKeyFactoryMgr.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp#9 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/src/PrivateKeyPassphraseHandler.cpp b/NetSSL_OpenSSL/src/PrivateKeyPassphraseHandler.cpp index 202829541..a2908c94b 100644 --- a/NetSSL_OpenSSL/src/PrivateKeyPassphraseHandler.cpp +++ b/NetSSL_OpenSSL/src/PrivateKeyPassphraseHandler.cpp @@ -1,7 +1,7 @@ // // PrivateKeyPassphraseHandler.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/PrivateKeyPassphraseHandler.cpp#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/PrivateKeyPassphraseHandler.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/src/SSLException.cpp b/NetSSL_OpenSSL/src/SSLException.cpp index 06af44422..ac935c66e 100644 --- a/NetSSL_OpenSSL/src/SSLException.cpp +++ b/NetSSL_OpenSSL/src/SSLException.cpp @@ -1,7 +1,7 @@ // // SSLException.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/SSLException.cpp#9 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/SSLException.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/src/SSLInitializer.cpp b/NetSSL_OpenSSL/src/SSLInitializer.cpp index aa02cb342..ff1a6868c 100644 --- a/NetSSL_OpenSSL/src/SSLInitializer.cpp +++ b/NetSSL_OpenSSL/src/SSLInitializer.cpp @@ -1,7 +1,7 @@ // // SSLInitializer.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/SSLInitializer.cpp#9 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/SSLInitializer.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore @@ -87,7 +87,9 @@ void SSLInitializer::initialize() int nMutexes = CRYPTO_num_locks(); _mutexes = new FastMutex[nMutexes]; CRYPTO_set_locking_callback(&SSLInitializer::lock); +#ifndef POCO_OS_FAMILY_WINDOWS // SF# 1828231: random unhandled exceptions when linking with ssl CRYPTO_set_id_callback(&SSLInitializer::id); +#endif CRYPTO_set_dynlock_create_callback(&SSLInitializer::dynlockCreate); CRYPTO_set_dynlock_lock_callback(&SSLInitializer::dynlock); CRYPTO_set_dynlock_destroy_callback(&SSLInitializer::dynlockDestroy); diff --git a/NetSSL_OpenSSL/src/SSLManager.cpp b/NetSSL_OpenSSL/src/SSLManager.cpp index 0734bcee2..e802fe17c 100644 --- a/NetSSL_OpenSSL/src/SSLManager.cpp +++ b/NetSSL_OpenSSL/src/SSLManager.cpp @@ -1,7 +1,7 @@ // // SSLManager.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/SSLManager.cpp#13 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/SSLManager.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/src/SecureServerSocket.cpp b/NetSSL_OpenSSL/src/SecureServerSocket.cpp index e4835f977..409d3137e 100644 --- a/NetSSL_OpenSSL/src/SecureServerSocket.cpp +++ b/NetSSL_OpenSSL/src/SecureServerSocket.cpp @@ -1,7 +1,7 @@ // // SecureServerSocket.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/SecureServerSocket.cpp#11 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/SecureServerSocket.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLSockets diff --git a/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp b/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp index 287937dbc..de2718e62 100644 --- a/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp +++ b/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp @@ -1,7 +1,7 @@ // // SecureServerSocketImpl.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp#8 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLSockets diff --git a/NetSSL_OpenSSL/src/SecureSocketImpl.cpp b/NetSSL_OpenSSL/src/SecureSocketImpl.cpp index ee8c5b743..6b7afe531 100644 --- a/NetSSL_OpenSSL/src/SecureSocketImpl.cpp +++ b/NetSSL_OpenSSL/src/SecureSocketImpl.cpp @@ -1,7 +1,7 @@ // // SecureSocketImpl.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/SecureSocketImpl.cpp#23 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/SecureSocketImpl.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLSockets diff --git a/NetSSL_OpenSSL/src/SecureStreamSocket.cpp b/NetSSL_OpenSSL/src/SecureStreamSocket.cpp index d2edb371c..b4c078866 100644 --- a/NetSSL_OpenSSL/src/SecureStreamSocket.cpp +++ b/NetSSL_OpenSSL/src/SecureStreamSocket.cpp @@ -1,7 +1,7 @@ // // SecureStreamSocket.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/SecureStreamSocket.cpp#10 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/SecureStreamSocket.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLSockets diff --git a/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp b/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp index 1d21eab1d..3c682db26 100644 --- a/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp +++ b/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp @@ -1,7 +1,7 @@ // // SecureStreamSocketImpl.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp#8 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLSockets diff --git a/NetSSL_OpenSSL/src/Utility.cpp b/NetSSL_OpenSSL/src/Utility.cpp index cd6088544..c99e157fe 100644 --- a/NetSSL_OpenSSL/src/Utility.cpp +++ b/NetSSL_OpenSSL/src/Utility.cpp @@ -1,7 +1,7 @@ // // Utility.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/Utility.cpp#10 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/Utility.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/src/VerificationErrorArgs.cpp b/NetSSL_OpenSSL/src/VerificationErrorArgs.cpp index 7f43143c7..798c37048 100644 --- a/NetSSL_OpenSSL/src/VerificationErrorArgs.cpp +++ b/NetSSL_OpenSSL/src/VerificationErrorArgs.cpp @@ -1,7 +1,7 @@ // // VerificationErrorArgs.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/VerificationErrorArgs.cpp#8 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/VerificationErrorArgs.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/src/X509Certificate.cpp b/NetSSL_OpenSSL/src/X509Certificate.cpp index 7b764b7d5..59fd1f2e7 100644 --- a/NetSSL_OpenSSL/src/X509Certificate.cpp +++ b/NetSSL_OpenSSL/src/X509Certificate.cpp @@ -1,7 +1,7 @@ // // X509Certificate.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/src/X509Certificate.cpp#8 $ +// $Id: //poco/svn/NetSSL_OpenSSL/src/X509Certificate.cpp#1 $ // // Library: NetSSL_OpenSSL // Package: SSLCore diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs71.vcproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs71.vcproj index 43f4b61c4..289b5f76b 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs71.vcproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs71.vcproj @@ -128,6 +128,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs80.vcproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs80.vcproj index 1c60f9173..6fac94312 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs80.vcproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs80.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NetSSL_OpenSSL/testsuite/src/Driver.cpp b/NetSSL_OpenSSL/testsuite/src/Driver.cpp index 2393fbb7d..c10620a17 100644 --- a/NetSSL_OpenSSL/testsuite/src/Driver.cpp +++ b/NetSSL_OpenSSL/testsuite/src/Driver.cpp @@ -1,7 +1,7 @@ // // Driver.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/Driver.cpp#10 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/Driver.cpp#1 $ // // Console-based test driver for Poco NetSSL. // diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp b/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp index dfce5342c..d5d45cee2 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp @@ -1,7 +1,7 @@ // // HTTPSClientSessionTest.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp#8 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp#1 $ // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. @@ -42,6 +42,7 @@ #include "Poco/Net/HTTPServerResponse.h" #include "Poco/Net/HTTPServerRequest.h" #include "Poco/Net/HTTPServerParams.h" +#include "Poco/Net/SecureStreamSocket.h" #include "Poco/StreamCopier.h" #include "Poco/Exception.h" #include "HTTPSTestServer.h" @@ -347,6 +348,22 @@ void HTTPSClientSessionTest::testProxy() } +void HTTPSClientSessionTest::testConnectNB() +{ + SecureStreamSocket sock; + sock.connectNB(SocketAddress("server.com", 443)); + char buf[512]; + std::string msg("GET / HTTP/1.0\r\n\r\n"); + sock.sendBytes(msg.c_str(), (int)msg.length()); + Socket::SocketList read; + Socket::SocketList write; + Socket::SocketList exec; + read.push_back(sock); + Socket::select(read, write, exec, Poco::Timespan(30, 0) ); + int rc = sock.receiveBytes(buf, 512); + assert (rc > 0); +} + void HTTPSClientSessionTest::setUp() { } @@ -373,6 +390,7 @@ CppUnit::Test* HTTPSClientSessionTest::suite() CppUnit_addTest(pSuite, HTTPSClientSessionTest, testPostLargeClose); CppUnit_addTest(pSuite, HTTPSClientSessionTest, testKeepAlive); CppUnit_addTest(pSuite, HTTPSClientSessionTest, testProxy); + CppUnit_addTest(pSuite, HTTPSClientSessionTest, testConnectNB); return pSuite; } diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h b/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h index 3c531fe38..bc24ae65c 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h @@ -1,7 +1,7 @@ // // HTTPSClientSessionTest.h // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h#8 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h#1 $ // // Definition of the HTTPSClientSessionTest class. // @@ -58,6 +58,7 @@ public: void testPostLargeClose(); void testKeepAlive(); void testProxy(); + void testConnectNB(); void setUp(); void tearDown(); diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.cpp b/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.cpp index 6659a92ee..a23243710 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.cpp +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.cpp @@ -1,7 +1,7 @@ // // HTTPSClientTestSuite.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.cpp#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.cpp#1 $ // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h b/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h index afb0ca6b4..9d81014ff 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h @@ -1,7 +1,7 @@ // // HTTPSClientTestSuite.h // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h#1 $ // // Definition of the HTTPSClientTestSuite class. // diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp index 48fc21e2f..b97080395 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp @@ -1,7 +1,7 @@ // // HTTPSServerTest.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp#8 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp#1 $ // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h index 923533d2e..87d97303a 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h @@ -1,7 +1,7 @@ // // HTTPSServerTest.h // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h#1 $ // // Definition of the HTTPSServerTest class. // diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.cpp b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.cpp index 1ebe4dbb9..44299af88 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.cpp +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.cpp @@ -1,7 +1,7 @@ // // HTTPSServerTestSuite.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.cpp#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.cpp#1 $ // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h index 609d6e15b..4acbf2d3e 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h @@ -1,7 +1,7 @@ // // HTTPSServerTestSuite.h // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h#1 $ // // Definition of the HTTPSServerTestSuite class. // diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp b/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp index e27c02e81..1d3126143 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp @@ -1,7 +1,7 @@ // // HTTPSStreamFactoryTest.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp#1 $ // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h b/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h index b0493e16c..51f8f2b26 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h @@ -1,7 +1,7 @@ // // HTTPSStreamFactoryTest.h // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h#1 $ // // Definition of the HTTPSStreamFactoryTest class. // diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp b/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp index 4957683ba..2ce4c8eb9 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp @@ -1,7 +1,7 @@ // // HTTPSTestServer.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp#9 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp#1 $ // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.h b/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.h index b2c16fabf..501bdf528 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.h +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.h @@ -1,7 +1,7 @@ // // HTTPSTestServer.h // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.h#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.h#1 $ // // Definition of the HTTPSTestServer class. // diff --git a/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.cpp b/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.cpp index 2fb9cc264..bc8d43a5e 100644 --- a/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.cpp +++ b/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.cpp @@ -1,7 +1,7 @@ // // OpenSSLTestSuite.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.cpp#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.cpp#1 $ // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h b/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h index d874ab5e5..97b48f8ae 100644 --- a/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h +++ b/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h @@ -1,7 +1,7 @@ // // NetSSLTestSuite.h // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h#1 $ // // Definition of the NetSSLTestSuite class. // diff --git a/NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp b/NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp index 71d45306f..8632816af 100644 --- a/NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp @@ -1,7 +1,7 @@ // // TCPServerTest.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp#1 $ // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/NetSSL_OpenSSL/testsuite/src/TCPServerTest.h b/NetSSL_OpenSSL/testsuite/src/TCPServerTest.h index 3198d2032..59378d011 100644 --- a/NetSSL_OpenSSL/testsuite/src/TCPServerTest.h +++ b/NetSSL_OpenSSL/testsuite/src/TCPServerTest.h @@ -1,7 +1,7 @@ // // TCPServerTest.h // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/TCPServerTest.h#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/TCPServerTest.h#1 $ // // Definition of the TCPServerTest class. // diff --git a/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.cpp b/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.cpp index b8813178b..115f23237 100644 --- a/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.cpp +++ b/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.cpp @@ -1,7 +1,7 @@ // // TCPServerTestSuite.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.cpp#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.cpp#1 $ // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h b/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h index 964268ace..4ac3126b0 100644 --- a/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h +++ b/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h @@ -1,7 +1,7 @@ // // TCPServerTestSuite.h // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h#7 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h#1 $ // // Definition of the TCPServerTestSuite class. // diff --git a/NetSSL_OpenSSL/testsuite/src/WinDriver.cpp b/NetSSL_OpenSSL/testsuite/src/WinDriver.cpp index 86723cd57..ecd0bab4b 100644 --- a/NetSSL_OpenSSL/testsuite/src/WinDriver.cpp +++ b/NetSSL_OpenSSL/testsuite/src/WinDriver.cpp @@ -1,7 +1,7 @@ // // WinDriver.cpp // -// $Id: //poco/Main/NetSSL_OpenSSL/testsuite/src/WinDriver.cpp#8 $ +// $Id: //poco/svn/NetSSL_OpenSSL/testsuite/src/WinDriver.cpp#1 $ // // Windows test driver for Poco OpenSSL. //