generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-28 01:21:31 +01:00
Code Issues Projects Releases Wiki Activity

- Poco::Net::HTTPSSessionInstantiator::registerInstantiator() now optionally accepts a Poco::Net::Context object.

Browse Source
This commit is contained in:
Guenter Obiltschnig 2012-11-10 11:48:35 +01:00
parent e36800c76d
commit a628c56a01
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h
View File

@ -1,7 +1,7 @@
// //
// HTTPSSessionInstantiator.h // HTTPSSessionInstantiator.h
// //
// $Id: //poco/1.4/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h#1 $ // $Id: //poco/1.4/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h#2 $
// //
// Library: NetSSL_OpenSSL // Library: NetSSL_OpenSSL
// Package: HTTPSClient // Package: HTTPSClient
@ -41,6 +41,7 @@
#include "Poco/Net/NetSSL.h" #include "Poco/Net/NetSSL.h"
#include "Poco/Net/Context.h"
#include "Poco/Net/Utility.h" #include "Poco/Net/Utility.h"
#include "Poco/Net/HTTPSessionInstantiator.h" #include "Poco/Net/HTTPSessionInstantiator.h"
#include "Poco/URI.h" #include "Poco/URI.h"
@ -57,6 +58,9 @@ public:
HTTPSSessionInstantiator(); HTTPSSessionInstantiator();
/// Creates the HTTPSSessionInstantiator. /// Creates the HTTPSSessionInstantiator.
HTTPSSessionInstantiator(Context::Ptr pContext);
/// Creates the HTTPSSessionInstantiator using the given SSL context.
~HTTPSSessionInstantiator(); ~HTTPSSessionInstantiator();
/// Destroys the HTTPSSessionInstantiator. /// Destroys the HTTPSSessionInstantiator.
@ -66,8 +70,14 @@ public:
static void registerInstantiator(); static void registerInstantiator();
/// Registers the instantiator with the global HTTPSessionFactory. /// Registers the instantiator with the global HTTPSessionFactory.
static void registerInstantiator(Context::Ptr pContext);
/// Registers the instantiator with the global HTTPSessionFactory using the given SSL context.
static void unregisterInstantiator(); static void unregisterInstantiator();
/// Unregisters the factory with the global HTTPSessionFactory. /// Unregisters the factory with the global HTTPSessionFactory.
private:
Context::Ptr _pContext;
}; };

16
NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp
View File

@ -1,7 +1,7 @@
// //
// HTTPSSessionInstantiator.cpp // HTTPSSessionInstantiator.cpp
// //
// $Id: //poco/1.4/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp#1 $ // $Id: //poco/1.4/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp#2 $
// //
// Library: NetSSL_OpenSSL // Library: NetSSL_OpenSSL
// Package: HTTPSClient // Package: HTTPSClient
@ -48,6 +48,12 @@ HTTPSSessionInstantiator::HTTPSSessionInstantiator()
} }
HTTPSSessionInstantiator::HTTPSSessionInstantiator(Context::Ptr pContext) :
_pContext(pContext)
{
}
HTTPSSessionInstantiator::~HTTPSSessionInstantiator() HTTPSSessionInstantiator::~HTTPSSessionInstantiator()
{ {
} }
@ -56,7 +62,7 @@ HTTPSSessionInstantiator::~HTTPSSessionInstantiator()
HTTPClientSession* HTTPSSessionInstantiator::createClientSession(const Poco::URI& uri) HTTPClientSession* HTTPSSessionInstantiator::createClientSession(const Poco::URI& uri)
{ {
poco_assert (uri.getScheme() == "https"); poco_assert (uri.getScheme() == "https");
HTTPSClientSession* pSession = new HTTPSClientSession(uri.getHost(), uri.getPort()); HTTPSClientSession* pSession = _pContext.isNull() ? new HTTPSClientSession(uri.getHost(), uri.getPort()) : new HTTPSClientSession(uri.getHost(), uri.getPort(), _pContext);
pSession->setProxy(proxyHost(), proxyPort()); pSession->setProxy(proxyHost(), proxyPort());
pSession->setProxyCredentials(proxyUsername(), proxyPassword()); pSession->setProxyCredentials(proxyUsername(), proxyPassword());
return pSession; return pSession;
@ -69,6 +75,12 @@ void HTTPSSessionInstantiator::registerInstantiator()
} }
void HTTPSSessionInstantiator::registerInstantiator(Context::Ptr context)
{
HTTPSessionFactory::defaultFactory().registerProtocol("https", new HTTPSSessionInstantiator(context));
}
void HTTPSSessionInstantiator::unregisterInstantiator() void HTTPSSessionInstantiator::unregisterInstantiator()
{ {
HTTPSessionFactory::defaultFactory().unregisterProtocol("https"); HTTPSessionFactory::defaultFactory().unregisterProtocol("https");