Skip to content

[http] fix ssl_certificate handling #22529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
linev merged 1 commit into from
Jun 9, 2026
Merged

[http] fix ssl_certificate handling #22529

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions net/http/src/TCivetweb.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ Int_t TCivetweb::ChangeNumActiveThrerads(int cnt)
///
/// thrds=N - there N is number of threads used by the civetweb (default is 10)
/// top=name - configure top name, visible in the web browser
/// ssl_certificate=filename - SSL certificate, see docs/OpenSSL.md from civetweb
/// ssl_cert=filename - SSL certificate, see docs/OpenSSL.md from civetweb
/// auth_file=filename - authentication file name, created with htdigets utility
/// auth_domain=domain - authentication domain
/// websocket_timeout=tm - set web sockets timeout in seconds (default 300)
Expand Down Expand Up @@ -685,7 +685,9 @@ Bool_t TCivetweb::Create(const char *args)
if (adomain)
auth_domain = adomain;

const char *sslc = url.GetValueFromOptions("ssl_cert");
const char *sslc = url.GetValueFromOptions("ssl_certificate");
if (!sslc)
sslc = url.GetValueFromOptions("ssl_cert");
if (sslc)
ssl_cert = sslc;

Expand Down
Loading