From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 16 Aug 2016 19:29:05 +0000 (+0200)
Subject: htsp: fix http api proxy (global_lock), fixes #3939
X-Git-Tag: v4.2.1~380
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=966d8ccca3e25d290603b935f17ebc47aba6e890;p=thirdparty%2Ftvheadend.git

htsp: fix http api proxy (global_lock), fixes #3939
---

diff --git a/src/htsp_server.c b/src/htsp_server.c
index 8b3e4eaab..badd22292 100644
--- a/src/htsp_server.c
+++ b/src/htsp_server.c
@@ -1295,6 +1295,8 @@ htsp_method_api(htsp_connection_t *htsp, htsmsg_t *in)
   const char *remain;
   int r;
 
+  pthread_mutex_unlock(&global_lock);
+
   args   = htsmsg_get_map(in, "args");
   remain = htsmsg_get_str(in, "path");
 
@@ -1325,6 +1327,8 @@ htsp_method_api(htsp_connection_t *htsp, htsmsg_t *in)
   }
 
   htsmsg_destroy(args2);
+
+  pthread_mutex_lock(&global_lock);
   return ret;
 }