Skip to content

Add HTTPS support #14

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

Open
mineo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add HTTPS support #14

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
12 changes: 10 additions & 2 deletions src/HTTPFetch.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ class MusicBrainz5::CHTTPFetchPrivate

std::string m_UserAgent;
std::string m_Host;
std::string m_Scheme;
int m_Port;
std::vector<unsigned char> m_Data;
int m_Result;
Expand All @@ -91,9 +92,11 @@ MusicBrainz5::CHTTPFetch::CHTTPFetch(const std::string& UserAgent, const std::st
if (m_d->m_UserAgent[Pos]=='-')
m_d->m_UserAgent[Pos]='/';

m_d->m_Host=Host;
m_d->m_Host=Host;
m_d->m_Port=Port;

m_d->m_Scheme = (Port == 443) ? "https" : "http";

// Parse http_proxy environmnent variable
const char *http_proxy = getenv("http_proxy");
if (http_proxy)
Expand Down Expand Up @@ -167,13 +170,18 @@ int MusicBrainz5::CHTTPFetch::Fetch(const std::string& URL, const std::string& R

m_d->m_Data.clear();

ne_session *sess=ne_session_create("http", m_d->m_Host.c_str(), m_d->m_Port);
ne_session *sess=ne_session_create(m_d->m_Scheme.c_str(), m_d->m_Host.c_str(), m_d->m_Port);
if (sess)
{
ne_set_useragent(sess, m_d->m_UserAgent.c_str());

ne_set_server_auth(sess, httpAuth, this);

if (m_d->m_Scheme == "https")
{
ne_ssl_trust_default_ca(sess);
}

// Use proxy server
if (!m_d->m_ProxyHost.empty())
{
Expand Down