Merge branch 'master' into pu/font

Origin commit data
------------------
Branch: ni/coolstream
Commit: b886b48e72
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-28 (Sat, 28 Jan 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-01-28 18:51:14 +01:00

View File

@@ -267,7 +267,7 @@ Example:
curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0L);
/* enable all supported built-in compressions */
curl_easy_setopt(curl_handle, CURLOPT_ACCEPT_ENCODING, "");
curl_easy_setopt(curl_handle, CURLOPT_COOKIE, "");
if (!userAgent.empty())
curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, userAgent.c_str());