Skip to content

Commit b9ea52d

Browse files
MOURAD Rabihastitcher
authored andcommitted
PROTON-2137: Removing ssl init from ssl_server_options default constructor
1 parent add5ed2 commit b9ea52d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

cpp/src/connection_options.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ class connection_options::impl {
175175
}
176176
} else if (!client && ssl_server_options.set) {
177177
pn_ssl_t *ssl = pn_ssl(pnt);
178-
if (pn_ssl_init(ssl, ssl_server_options.value.impl_->pn_domain(), NULL)) {
178+
pn_ssl_domain_t* ssl_domain = ssl_server_options.value.impl_ ? ssl_server_options.value.impl_->pn_domain() : pn_ssl_domain(PN_SSL_MODE_SERVER);
179+
if (pn_ssl_init(ssl, ssl_domain, NULL)) {
179180
throw error(MSG("server SSL/TLS initialization error"));
180181
}
181182
}

cpp/src/ssl_options.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ ssl_server_options::ssl_server_options(
9999
throw error(MSG("SSL server configuration failure requiring client certificates using " << db));
100100
}
101101

102-
ssl_server_options::ssl_server_options() : impl_(new impl) {}
102+
ssl_server_options::ssl_server_options() : impl_(0) {}
103103

104104
ssl_client_options::ssl_client_options(const ssl_client_options& x): impl_(x.impl_) {
105105
if (impl_) impl_->incref();

0 commit comments

Comments
 (0)