Author: gsim
Date: Fri Oct 10 12:58:07 2014
New Revision: 1630864
URL: http://svn.apache.org/r1630864
Log:
PROTON-701: alter test for isSSLPresent to check on server capability instead
of client capability
Modified:
qpid/proton/branches/examples/proton-c/src/windows/schannel.c
qpid/proton/branches/examples/tests/python/proton_tests/common.py
Modified: qpid/proton/branches/examples/proton-c/src/windows/schannel.c
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/examples/proton-c/src/windows/schannel.c?rev=1630864&r1=1630863&r2=1630864&view=diff
==============================================================================
--- qpid/proton/branches/examples/proton-c/src/windows/schannel.c (original)
+++ qpid/proton/branches/examples/proton-c/src/windows/schannel.c Fri Oct 10
12:58:07 2014
@@ -255,6 +255,8 @@ static void ssl_session_free( pn_ssl_ses
pn_ssl_domain_t *pn_ssl_domain( pn_ssl_mode_t mode )
{
+ if (mode == PN_SSL_MODE_SERVER)
+ return NULL; // Temporary: not ready for ctest, hide from isSSLPresent()
pn_ssl_domain_t *domain = (pn_ssl_domain_t *) calloc(1,
sizeof(pn_ssl_domain_t));
if (!domain) return NULL;
@@ -284,8 +286,9 @@ pn_ssl_domain_t *pn_ssl_domain( pn_ssl_m
void pn_ssl_domain_free( pn_ssl_domain_t *domain )
{
- if (--domain->ref_count == 0) {
+ if (!domain) return;
+ if (--domain->ref_count == 0) {
if (domain->cert_context)
CertFreeCertificateContext(domain->cert_context);
if (domain->cert_store)
Modified: qpid/proton/branches/examples/tests/python/proton_tests/common.py
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/examples/tests/python/proton_tests/common.py?rev=1630864&r1=1630863&r2=1630864&view=diff
==============================================================================
--- qpid/proton/branches/examples/tests/python/proton_tests/common.py (original)
+++ qpid/proton/branches/examples/tests/python/proton_tests/common.py Fri Oct
10 12:58:07 2014
@@ -82,7 +82,7 @@ def isSSLPresent():
""" True if a suitable SSL library is available.
"""
try:
- xxx = SSLDomain(SSLDomain.MODE_CLIENT)
+ xxx = SSLDomain(SSLDomain.MODE_SERVER)
return True
except SSLUnavailable, e:
# SSL libraries not installed
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
