From 0fda775ebd32b230179c200b89ebd520d9a9e4a2 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 4 May 2012 20:36:35 +0200 Subject: Revert "Add force_tls setting" This reverts commit 35763dea799c96361e288a10eab0fbd16c36e880. It does not work with the JSON API. --- src/ui.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/ui.c') diff --git a/src/ui.c b/src/ui.c index 7728a3f..3f23a23 100644 --- a/src/ui.c +++ b/src/ui.c @@ -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) { -- cgit v1.2.3