diff options
| author | Lars-Dominik Braun <lars@6xq.net> | 2012-05-04 20:36:35 +0200 |
|---|---|---|
| committer | Lars-Dominik Braun <lars@6xq.net> | 2012-05-04 20:36:35 +0200 |
| commit | 0fda775ebd32b230179c200b89ebd520d9a9e4a2 (patch) | |
| tree | 3ac052cbbf147961f3669f22fac321a81f120df9 /src/ui.c | |
| parent | e2370b4d6c41292fcfd1031a03fecea4a1fc26b1 (diff) | |
| download | pianobar-0fda775ebd32b230179c200b89ebd520d9a9e4a2.tar.gz pianobar-0fda775ebd32b230179c200b89ebd520d9a9e4a2.tar.bz2 pianobar-0fda775ebd32b230179c200b89ebd520d9a9e4a2.zip | |
Revert "Add force_tls setting"
This reverts commit 35763dea799c96361e288a10eab0fbd16c36e880. It does
not work with the JSON API.
Diffstat (limited to 'src/ui.c')
| -rw-r--r-- | src/ui.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -134,15 +134,14 @@ void BarUiMsg (const BarSettings_t *settings, const BarUiMsg_t type, /* fetch http resource (post request) * @param waitress handle * @param piano request (initialized by PianoRequest()) - * @param ignore libpiano TLS hint and use it always */ static WaitressReturn_t BarPianoHttpRequest (WaitressHandle_t *waith, - PianoRequest_t *req, bool forceTls) { + PianoRequest_t *req) { waith->extraHeaders = "Content-Type: text/plain\r\n"; waith->postData = req->postData; waith->method = WAITRESS_METHOD_POST; waith->url.path = req->urlPath; - waith->url.tls = req->secure || forceTls; + waith->url.tls = req->secure; return WaitressFetchBuf (waith, &req->responseData); } @@ -173,7 +172,7 @@ int BarUiPianoCall (BarApp_t * const app, PianoRequestType_t type, return 0; } - *wRet = BarPianoHttpRequest (&app->waith, &req, app->settings.forceTls); + *wRet = BarPianoHttpRequest (&app->waith, &req); if (*wRet != WAITRESS_RET_OK) { BarUiMsg (&app->settings, MSG_NONE, "Network error: %s\n", WaitressErrorToStr (*wRet)); if (req.responseData != NULL) { |