Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
Icecast-Server
Commits
53d8b7c3
Commit
53d8b7c3
authored
Sep 20, 2018
by
Philipp Schafft
🦁
Browse files
Fix: Avoid dead-lock in case of config reload
parent
5df02869
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/curl.c
View file @
53d8b7c3
...
...
@@ -12,6 +12,7 @@
#include
"curl.h"
#include
"cfgfile.h"
#include
"global.h"
#include
"logging.h"
#define CATMODULE "curl"
...
...
@@ -48,7 +49,6 @@ int icecast_curl_shutdown(void)
CURL
*
icecast_curl_new
(
const
char
*
url
,
char
*
errors
)
{
ice_config_t
*
config
;
CURL
*
curl
=
curl_easy_init
();
if
(
!
curl
)
...
...
@@ -77,9 +77,7 @@ CURL *icecast_curl_new(const char *url, char * errors)
if
(
errors
)
curl_easy_setopt
(
curl
,
CURLOPT_ERRORBUFFER
,
errors
);
config
=
config_get_config
();
curl_easy_setopt
(
curl
,
CURLOPT_USERAGENT
,
config
->
server_id
);
config_release_config
();
curl_easy_setopt
(
curl
,
CURLOPT_USERAGENT
,
ICECAST_VERSION_STRING
);
return
curl
;
}
...
...
Philipp Schafft
🦁
@phschafft
mentioned in issue
#2329 (closed)
·
Sep 28, 2018
mentioned in issue
#2329 (closed)
mentioned in issue #2329
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment