From cc2f503f0bcb76837c49c39c1ae4fd32c286d8bc Mon Sep 17 00:00:00 2001
From: Chris Tallon <chris@vomp.tv>
Date: Sun, 11 Mar 2018 15:18:38 +0000
Subject: [PATCH] Switch to libmicrohttpd. Rewrite handler.

---
 Makefile               |    4 +-
 handler.c              | 1836 --------------
 handler.h              |   40 -
 httpdclient.c          |  305 +++
 httpdclient.h          |   65 +
 jsonserver.c           |   42 +-
 jsonserver.conf.sample |    3 +-
 mongoose.c             | 5180 ----------------------------------------
 mongoose.h             |  292 ---
 vdrclient.c            | 1453 +++++++++++
 vdrclient.h            |   76 +
 11 files changed, 1913 insertions(+), 7383 deletions(-)
 delete mode 100644 handler.c
 delete mode 100644 handler.h
 create mode 100644 httpdclient.c
 create mode 100644 httpdclient.h
 delete mode 100644 mongoose.c
 delete mode 100644 mongoose.h
 create mode 100644 vdrclient.c
 create mode 100644 vdrclient.h

diff --git a/Makefile b/Makefile
index 9b7109f..c007ac6 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ CXXFLAGS += -fpermissive
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o mongoose.o handler.o
+OBJS = $(PLUGIN).o httpdclient.o vdrclient.o
 
 ### The main target:
 
@@ -108,7 +108,7 @@ install-i18n: $(I18Nmsgs)
 ### Targets:
 
 $(SOFILE): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -ljsoncpp -lconfig++ -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -ljsoncpp -lconfig++ -lmicrohttpd -o $@
 
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
diff --git a/handler.c b/handler.c
deleted file mode 100644
index 6cfda16..0000000
--- a/handler.c
+++ /dev/null
@@ -1,1836 +0,0 @@
-#include "handler.h"
-
-// Log docs: https://github.com/gabime/spdlog
-#include <spdlog/spdlog.h>
-namespace spd = spdlog;
-/*
-trace
-debug
-info
-warn
-error
-critical
-*/
-
-#include <string.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <jsoncpp/json/json.h>
-#include <string>
-
-#include <vdr/videodir.h>
-#include <vdr/recording.h>
-#include <vdr/menu.h>
-#include <vdr/timers.h>
-
-int jsonserver_request_handler(struct mg_connection *conn)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-
-  const struct mg_request_info *request_info = mg_get_request_info(conn);
-  
-  if (strcmp(request_info->uri, "/jsonserver")) return 0; // not for us
-
-  char wvrequest[20];
-  int wvrl = mg_get_var(request_info->query_string, strlen(request_info->query_string), "req", wvrequest, 20);
-  if (wvrl == -1)
-  {
-    logger->error("request_handler: Could not decode req");
-    return 0;
-  }
-
-/*
-  if (!strcmp(request_info->request_method, "OPTIONS"))
-  {
-    mg_printf(conn, "%s", "HTTP/1.0 200 OK\r\n");
-    mg_printf(conn, "%s", "Access-Control-Allow-Origin: *\r\n");
-    mg_printf(conn, "%s", "Content-Type: text/plain\r\n\r\n");
-    return (void*)1;
-  }
-*/
-
-  // Get POST data
-  char postData[10000];
-  postData[0] = '\0';
-  if (!strcmp(request_info->request_method, "POST"))
-  {
-    const char* contentLength = mg_get_header(conn, "Content-Length");
-    int contentLengthI = atoi(contentLength);
-    logger->debug("request_hander: POST data content length: {}", contentLengthI);
-    if (contentLengthI > 10000)
-    {
-      logger->error("request_handler: Length > 10000, rejecting");
-      return 0;
-    }
-
-    if (contentLengthI > 0)
-    {
-      // FIXME - assume for now that all post data will be small enough to have arrived immediately
-      int bytesRead = mg_read(conn, postData, contentLengthI);
-      if (bytesRead != contentLengthI)
-      {
-        logger->error("request_handler: Could not read up to contentLength");
-        return 0;
-      }
-      postData[contentLengthI] = '\0';
-    }
-  }
-
-  Json::Value js;
-  bool success = false;
-
-  if      (!strcmp(wvrequest, "gettime")) success = jsonserver_gettime(js);
-  else if (!strcmp(wvrequest, "diskstats")) success = jsonserver_diskstats(js);
-  else if (!strcmp(wvrequest, "reclist")) success = jsonserver_reclist(js);
-  else if (!strcmp(wvrequest, "recinfo")) success = jsonserver_recinfo(js, postData);
-  else if (!strcmp(wvrequest, "recdel")) success = jsonserver_recdel(js, postData);
-  else if (!strcmp(wvrequest, "recmove")) success = jsonserver_recmove(js, postData);
-  else if (!strcmp(wvrequest, "recrename")) success = jsonserver_recrename(js, postData);
-  else if (!strcmp(wvrequest, "recstop")) success = jsonserver_recstop(js, postData);
-  else if (!strcmp(wvrequest, "recresetresume")) success = jsonserver_recresetresume(js, postData);
-  else if (!strcmp(wvrequest, "channellist")) success = jsonserver_channellist(js);
-  else if (!strcmp(wvrequest, "channelschedule")) success = jsonserver_channelschedule(js, postData);
-  else if (!strcmp(wvrequest, "getscheduleevent")) success = jsonserver_getscheduleevent(js, postData);
-  else if (!strcmp(wvrequest, "timerlist")) success = jsonserver_timerlist(js);
-  else if (!strcmp(wvrequest, "timerdel")) success = jsonserver_timerdel(js, postData);
-  else if (!strcmp(wvrequest, "timerset")) success = jsonserver_timerset(js, postData);
-  else if (!strcmp(wvrequest, "timersetactive")) success = jsonserver_timersetactive(js, postData);
-  else if (!strcmp(wvrequest, "timerisrecording")) success = jsonserver_timerisrecording(js, postData);
-  else if (!strcmp(wvrequest, "timeredit")) success = jsonserver_timeredit(js, postData);
-  else if (!strcmp(wvrequest, "tunersstatus")) success = jsonserver_tunersstatus(js, postData);
-  else if (!strcmp(wvrequest, "epgsearchsame")) success = jsonserver_epgsearchsame(js, postData);
-  else if (!strcmp(wvrequest, "epgdownload")) success = jsonserver_epgdownload(js, postData);
-  else if (!strcmp(wvrequest, "epgsearch")) success = jsonserver_epgsearch(js, postData);
-
-  if (!success) return 0; // the specific handler failed badly
-
-  // Now js will be filled
-
-  Json::StyledWriter sw;
-  std::string jsonout = sw.write(js);
-  mg_printf(conn, "%s", "HTTP/1.0 200 OK\r\n");
-  mg_printf(conn, "%s", "Content-Type: text/plain\r\n\r\n");
-  mg_write(conn, jsonout.c_str(), jsonout.length());
-  return 1;
-
-  
-/*
-  else if (event == MG_EVENT_LOG)
-  {
-    if (request_info->status_code == 400) // bad request
-    {
-      logger->debug("Mongoose: 400 BAD REQUEST:");
-      logger->debug("Mongoose {}", request_info->request_method);
-      logger->debug("Mongoose {}", request_info->uri);
-      logger->debug("Mongoose {}", request_info->http_version);
-      logger->debug("Mongoose {}", request_info->query_string);
-      logger->debug("Mongoose {}", request_info->log_message);
-      for (int i = 0; i < request_info->num_headers; i++)
-      {
-        logger->debug("Mongoose: {}: {}", request_info->http_headers[i].name, request_info->http_headers[i].value);
-      }
-    }
-    else
-    {
-      logger->debug("Mongoose {}", request_info->log_message);
-      logger->debug("Mongoose {}", request_info->uri);
-    }
-    return (void*)1;
-  }
-  
-  // other events not handled:
-  // MG_HTTP_ERROR, MG_INIT_SSL
-  // Let mongoose do something with those
-
-  return NULL;
-
-*/
-  
-}
-
-bool jsonserver_gettime(Json::Value& js)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("get_time");
-
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  
-  js["Time"] = (Json::UInt64)tv.tv_sec;
-  js["MTime"] = (Json::UInt)(tv.tv_usec/1000);
-  js["Result"] = true;
-  return true;
-}
-
-bool jsonserver_diskstats(Json::Value& js)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("diskstats");
-  
-  int FreeMB;
-  int UsedMB;
-
-#if APIVERSNUM > 20101
-  int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB);
-#else
-  int Percent = VideoDiskSpace(&FreeMB, &UsedMB);
-#endif
-  
-  js["FreeMiB"] = FreeMB;
-  js["UsedMiB"] = UsedMB;
-  js["Percent"] = Percent;
-  
-  js["Result"] = true;
-  return true;
-}
-
-bool jsonserver_reclist(Json::Value& js)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("reclist");
-
-  Json::Value jsrecordings(Json::arrayValue);
-  cRecordings Recordings;
-  Recordings.Load();
-  for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording))
-  {
-    Json::Value oneRec;
-    oneRec["StartTime"] = (Json::UInt)recording->Start();
-    oneRec["Length"] = (Json::UInt)recording->LengthInSeconds();
-    oneRec["IsNew"] = recording->IsNew();
-    oneRec["Name"] = recording->Name();
-    oneRec["Filename"] = recording->FileName();
-    oneRec["FileSizeMB"] = recording->FileSizeMB();
-
-    cRecordControl *rc = cRecordControls::GetRecordControl(recording->FileName());
-    if (rc) oneRec["CurrentlyRecording"] = true;
-    else    oneRec["CurrentlyRecording"] = false;
-    
-    jsrecordings.append(oneRec);
-  }
-  js["Recordings"] = jsrecordings;
-  
-  return true;
-}
-
-bool jsonserver_recinfo(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("recinfo");
-
-  char reqfilename[1000];
-  int mgv1 = mg_get_var(postData, strlen(postData), "filename", reqfilename, 1000);
-  if (mgv1 == -1)
-  {
-    logger->error("recinfo: Could not decode filename");
-    js["Result"] = false;
-    js["Error"] = "Could not decode filename";
-    return true;
-  }
-
-  logger->debug("recinfo: {}", reqfilename);
-
-  cRecordings Recordings;
-  Recordings.Load(); // probably have to do this
-  cRecording *recording = Recordings.GetByName(reqfilename);
-
-  if (!recording)
-  {
-    logger->error("recinfo: recinfo found no recording");
-    js["Result"] = false;
-    return true;
-  }
-
-  js["IsNew"] = recording->IsNew();
-  js["LengthInSeconds"] = recording->LengthInSeconds();
-  js["FileSizeMB"] = recording->FileSizeMB();
-  js["Name"] = recording->Name() ? recording->Name() : Json::Value::null;
-  js["Priority"] = recording->Priority();
-  js["LifeTime"] = recording->Lifetime();
-  js["Start"] = (Json::UInt)recording->Start();
-
-  js["CurrentlyRecordingStart"] = 0;
-  js["CurrentlyRecordingStop"] = 0;
-  cRecordControl *rc = cRecordControls::GetRecordControl(recording->FileName());
-  if (rc)
-  {
-    js["CurrentlyRecordingStart"] = (Json::UInt)rc->Timer()->StartTime();
-    js["CurrentlyRecordingStop"] = (Json::UInt)rc->Timer()->StopTime();
-  }
-
-  js["ResumePoint"] = 0;
-
-  const cRecordingInfo *info = recording->Info();
-  if (info)
-  {
-    js["ChannelName"] = info->ChannelName() ? info->ChannelName() : Json::Value::null;
-    js["Title"] = info->Title() ? info->Title() : Json::Value::null;
-    js["ShortText"] = info->ShortText() ? info->ShortText() : Json::Value::null;
-    js["Description"] = info->Description() ? info->Description() : Json::Value::null;
-
-    const cComponents* components = info->Components();
-    if (!components)
-    {
-      js["Components"] = Json::Value::null;
-    }
-    else
-    {
-      Json::Value jscomponents;
-
-      tComponent* component;
-      for (int i = 0; i < components->NumComponents(); i++)
-      {
-        component = components->Component(i);
-
-        Json::Value oneComponent;
-        oneComponent["Stream"] = component->stream;
-        oneComponent["Type"] = component->type;
-        oneComponent["Language"] = component->language ? component->language : Json::Value::null;
-        oneComponent["Description"] = component->description ? component->description : Json::Value::null;
-        jscomponents.append(oneComponent);
-      }
-
-      js["Components"] = jscomponents;
-    }
-
-    cResumeFile ResumeFile(recording->FileName(), recording->IsPesRecording());
-    if (ResumeFile.Read() >= 0) js["ResumePoint"] = floor(ResumeFile.Read() / info->FramesPerSecond());
-  }
-
-  js["Result"] = true;
-  return true;
-}
-
-bool jsonserver_recstop(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("recstop");
-  
-  char reqfilename[1000];
-  int mgv1 = mg_get_var(postData, strlen(postData), "filename", reqfilename, 1000);
-  if (mgv1 == -1)
-  {
-    logger->error("recstop: Could not decode filename");
-    js["Result"] = false;
-    js["Error"] = "Could not decode filename";
-    return true;
-  }
-  
-  logger->debug("recstop: {}", reqfilename);
-  
-  cRecordings Recordings;
-  Recordings.Load(); // probably have to do this
-  cRecording *recording = Recordings.GetByName(reqfilename);
-  
-  if (!recording)
-  {
-    logger->error("recstop: recstop found no recording");
-    js["Result"] = false;
-    return true;
-  }
-
-  cRecordControl *rc = cRecordControls::GetRecordControl(recording->FileName());
-  if (!rc)
-  {
-    logger->error("recstop: not currently recording");
-    js["Result"] = false;
-    return true;
-  }
-
-  if (Timers.BeingEdited())
-  {
-    logger->debug("recstop: timers being edited elsewhere");
-    js["Result"] = false;
-    return true;
-  }
-
-  cTimer* timer = rc->Timer();
-  if (!timer)
-  {
-    logger->error("recstop: timer not found");
-    js["Result"] = false;
-    return true;
-  }
-  
-  timer->ClrFlags(tfActive);
-  Timers.SetModified();
-  
-  js["Result"] = true;
-  return true;
-}  
-  
-bool jsonserver_recdel(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("recdel");
-
-  char reqfilename[1000];
-  int mgv1 = mg_get_var(postData, strlen(postData), "filename", reqfilename, 1000);
-  if (mgv1 == -1)
-  {
-    logger->error("recdel: Could not decode filename");
-    js["Result"] = false;
-    js["Error"] = "Could not decode filename";
-    return true;
-  }
-
-  logger->debug("recdel: {}", reqfilename);
-  
-  cRecordings Recordings;
-  Recordings.Load(); // probably have to do this
-  cRecording *recording = Recordings.GetByName(reqfilename);
-
-  if (!recording)
-  {
-    js["Result"] = false;
-    js["Error"] = "Could not find recording to delete";
-    return true;
-  }
-
-  logger->debug("recdel: Deleting recording: {}", recording->Name());
-  cRecordControl *rc = cRecordControls::GetRecordControl(recording->FileName());
-  if (rc)
-  {
-    js["Result"] = false;
-    js["Error"] = "This recording is still recording.. ho ho";
-    return true;
-  }
-
-  if (recording->Delete())
-  {
-    ::Recordings.DelByName(recording->FileName());
-    js["Result"] = true;
-  }
-  else
-  {
-    js["Result"] = false;
-    js["Error"] = "Failed to delete recording";
-  }
-
-  return true;
-}
-
-bool jsonserver_recmove(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("recmove");
-
-  char* fileNameToMove = NULL;
-  char* requestedNewPath = NULL;
-  char* dateDirName = NULL;
-  char* titleDirName = NULL;
-  char* folderName = NULL;
-  char* newContainer = NULL;
-  char* newDir = NULL;
-  
-  try
-  {
-    int postDataLen = strlen(postData)+1;
-    fileNameToMove = new char[postDataLen];
-    int mgv1 = mg_get_var(postData, postDataLen-1, "filename", fileNameToMove, postDataLen);
-    requestedNewPath = new char[postDataLen];
-    int mgv2 = mg_get_var(postData, postDataLen-1, "newpath", requestedNewPath, postDataLen);
-
-    if ((mgv1 == -1) || (mgv2 == -1) || !strlen(fileNameToMove) || !strlen(requestedNewPath))
-    {
-      logger->error("recmove: request mgvs: {} {}", mgv1, mgv2);
-      throw 1;
-    }
-
-    cRecordings Recordings;
-    Recordings.Load(); // probably have to do this
-    cRecording* recordingObj = Recordings.GetByName(fileNameToMove);
-    if (!recordingObj) throw 2;
-    
-    cRecordControl *rc = cRecordControls::GetRecordControl(recordingObj->FileName());
-    if (rc) throw 3;
-
-    logger->debug("recmove: moving recording: {}", recordingObj->Name());
-    logger->debug("recmove: moving recording: {}", recordingObj->FileName());
-    logger->debug("recmove: to: {}", requestedNewPath);
-
-    const char* t = recordingObj->FileName();
-
-    int k, j, m;
-
-    // Find the datedirname
-    for(k = strlen(t) - 1; k >= 0; k--)
-    {
-      if (t[k] == '/')
-      {
-        logger->debug("recmove: l1: {}", strlen(&t[k+1]) + 1);
-        dateDirName = new char[strlen(&t[k+1]) + 1];
-        strcpy(dateDirName, &t[k+1]);
-        break;
-      }
-    }
-
-    // Find the titledirname
-
-    for(j = k-1; j >= 0; j--)
-    {
-      if (t[j] == '/')
-      {
-        logger->debug("recmove: l2: {}", k - j);
-        titleDirName = new char[k - j];
-        memcpy(titleDirName, &t[j+1], k - j - 1);
-        titleDirName[k - j - 1] = '\0';
-        break;
-      }
-    }
-
-    // Find the foldername
-
-#if APIVERSNUM > 20101
-    const char* vidDirStr = cVideoDirectory::Name();
-#else
-    const char* vidDirStr = VideoDirectory;
-#endif
-    int vidDirStrLen = strlen(vidDirStr);
-
-    logger->debug("recmove: j = {}, strlenvd = {}", j, vidDirStrLen);
-    if (j > vidDirStrLen) // Rec is in a subfolder now
-    {
-      for(m = j-1; m >= 0; m--)
-      {
-        if (t[m] == '/')
-        {
-          logger->debug("recmove: l3: {}", j - m);
-          folderName = new char[j - m];
-          memcpy(folderName, &t[m+1], j - m - 1);
-          folderName[j - m - 1] = '\0';
-          break;
-        }
-      }
-    }
-
-    ExchangeChars(requestedNewPath, true);
-
-    logger->debug("recmove: datedirname: {}", dateDirName);
-    logger->debug("recmove: titledirname: {}", titleDirName);
-    logger->debug("recmove: viddir: {}", vidDirStr);
-    if (folderName) logger->debug("recmove: folderName: {}", folderName);
-    logger->debug("recmove: EC: {}", requestedNewPath);
-
-    // Could be a new path - construct that first and test
-    newContainer = new char[vidDirStrLen + strlen(requestedNewPath) + strlen(titleDirName) + 1];
-    sprintf(newContainer, "%s%s", vidDirStr, requestedNewPath);
-    logger->debug("recmove: NPT: {}", newContainer);
-    struct stat dstat;
-    int statret = stat(newContainer, &dstat);
-    if ((statret == -1) && (errno == ENOENT)) // Dir does not exist
-    {
-      logger->debug("recmove: new path does not exist (1)");
-      int mkdirret = mkdir(newContainer, 0755);
-      if (mkdirret != 0) throw 4;
-    }
-    else if ((statret == 0) && (! (dstat.st_mode && S_IFDIR)))
-    {
-      // Something exists but it's not a dir
-      throw 5;
-    }
-
-    // New path now created or was there already
-
-    sprintf(newContainer, "%s%s%s", vidDirStr, requestedNewPath, titleDirName);
-    logger->debug("recmove: {}", newContainer);
-
-    statret = stat(newContainer, &dstat);
-    if ((statret == -1) && (errno == ENOENT)) // Dir does not exist
-    {
-      logger->debug("recmove: new dir does not exist (2)");
-      int mkdirret = mkdir(newContainer, 0755);
-      if (mkdirret != 0) throw 6;
-    }
-    else if ((statret == 0) && (! (dstat.st_mode && S_IFDIR)))
-    {
-      // Something exists but it's not a dir
-      throw 7;
-    }
-
-    // Ok, the directory container has been made, or it pre-existed.
-
-    newDir = new char[strlen(newContainer) + 1 + strlen(dateDirName) + 1];
-    sprintf(newDir, "%s/%s", newContainer, dateDirName);
-
-    logger->debug("recmove: doing rename '{}' '{}'", t, newDir);
-    if (rename(t, newDir) != 0) throw 8;
-    
-    // Success. Test for remove old dir containter
-    char* tempOldTitleDir = new char[k+1];
-    memcpy(tempOldTitleDir, t, k);
-    tempOldTitleDir[k] = '\0';
-    logger->debug("recmove: len: {}, cp: {}, strlen: {}, oldtitledir: {}", k+1, k, strlen(tempOldTitleDir), tempOldTitleDir);
-    rmdir(tempOldTitleDir); // can't do anything about a fail result at this point.
-    delete[] tempOldTitleDir;
-
-    // Test for remove old foldername
-    if (folderName)
-    {
-      char* tempOldFolderName = new char[j+1];
-      memcpy(tempOldFolderName, t, j);
-      tempOldFolderName[j] = '\0';
-      logger->debug("recmove: len: {}, cp: {}, strlen: {}, oldfoldername: {}", j+1, j, strlen(tempOldFolderName), tempOldFolderName);
-      /*
-      DESCRIPTION
-      rmdir() deletes a directory, which must be empty.
-      ENOTEMPTY - pathname  contains  entries  other than . and ..
-      So, should be safe to call rmdir on non-empty dir
-      */
-      rmdir(tempOldFolderName); // can't do anything about a fail result at this point.
-      delete[] tempOldFolderName;
-    }
-
-    ::Recordings.Update();
-    js["Result"] = true;
-    js["NewRecordingFileName"] = newDir;
-  }
-  catch (int e)
-  {
-    js["Result"] = false;
-    if (e == 1)
-    {
-      logger->error("recmove: Bad parameters");
-      js["Error"] = "Bad request parameters";
-    }
-    else if (e == 2)
-    {
-      logger->error("recmove: Could not find recording to move");
-      js["Error"] = "Bad filename";
-    }
-    else if (e == 3)
-    {
-      logger->error("recmove: Could not move recording, it is still recording");
-      js["Error"] = "Cannot move recording in progress";
-    }
-    else if (e == 4)
-    {
-      logger->error("recmove: Failed to make new dir (1)");
-      js["Error"] = "Failed to create new directory (1)";
-    }
-    else if (e == 5)
-    {
-      logger->error("recmove: Something already exists? (1)");
-      js["Error"] = "Something already exists at the new path (1)";
-    }
-    else if (e == 6)
-    {
-      logger->error("recmove: Failed to make new dir (2)");
-      js["Error"] = "Failed to create new directory (2)";
-    }
-    else if (e == 7)
-    {
-      logger->error("recmove: Something already exists?");
-      js["Error"] = "Something already exists at the new path";
-    }
-    else if (e == 8)
-    {
-      logger->error("recmove: Rename failed");
-      js["Error"] = "Move failed";
-    }
-  }
-
-  if (fileNameToMove)   delete[] fileNameToMove;
-  if (requestedNewPath) delete[] requestedNewPath;
-  if (dateDirName)      delete[] dateDirName;
-  if (titleDirName)     delete[] titleDirName;
-  if (folderName)       delete[] folderName;
-  if (newContainer)     delete[] newContainer;
-  if (newDir)           delete[] newDir;
-
-  return true;
-}
-
-bool jsonserver_recrename(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("recrename");
-  
-  char* fileNameToRename = NULL;
-  char* requestedNewName = NULL;
-  char* dateDirName = NULL;
-  char* titleDirName = NULL;
-  char* folderName = NULL;
-  char* newContainer = NULL;
-  char* newDir = NULL;
-  
-  try
-  {
-    int postDataLen = strlen(postData)+1;
-    fileNameToRename = new char[postDataLen];
-    int mgv1 = mg_get_var(postData, postDataLen-1, "filename", fileNameToRename, postDataLen);
-    requestedNewName = new char[postDataLen];
-    int mgv2 = mg_get_var(postData, postDataLen-1, "newname", requestedNewName, postDataLen);
-    
-    if ((mgv1 == -1) || (mgv2 == -1) || !strlen(fileNameToRename) || !strlen(requestedNewName))
-    {
-      logger->error("recrename: request mgvs: {} {}", mgv1, mgv2);
-      throw 1;
-    }
-    
-    cRecordings Recordings;
-    Recordings.Load(); // probably have to do this
-    cRecording* recordingObj = Recordings.GetByName(fileNameToRename);
-    if (!recordingObj) throw 2;
-    
-    cRecordControl *rc = cRecordControls::GetRecordControl(recordingObj->FileName());
-    if (rc) throw 3;
-    
-    logger->debug("recrename: renaming recording: {}", recordingObj->Name());
-    logger->debug("recrename: renaming recording: {}", recordingObj->FileName());
-    logger->debug("recrename: to: {}", requestedNewName);
-    
-    const char* t = recordingObj->FileName();
-    
-    int k, j, m;
-    
-    // Find the datedirname
-    for(k = strlen(t) - 1; k >= 0; k--)
-    {
-      if (t[k] == '/')
-      {
-        logger->debug("recrename: l1: {}", strlen(&t[k+1]) + 1);
-        dateDirName = new char[strlen(&t[k+1]) + 1];
-        strcpy(dateDirName, &t[k+1]);
-        break;
-      }
-    }
-    
-    // Find the titledirname
-    
-    for(j = k-1; j >= 0; j--)
-    {
-      if (t[j] == '/')
-      {
-        logger->debug("recrename: l2: {}", k - j);
-        titleDirName = new char[k - j];
-        memcpy(titleDirName, &t[j+1], k - j - 1);
-        titleDirName[k - j - 1] = '\0';
-        break;
-      }
-    }
-    
-    // Find the foldername
-
-#if APIVERSNUM > 20101
-    const char* vidDirStr = cVideoDirectory::Name();
-#else
-    const char* vidDirStr = VideoDirectory;
-#endif
-    int vidDirStrLen = strlen(vidDirStr);
-
-    logger->debug("recrename: j = {}, strlenvd = {}", j, vidDirStrLen);
-    if (j > vidDirStrLen) // Rec is in a subfolder now
-    {
-      for(m = j-1; m >= 0; m--)
-      {
-        if (t[m] == '/')
-        {
-          logger->debug("recrename: l3: {}", j - m);
-          folderName = new char[j - m];
-          memcpy(folderName, &t[m+1], j - m - 1);
-          folderName[j - m - 1] = '\0';
-          break;
-        }
-      }
-    }
-    
-    ExchangeChars(requestedNewName, true);
-    
-    logger->debug("recrename: datedirname: {}", dateDirName);
-    logger->debug("recrename: titledirname: {}", titleDirName);
-    logger->debug("recrename: viddir: {}", vidDirStr);
-    if (folderName) logger->debug("recrename: folderName: {}", folderName);
-    logger->debug("recrename: EC: {}", requestedNewName);
-   
-    // Could be a new path - construct that first and test
-
-    if (folderName)
-    {
-      newContainer = new char[vidDirStrLen + 1 + strlen(folderName) + 1 + strlen(requestedNewName) + 1];
-      sprintf(newContainer, "%s/%s/%s", vidDirStr, folderName, requestedNewName);
-    }
-    else
-    {
-      newContainer = new char[vidDirStrLen + 1 + strlen(requestedNewName) + 1];
-      sprintf(newContainer, "%s/%s", vidDirStr, requestedNewName);
-    }
-    logger->debug("recrename: NPT: {}", newContainer);
-    struct stat dstat;
-    int statret = stat(newContainer, &dstat);
-    if ((statret == -1) && (errno == ENOENT)) // Dir does not exist
-    {
-      logger->debug("recrename: new path does not exist (1)");
-      int mkdirret = mkdir(newContainer, 0755);
-      if (mkdirret != 0) throw 4;
-    }
-    else if ((statret == 0) && (! (dstat.st_mode && S_IFDIR)))
-    {
-      // Something exists but it's not a dir
-      throw 5;
-    }
-    
-    // New path now created or was there already
-    
-    newDir = new char[strlen(newContainer) + 1 + strlen(dateDirName) + 1];
-    sprintf(newDir, "%s/%s", newContainer, dateDirName);
-    
-    logger->debug("recrename: doing rename '{}' '{}'", t, newDir);
-    if (rename(t, newDir) != 0) throw 8;
-    
-    // Success. Test for remove old dir containter
-    char* tempOldTitleDir = new char[k+1];
-    memcpy(tempOldTitleDir, t, k);
-    tempOldTitleDir[k] = '\0';
-    logger->debug("recrename: len: {}, cp: {}, strlen: {}, oldtitledir: {}", k+1, k, strlen(tempOldTitleDir), tempOldTitleDir);
-    rmdir(tempOldTitleDir); // can't do anything about a fail result at this point.
-    delete[] tempOldTitleDir;
-    
-    ::Recordings.Update();
-    js["Result"] = true;
-    js["NewRecordingFileName"] = newDir;
-  }
-  catch (int e)
-  {
-    js["Result"] = false;
-    if (e == 1)
-    {
-      logger->error("recrename: Bad parameters");
-      js["Error"] = "Bad request parameters";
-    }
-    else if (e == 2)
-    {
-      logger->error("recrename: Could not find recording to move");
-      js["Error"] = "Bad filename";
-    }
-    else if (e == 3)
-    {
-      logger->error("recrename: Could not move recording, it is still recording");
-      js["Error"] = "Cannot move recording in progress";
-    }
-    else if (e == 4)
-    {
-      logger->error("recrename: Failed to make new dir (1)");
-      js["Error"] = "Failed to create new directory (1)";
-    }
-    else if (e == 5)
-    {
-      logger->error("recrename: Something already exists? (1)");
-      js["Error"] = "Something already exists at the new path (1)";
-    }
-    else if (e == 8)
-    {
-      logger->error("recrename: Rename failed");
-      js["Error"] = "Move failed";
-    }
-  }
-  
-  if (fileNameToRename) delete[] fileNameToRename;
-  if (requestedNewName) delete[] requestedNewName;
-  if (dateDirName)      delete[] dateDirName;
-  if (titleDirName)     delete[] titleDirName;
-  if (folderName)       delete[] folderName;
-  if (newContainer)     delete[] newContainer;
-  if (newDir)           delete[] newDir;
-  
-  return true;
-}
-
-bool jsonserver_recresetresume(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("recresetresume");
-
-  char reqfilename[1000];
-  int mgv1 = mg_get_var(postData, strlen(postData), "filename", reqfilename, 1000);
-  if (mgv1 == -1)
-  {
-    logger->error("recresetresume: Could not decode filename");
-    js["Result"] = false;
-    js["Error"] = "Could not decode filename";
-    return true;
-  }
-
-  logger->debug("recresetresume: {}", reqfilename);
-
-  cRecordings Recordings;
-  Recordings.Load(); // probably have to do this
-  cRecording *recording = Recordings.GetByName(reqfilename);
-
-  if (!recording)
-  {
-    js["Result"] = false;
-    js["Error"] = "Could not find recording to reset resume";
-    return true;
-  }
-
-  logger->debug("recresetresume: Reset resume for: {}", recording->Name());
-
-  cResumeFile ResumeFile(recording->FileName(), recording->IsPesRecording());
-  if (ResumeFile.Read() >= 0)
-  {
-    ResumeFile.Delete();
-    js["Result"] = true;
-    return true;
-  }
-  else
-  {
-    js["Result"] = false;
-    js["Error"] = "Recording has no resume point";
-    return true;
-  }
-}
-
-bool jsonserver_channellist(Json::Value& js)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("channellist");
-
-  Json::Value jschannels(Json::arrayValue);
-  
-//  int type;
-  for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel))
-  {
-    if (!channel->GroupSep())
-    {
-//      logger->debug("channellist: name: '{}'", channel->Name());
-
-//      if (channel->Vpid()) type = 1;
-//      else if (channel->Apid(0)) type = 2;
-//      else continue;
-
-      Json::Value oneChannel;
-      oneChannel["ID"] = (const char *)channel->GetChannelID().ToString();
-      oneChannel["Number"] = channel->Number();
-//      oneChannel["Type"] = type;
-      oneChannel["Name"] = channel->Name();
-//#if VDRVERSNUM < 10703
-//      oneChannel["VType"] = 2;
-//#else
-//      oneChannel["VType"] = channel->Vtype();
-//#endif
-      jschannels.append(oneChannel);    
-    }
-  }
-  js["Channels"] = jschannels;
-  
-  return true;
-}
-
-bool jsonserver_channelschedule(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("channelschedule: '{}'", postData);
-
-  char sChannelNumber[15];  int mgv1 = mg_get_var(postData, strlen(postData), "channelnumber", sChannelNumber, 15);  
-  char sStartTime[15];      int mgv2 = mg_get_var(postData, strlen(postData), "starttime", sStartTime, 15);  
-  char sDuration[15];       int mgv3 = mg_get_var(postData, strlen(postData), "duration", sDuration, 15);  
-
-  if ( (mgv1 == -1) || (mgv2 == -1) || (mgv3 == -1) )
-  {
-    logger->error("channelschedule: request mgvs: {} {} {}", mgv1, mgv2, mgv3);
-    js["Result"] = false;
-    js["Error"] = "Bad request parameters";
-    return true;
-  }
-
-  int channelNumber = atoi(sChannelNumber);
-  int startTime = atoi(sStartTime); 
-  int duration = atoi(sDuration); 
-
-  cChannel* channel = NULL;
-  for (channel = Channels.First(); channel; channel = Channels.Next(channel))
-  {
-    if (channel->GroupSep()) continue;
-    if (channel->Number() == channelNumber) break;
-  }
-
-  if (!channel)
-  {
-    logger->error("channelschedule: Could not find requested channel: {}", channelNumber);
-    js["Result"] = false;
-    js["Error"] = "Could not find channel";
-    return true;
-  }
-
-  cSchedulesLock MutexLock;
-  const cSchedules *Schedules = cSchedules::Schedules(MutexLock);
-  if (!Schedules)
-  {
-    logger->error("channelschedule: Could not find requested channel: {}", channelNumber);
-    js["Result"] = false;
-    js["Error"] = "Internal schedules error (1)";
-    return true;
-  }
-  const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
-  if (!Schedule)     
-  {
-    logger->error("channelschedule: Could not find requested channel: {}", channelNumber);
-    js["Result"] = false;
-    js["Error"] = "Internal schedules error (2)";
-    return true;
-  }
-    
-  Json::Value jsevents(Json::arrayValue);
-
-  for (const cEvent* event = Schedule->Events()->First(); event; event = Schedule->Events()->Next(event))
-  {
-    //in the past filter
-    if ((event->StartTime() + event->Duration()) < time(NULL)) continue;
-   //start time filter
-    if ((event->StartTime() + event->Duration()) <= startTime) continue;
-    //duration filter
-    if (event->StartTime() >= (startTime + duration)) continue;
-
-    Json::Value oneEvent;
-    oneEvent["ID"] = event->EventID();
-    oneEvent["Time"] = (Json::UInt)event->StartTime();
-    oneEvent["Duration"] = event->Duration();
-    oneEvent["Title"] = event->Title() ? event->Title() : "";
-    oneEvent["ShortText"] = event->ShortText() ? event->ShortText() : "";
-    oneEvent["HasTimer"] = event->HasTimer();
-    //oneEvent["Description"] = event->Description() ? event->Description() : "";
-    jsevents.append(oneEvent);
-  }
-
-  js["Result"] = true;
-  js["Events"] = jsevents;
-  return true;
-}
-
-bool jsonserver_getscheduleevent(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("getscheduleevent: '{}'", postData);
-  
-  char sChannelNumber[15];  int mgv1 = mg_get_var(postData, strlen(postData), "channelnumber", sChannelNumber, 15);
-  char sEventID[15];        int mgv2 = mg_get_var(postData, strlen(postData), "eventid", sEventID, 15);
-  
-  if ( (mgv1 == -1) || (mgv2 == -1) )
-  {
-    logger->error("getscheduleevent: request mgvs: {} {}", mgv1, mgv2);
-    js["Result"] = false;
-    js["Error"] = "Bad request parameters";
-    return true;
-  }
-
-  int channelNumber = atoi(sChannelNumber);
-  int eventID = atoi(sEventID);
-  
-  const cEvent* event = jsonserver_getEvent(js, channelNumber, eventID, 0);
-  if (!event)
-  {
-    js["Result"] = false;
-    return true;
-  }
-  
-  Json::Value oneEvent;
-  oneEvent["ID"] = event->EventID();
-  oneEvent["Time"] = (Json::UInt)event->StartTime();
-  oneEvent["Duration"] = event->Duration();
-  oneEvent["Title"] = event->Title() ? event->Title() : "";
-  oneEvent["ShortText"] = event->ShortText() ? event->ShortText() : "";
-  oneEvent["Description"] = event->Description() ? event->Description() : "";
-  oneEvent["HasTimer"] = event->HasTimer();
-  oneEvent["RunningStatus"] = event->RunningStatus();
-
-  js["Result"] = true;
-  js["Event"] = oneEvent;
-  return true;
-}
-
-const cEvent* jsonserver_getEvent(Json::Value& js, int channelNumber, int eventID, int aroundTime)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  
-  cChannel* channel = NULL;
-  for (channel = Channels.First(); channel; channel = Channels.Next(channel))
-  {
-    if (channel->GroupSep()) continue;
-    if (channel->Number() == channelNumber) break;
-  }
-
-  if (!channel)
-  {
-    logger->error("getevent: Could not find requested channel: {}", channelNumber);
-    js["Error"] = "Could not find channel";
-    return NULL;
-  }
-
-  cSchedulesLock MutexLock;
-  const cSchedules *Schedules = cSchedules::Schedules(MutexLock);
-  if (!Schedules)
-  {
-    logger->error("getevent: Could not find requested channel: {}", channelNumber);
-    js["Error"] = "Internal schedules error (1)";
-    return NULL;
-  }
-  
-  const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
-  if (!Schedule)
-  {
-    logger->error("getevent: Could not find requested channel: {}", channelNumber);
-    js["Error"] = "Internal schedules error (2)";
-    return NULL;
-  }
-  
-  const cEvent* event = NULL;
-  if (eventID)
-  {
-    event = Schedule->GetEvent(eventID);
-  }
-  else
-  {
-    event = Schedule->GetEventAround(aroundTime);
-  }
-  
-  if (!event)
-  {
-    logger->error("getevent: Could not find requested event: {}", eventID);
-    js["Error"] = "Internal schedules error (3)";
-    return NULL;
-  }
-
-  return event;
-}
-
-bool jsonserver_timerlist(Json::Value& js)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("timerlist");
-
-  Json::Value jstimers(Json::arrayValue);
-  
-  cTimer *timer;
-  int numTimers = Timers.Count();
-
-  for (int i = 0; i < numTimers; i++)
-  {
-    timer = Timers.Get(i);
-    Json::Value oneTimer;
-    oneTimer["Active"] = timer->HasFlags(tfActive);
-    oneTimer["Recording"] = timer->Recording();
-    oneTimer["Pending"] = timer->Pending();
-    oneTimer["Priority"] = timer->Priority();
-    oneTimer["Lifetime"] = timer->Lifetime();
-    oneTimer["ChannelNumber"] = timer->Channel()->Number();
-    oneTimer["ChannelID"] = (const char *)timer->Channel()->GetChannelID().ToString();
-    oneTimer["StartTime"] = (int)timer->StartTime();
-    oneTimer["StopTime"] = (int)timer->StopTime();
-    oneTimer["Day"] = (int)timer->Day();
-    oneTimer["WeekDays"] = timer->WeekDays();
-    oneTimer["Name"] = timer->File();
-    
-    const cEvent* event = timer->Event();
-    if (event)
-    {
-      oneTimer["EventID"] = event->EventID();
-    }
-    else
-    {
-      int channelNumber = timer->Channel()->Number();
-      int aroundTime = timer->StartTime() + 1;
-      logger->debug("timerlist: {}", aroundTime);
-
-      const cEvent* eventAround = jsonserver_getEvent(js, channelNumber, 0, aroundTime);
-      if (eventAround)
-      {
-        oneTimer["EventID"] = eventAround->EventID();
-      }
-      else
-      {
-        oneTimer["EventID"] = 0;
-      }
-    }
-
-    jstimers.append(oneTimer);
-  }
-  
-  js["Timers"] = jstimers;
-  js["Result"] = true;
-  return true;
-}
-
-bool jsonserver_timerset(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("timerset");
-
-  char sTimerString[1024];   int mgv1 = mg_get_var(postData, strlen(postData), "timerstring", sTimerString, 1024);  
-
-  if (mgv1 == -1)
-  {
-    logger->error("timerset: Could not get timerstring");
-    js["Result"] = false;
-    js["Error"] = "Bad request parameters";
-    return true;
-  }
-
-  logger->debug("timerset: '{}'", sTimerString);
-  cTimer *timer = new cTimer;
-  if (!timer->Parse(sTimerString))
-  {
-    delete timer;
-    js["Result"] = false;
-    js["Error"] = "Failed to parse timer request details";
-    return true;
-  }
-
-  cTimer *t = Timers.GetTimer(timer);
-  if (t)
-  {
-    delete timer;
-    js["Result"] = false;
-    js["Error"] = "Timer already exists";
-    return true;
-  }
-
-  Timers.Add(timer);
-  Timers.SetModified();
-  js["Result"] = true;
-  return true;
-}
-
-bool jsonserver_timersetactive(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("timersetactive");
-
-  char rChannelID[50];  int mgv1 = mg_get_var(postData, strlen(postData), "ChannelID", rChannelID, 50);
-  char rName[1024];  int mgv2 = mg_get_var(postData, strlen(postData), "Name", rName, 1024);
-  char rStartTime[20];  int mgv3 = mg_get_var(postData, strlen(postData), "StartTime", rStartTime, 20);
-  char rStopTime[20];  int mgv4 = mg_get_var(postData, strlen(postData), "StopTime", rStopTime, 20);
-  char rWeekDays[50];  int mgv5 = mg_get_var(postData, strlen(postData), "WeekDays", rWeekDays, 20);
-  char tNewActive[20];  int mgv6 = mg_get_var(postData, strlen(postData), "SetActive", tNewActive, 20);
-
-  if ( (mgv1 == -1) || (mgv2 == -1) || (mgv3 == -1) || (mgv4 == -1) || (mgv5 == -1) || (mgv6 == -1))
-  {
-    logger->error("timersetactive: request mgvs: {} {} {} {} {} {}", mgv1, mgv2, mgv3, mgv4, mgv5, mgv6);
-    js["Result"] = false;
-    js["Error"] = "Bad request parameters";
-    return true;
-  }
-
-  logger->debug("timersetactive: {} {}:{}:{}:{}:{}", tNewActive, rChannelID, rName, rStartTime, rStopTime, rWeekDays);
-
-  cTimer* timer = jsonserver_findTimer(rChannelID, rName, rStartTime, rStopTime, rWeekDays);
-  if (timer)
-  {
-    if (strcmp(tNewActive, "true") == 0)
-    {
-      timer->SetFlags(tfActive);
-    }
-    else if (strcmp(tNewActive, "false") == 0)
-    {
-      timer->ClrFlags(tfActive);
-    }
-    else
-    {
-      js["Result"] = false;
-      js["Error"] = "Bad request parameters";
-      return true;
-    }
-
-    js["Result"] = true;
-
-    Timers.SetModified();
-
-    return true;
-  }
-
-  js["Result"] = false;
-  js["Error"] = "Timer not found";
-  return true;
-}
-
-bool jsonserver_timeredit(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("timeredit");
-
-  // Get all olds
-  char oldName[1024];     int mgv1 = mg_get_var(postData, strlen(postData), "OldName", oldName, 1024);
-  char oldActive[20];     int mgv2 = mg_get_var(postData, strlen(postData), "OldActive", oldActive, 20);
-  char oldChannelID[50];  int mgv3 = mg_get_var(postData, strlen(postData), "OldChannelID", oldChannelID, 50);
-  char oldDay[20];        int mgv4 = mg_get_var(postData, strlen(postData), "OldDay", oldDay, 20);
-  char oldWeekDays[50];   int mgv5 = mg_get_var(postData, strlen(postData), "OldWeekDays", oldWeekDays, 20);
-  char oldStartTime[20];  int mgv6 = mg_get_var(postData, strlen(postData), "OldStartTime", oldStartTime, 20);
-  char oldStopTime[20];   int mgv7 = mg_get_var(postData, strlen(postData), "OldStopTime", oldStopTime, 20);
-  char oldPriority[20];   int mgv8 = mg_get_var(postData, strlen(postData), "OldPriority", oldPriority, 20);
-  char oldLifetime[20];   int mgv9 = mg_get_var(postData, strlen(postData), "OldLifetime", oldLifetime, 20);
-
-  if ( (mgv1 == -1) || (mgv2 == -1) || (mgv3 == -1) || (mgv4 == -1) || (mgv5 == -1) || (mgv6 == -1) || (mgv7 == -1) || (mgv8 == -1) || (mgv9 == -1))
-  {
-    logger->error("timeredit: request mgvs: {} {} {} {} {} {} {} {} {}", mgv1, mgv2, mgv3, mgv4, mgv5, mgv6, mgv7, mgv8, mgv9);
-    js["Result"] = false;
-    js["Error"] = "Bad request parameters";
-    return true;
-  }
-
-  logger->debug("timeredit: {} {} {} {} {} {} {} {} {}", oldName, oldActive, oldChannelID, oldDay, oldWeekDays, oldStartTime, oldStopTime, oldPriority, oldLifetime);
-
-
-  // Get all news
-  char newName[1024];     int mgv11 = mg_get_var(postData, strlen(postData), "NewName", newName, 1024);
-  char newActive[20];     int mgv12 = mg_get_var(postData, strlen(postData), "NewActive", newActive, 20);
-  char newChannelID[50];  int mgv13 = mg_get_var(postData, strlen(postData), "NewChannelID", newChannelID, 50);
-  char newDay[20];        int mgv14 = mg_get_var(postData, strlen(postData), "NewDay", newDay, 20);
-  char newWeekDays[50];   int mgv15 = mg_get_var(postData, strlen(postData), "NewWeekDays", newWeekDays, 20);
-  char newStartTime[20];  int mgv16 = mg_get_var(postData, strlen(postData), "NewStartTime", newStartTime, 20);
-  char newStopTime[20];   int mgv17 = mg_get_var(postData, strlen(postData), "NewStopTime", newStopTime, 20);
-  char newPriority[20];   int mgv18 = mg_get_var(postData, strlen(postData), "NewPriority", newPriority, 20);
-  char newLifetime[20];   int mgv19 = mg_get_var(postData, strlen(postData), "NewLifetime", newLifetime, 20);
-
-  if ( (mgv11 == -1) || (mgv12 == -1) || (mgv13 == -1) || (mgv14 == -1) || (mgv15 == -1) || (mgv16 == -1) || (mgv17 == -1) || (mgv18 == -1) || (mgv19 == -1))
-  {
-    logger->error("timeredit: request mgvs: {} {} {} {} {} {} {} {} {}", mgv11, mgv12, mgv13, mgv14, mgv15, mgv16, mgv17, mgv18, mgv19);
-    js["Result"] = false;
-    js["Error"] = "Bad request parameters";
-    return true;
-  }
-
-  logger->debug("timeredit: {} {} {} {} {} {} {} {} {}", newName, newActive, newChannelID, newDay, newWeekDays, newStartTime, newStopTime, newPriority, newLifetime);
-
-
-  cTimer* timer = jsonserver_findTimer2(oldName, oldActive, oldChannelID, oldDay, oldWeekDays, oldStartTime, oldStopTime, oldPriority, oldLifetime);
-  if (!timer)
-  {
-    js["Result"] = false;
-    js["Error"] = "Timer not found";
-    return true;
-  }
-
-  // Old version commented below used to set each thing individually based on whether it had changed. However, since
-  // the only way to change the timer channel appears to be with the cTimer::Parse function, might as well use that
-  // for everything it supports
-  // Except flags. Get current flags, set using Parse, then add/remove active as needed the other way.
-
-  time_t nstt = atoi(newStartTime);
-  struct tm nstm;
-  localtime_r(&nstt, &nstm);
-  int nssf = (nstm.tm_hour * 100) + nstm.tm_min;
-
-  time_t nztt = atoi(newStopTime);
-  struct tm nztm;
-  localtime_r(&nztt, &nztm);
-  int nzsf = (nztm.tm_hour * 100) + nztm.tm_min;
-
-  strreplace(newName, ':', '|');
-
-  cString parseBuffer = cString::sprintf("%u:%s:%s:%04d:%04d:%d:%d:%s:%s",
-                          timer->Flags(), newChannelID, *(cTimer::PrintDay(atoi(newDay), atoi(newWeekDays), true)),
-                          nssf, nzsf, atoi(newPriority), atoi(newLifetime), newName, timer->Aux() ? timer->Aux() : "");
-
-  logger->debug("timeredit: new parse: {}", *parseBuffer);
-
-  bool parseResult = timer->Parse(*parseBuffer);
-  if (!parseResult)
-  {
-    js["Result"] = false;
-    js["Error"] = "Timer parsing failed";
-    return true;
-  }
-
-  if (timer->HasFlags(tfActive) != !(strcasecmp(newActive, "true")))
-  {
-    logger->debug("timeredit: {} {} set new active: {}", timer->HasFlags(tfActive), !(strcasecmp(newActive, "true")), newActive);
-
-    if (strcasecmp(newActive, "true") == 0)
-    {
-      timer->SetFlags(tfActive);
-    }
-    else if (strcasecmp(newActive, "false") == 0)
-    {
-      timer->ClrFlags(tfActive);
-    }
-    else
-    {
-      js["Result"] = false;
-      js["Error"] = "Bad request parameters";
-      return true;
-    }
-  }
-
-  js["Result"] = true;
-  Timers.SetModified();
-  return true;
-
-  /*
-
-  if (strcmp(timer->File(), newName))
-  {
-    logger->debug("timeredit: set new name: {}", newName);
-    timer->SetFile(newName);
-  }
-
-  if (timer->Day() != atoi(newDay))
-  {
-    logger->debug("timeredit: set new day: {}", newDay);
-    timer->SetDay(atoi(newDay));
-  }
-
-  if (timer->WeekDays() != atoi(newWeekDays))
-  {
-    logger->debug("timeredit: set new week days: {}", newWeekDays);
-    timer->SetWeekDays(atoi(newWeekDays));
-  }
-
-  if (timer->StartTime() != atoi(newStartTime))
-  {
-    logger->debug("timeredit: set new start time: {}", newStartTime);
-    time_t nstt = atoi(newStartTime);
-    struct tm nstm;
-    localtime_r(&nstt, &nstm);
-    int nssf = (nstm.tm_hour * 100) + nstm.tm_min;
-    timer->SetStart(nssf);
-  }
-
-  if (timer->StopTime() != atoi(newStopTime))
-  {
-    logger->debug("timeredit: set new stop time: {}", newStopTime);
-    time_t nztt = atoi(newStopTime);
-    struct tm nztm;
-    localtime_r(&nztt, &nztm);
-    int nzsf = (nztm.tm_hour * 100) + nztm.tm_min;
-    timer->SetStop(nzsf);
-  }
-
-  if (timer->Priority() != atoi(newPriority))
-  {
-    logger->debug("timeredit: set new priority: {}", newPriority);
-    timer->SetPriority(atoi(newPriority));
-  }
-
-  if (timer->Lifetime() != atoi(newLifetime))
-  {
-    logger->debug("timeredit: set new lifetime: {}", newLifetime);
-    timer->SetLifetime(atoi(newLifetime));
-  }
-*/
-}
-
-cTimer* jsonserver_findTimer2(const char* rName, const char* rActive, const char* rChannelID, const char* rDay, const char* rWeekDays, const char* rStartTime, const char* rStopTime, const char* rPriority, const char* rLifetime)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  
-  int numTimers = Timers.Count();
-  cTimer* timer;
-  logger->debug("findtimer2: {} {} {} {} {} {} {} {} {}", rName, rActive, rChannelID, rDay, rWeekDays, rStartTime, rStopTime, rPriority, rLifetime);
-  for (int i = 0; i < numTimers; i++)
-  {
-    timer = Timers.Get(i);
-
-    logger->debug("findtimer2: search: {} {} {} {} {} {} {} {} {}", timer->File(), timer->HasFlags(tfActive), (const char*)timer->Channel()->GetChannelID().ToString(),
-                                                                                        (int)timer->Day(), timer->WeekDays(), (int)timer->StartTime(), (int)timer->StopTime(),
-                                                                                        timer->Priority(), timer->Lifetime());
-
-    if (    (strcmp(timer->File(), rName) == 0)
-         && (timer->HasFlags(tfActive) == !(strcasecmp(rActive, "true")))
-         && (strcmp(timer->Channel()->GetChannelID().ToString(), rChannelID) == 0)
-         && (timer->Day() == atoi(rDay))
-         && (timer->WeekDays() == atoi(rWeekDays))
-         && (timer->StartTime() == atoi(rStartTime))
-         && (timer->StopTime() == atoi(rStopTime))
-         && (timer->Priority() == atoi(rPriority))
-         && (timer->Lifetime() == atoi(rLifetime))
-       )
-    {
-      logger->debug("findtimer2: found");
-      return timer;
-    }
-  }
-  logger->debug("findtimer2: no timer found");
-  return NULL;
-}
-
-cTimer* jsonserver_findTimer(const char* rChannelID, const char* rName, const char* rStartTime, const char* rStopTime, const char* rWeekDays)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-
-  int numTimers = Timers.Count();
-  cTimer* timer;
-  for (int i = 0; i < numTimers; i++)
-  {
-    timer = Timers.Get(i);
-
-    logger->debug("findtimer: current: {}", (const char*)timer->ToText(true));
-    logger->debug("findtimer: {}", (const char*)timer->Channel()->GetChannelID().ToString());
-    logger->debug("findtimer: {}", rChannelID);
-    logger->debug("findtimer: {}", timer->File());
-    logger->debug("findtimer: {}", rName);
-    logger->debug("findtimer: {}", timer->StartTime());
-    logger->debug("findtimer: {}", rStartTime);
-    logger->debug("findtimer: {}", timer->StopTime());
-    logger->debug("findtimer: {}", rStopTime);
-    logger->debug("findtimer: {}", timer->WeekDays());
-    logger->debug("findtimer: {}", rWeekDays);
-
-    if (
-            (strcmp(timer->Channel()->GetChannelID().ToString(), rChannelID) == 0)
-         && (strcmp(timer->File(), rName) == 0)
-         && (timer->StartTime() == atoi(rStartTime))
-         && (timer->StopTime() == atoi(rStopTime))
-         && (timer->WeekDays() == atoi(rWeekDays))
-       )
-    {
-      logger->debug("findtimer: found");
-      return timer;
-    }
-  }
-  logger->debug("findtimer: no timer found");
-  return NULL;
-}
-
-bool jsonserver_timerdel(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("timerdel");
-  
-  char rChannelID[50];  int mgv1 = mg_get_var(postData, strlen(postData), "ChannelID", rChannelID, 50);
-  char rName[1024];  int mgv2 = mg_get_var(postData, strlen(postData), "Name", rName, 1024);
-  char rStartTime[20];  int mgv3 = mg_get_var(postData, strlen(postData), "StartTime", rStartTime, 20);
-  char rStopTime[20];  int mgv4 = mg_get_var(postData, strlen(postData), "StopTime", rStopTime, 20);
-  char rWeekDays[50];  int mgv5 = mg_get_var(postData, strlen(postData), "WeekDays", rWeekDays, 20);
-  
-  if ( (mgv1 == -1) || (mgv2 == -1) || (mgv3 == -1) || (mgv4 == -1) || (mgv5 == -1))
-  {
-    logger->error("timerdel: request mgvs: {} {} {} {} {}", mgv1, mgv2, mgv3, mgv4, mgv5);
-    js["Result"] = false;
-    js["Error"] = "Bad request parameters";
-    return true;
-  }
-  
-  logger->debug("timerdel: {}:{}:{}:{}:{}", rChannelID, rName, rStartTime, rStopTime, rWeekDays);
-  
-  if (Timers.BeingEdited())
-  {
-    logger->debug("timerdel: Unable to delete timer - timers being edited at VDR");
-    js["Result"] = false;
-    js["Error"] = "Timers being edited at VDR";
-    return true;
-  }
-
-  cTimer* timer = jsonserver_findTimer(rChannelID, rName, rStartTime, rStopTime, rWeekDays);
-  if (timer)
-  {
-    if (timer->Recording())
-    {
-      logger->debug("timerdel: Unable to delete timer - timer is running");
-      js["Result"] = false;
-      js["Error"] = "Timer is running";
-      return true;
-    }
-
-    // delete
-
-    Timers.Del(timer);
-    Timers.SetModified();
-    js["Result"] = true;
-    return true;
-  }
-  
-  js["Result"] = false;
-  js["Error"] = "Timer not found";
-  return true;
-}
-
-bool jsonserver_timerisrecording(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("timerisrecording");
-
-  char rChannelID[50];  int mgv1 = mg_get_var(postData, strlen(postData), "ChannelID", rChannelID, 50);
-  char rName[1024];  int mgv2 = mg_get_var(postData, strlen(postData), "Name", rName, 1024);
-  char rStartTime[20];  int mgv3 = mg_get_var(postData, strlen(postData), "StartTime", rStartTime, 20);
-  char rStopTime[20];  int mgv4 = mg_get_var(postData, strlen(postData), "StopTime", rStopTime, 20);
-  char rWeekDays[50];  int mgv5 = mg_get_var(postData, strlen(postData), "WeekDays", rWeekDays, 20);
-
-  if ( (mgv1 == -1) || (mgv2 == -1) || (mgv3 == -1) || (mgv4 == -1) || (mgv5 == -1))
-  {
-    logger->error("timerisrecording: request mgvs: {} {} {} {} {}", mgv1, mgv2, mgv3, mgv4, mgv5);
-    js["Result"] = false;
-    js["Error"] = "Bad request parameters";
-    return true;
-  }
-  
-  logger->debug("timerisrecording: {}:{}:{}:{}:{}", rChannelID, rName, rStartTime, rStopTime, rWeekDays);
-  
-  cTimer* timer = jsonserver_findTimer(rChannelID, rName, rStartTime, rStopTime, rWeekDays);
-  if (timer)
-  {
-    js["Recording"] = timer->Recording();
-    js["Pending"] = timer->Pending();
-    js["Result"] = true;
-    return true;
-  }
-  
-  js["Result"] = false;
-  js["Error"] = "Timer not found";
-  return true;
-}
-
-bool jsonserver_tunersstatus(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("tunerstatus");
-  
-  js["NumDevices"] = cDevice::NumDevices();
-
-  Json::Value jsdevices(Json::arrayValue);
-  
-  for (int i = 0; i < cDevice::NumDevices(); i++)
-  {
-    Json::Value oneDevice;
-    cDevice *d = cDevice::GetDevice(i);
-    oneDevice["Number"] = d->DeviceNumber();
-    oneDevice["Type"] = (const char*)d->DeviceType();
-    oneDevice["Name"] = (const char*)d->DeviceName();
-    oneDevice["IsPrimary"] = d->IsPrimaryDevice();
-
-    const cChannel* cchannel = d->GetCurrentlyTunedTransponder();
-    if (cchannel)
-    {
-      oneDevice["Frequency"] = cchannel->Frequency();
-      oneDevice["SignalStrength"] = d->SignalStrength();
-      oneDevice["SignalQuality"] = d->SignalQuality();
-
-    }
-    else
-    {
-      oneDevice["Frequency"] = 0;
-      oneDevice["SignalStrength"] = 0;
-      oneDevice["SignalQuality"] = 0;
-    }
-    
-    jsdevices.append(oneDevice);
-  }
-  
-  js["Devices"] = jsdevices;
-
-
-  Json::Value jstimers(Json::arrayValue);
-  int numTimers = Timers.Count();
-  cTimer* timer;
-  for (int i = 0; i < numTimers; i++)
-  {
-    timer = Timers.Get(i);
-
-    if (timer->Recording())
-    {
-      Json::Value oneTimer;
-      oneTimer["Recording"] = timer->Recording();
-      oneTimer["StartTime"] = (int)timer->StartTime();
-      oneTimer["StopTime"] = (int)timer->StopTime();
-      oneTimer["File"] = timer->File();
-
-      cRecordControl* crc = cRecordControls::GetRecordControl(timer);
-      if (crc)
-      {
-        cDevice* crcd = crc->Device();
-        oneTimer["DeviceNumber"] = crcd->DeviceNumber();
-      }
-      else
-      {
-        oneTimer["DeviceNumber"] = Json::Value::null;
-      }
-
-      const cChannel* channel = timer->Channel();
-      if (channel)
-      {
-        oneTimer["ChannelName"] = channel->Name();
-      }
-      else
-      {
-        oneTimer["ChannelName"] = Json::Value::null;
-      }
-
-      jstimers.append(oneTimer);
-    }
-      
-  }
-  js["CurrentRecordings"] = jstimers;
-
-  
-  js["Result"] = true;
-  return true;
-}
-
-
-bool jsonserver_epgsearchsame(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("epgsearchsame");
-
-  char sAtTime[15];  int mgv1 = mg_get_var(postData, strlen(postData), "time", sAtTime, 15);
-  char sTitle[1024]; int mgv2 = mg_get_var(postData, strlen(postData), "title", sTitle, 1024);
-
-  if ( (mgv1 == -1) || (mgv2 == -1) )
-  {
-    logger->error("epgsearchsame: request mgvs: {} {}", mgv1, mgv2);
-    js["Result"] = false;
-    js["Error"] = "Bad request parameters";
-    return true;
-  }
-
-  int atTime = atoi(sAtTime);
-  logger->debug("epgsearchsame: request time: {}, title: {}", atTime, sTitle);
-
-
-
-  cSchedulesLock SchedulesLock;
-  const cSchedules *schedules = cSchedules::Schedules(SchedulesLock);
-  if (!schedules)
-  {
-    js["Result"] = false;
-    return true;
-  }
-
-  Json::Value jsevents(Json::arrayValue);
-
-  const cEvent *event;
-  for (cSchedule *schedule = schedules->First(); (schedule != NULL); schedule = schedules->Next(schedule))
-  {
-    event = schedule->GetEventAround(atTime);
-    if (!event) continue; // nothing found on this schedule(channel)
-
-    if (!strcmp(event->Title(), sTitle))
-    {
-      Json::Value oneEvent;
-      oneEvent["ChannelID"] = (const char*)event->ChannelID().ToString();
-      oneEvent["ID"] = event->EventID();
-      oneEvent["Time"] = (Json::UInt)event->StartTime();
-      oneEvent["Duration"] = event->Duration();
-      oneEvent["Title"] = event->Title() ? event->Title() : "";
-      oneEvent["ShortText"] = event->ShortText() ? event->ShortText() : "";
-      oneEvent["HasTimer"] = event->HasTimer();
-      //oneEvent["Description"] = event->Description() ? event->Description() : "";
-      jsevents.append(oneEvent);
-    }
-  }
-
-  js["Events"] = jsevents;
-  js["Result"] = true;
-  return true;
-}
-
-bool jsonserver_epgdownload(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("epgdownload: '{}'", postData);
-
-  cSchedulesLock MutexLock;
-  const cSchedules *Schedules = cSchedules::Schedules(MutexLock);
-
-  if (!Schedules)
-  {
-    logger->error("epgdownload: Could not get Schedules object");
-    js["Result"] = false;
-    js["Error"] = "Internal schedules error (1)";
-    return true;
-  }
-
-  Json::Value jsevents(Json::arrayValue);
-
-  for (cChannel* channel = Channels.First(); channel; channel = Channels.Next(channel))
-  {
-    if (channel->GroupSep()) continue;
-
-    const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
-    if (!Schedule) continue;
-
-
-    for (const cEvent* event = Schedule->Events()->First(); event; event = Schedule->Events()->Next(event))
-    {
-      Json::Value oneEvent;
-      oneEvent["ChannelNumber"] = channel->Number();
-      oneEvent["ChannelID"] = (const char*)event->ChannelID().ToString();
-      oneEvent["ID"] = event->EventID();
-      oneEvent["Time"] = (Json::UInt)event->StartTime();
-      oneEvent["Duration"] = event->Duration();
-      oneEvent["Title"] = event->Title() ? event->Title() : "";
-      oneEvent["ShortText"] = event->ShortText() ? event->ShortText() : "";
-      oneEvent["HasTimer"] = event->HasTimer();
-      oneEvent["Description"] = event->Description() ? event->Description() : "";
-      jsevents.append(oneEvent);
-    }
-  }
-
-  js["Result"] = true;
-  js["Events"] = jsevents;
-  return true;
-}
-
-bool jsonserver_epgsearch(Json::Value& js, const char* postData)
-{
-  std::shared_ptr<spd::logger> logger = spd::get("jsonserver_spdlog");
-  logger->debug("epgsearch: '{}'", postData);
-
-  char searchfor[1024]; int mgv1 = mg_get_var(postData, strlen(postData), "searchfor", searchfor, 1024);
-
-  if (mgv1 == -1)
-  {
-    logger->error("epgsearch: request mgvs: {}", mgv1);
-    js["Result"] = false;
-    js["Error"] = "Bad request parameters";
-    return true;
-  }
-
-  logger->debug("epgsearch: search for: {}", searchfor);
-
-  cSchedulesLock MutexLock;
-  const cSchedules *Schedules = cSchedules::Schedules(MutexLock);
-
-  if (!Schedules)
-  {
-    logger->error("epgsearch: Could not get Schedules object");
-    js["Result"] = false;
-    js["Error"] = "Internal schedules error (1)";
-    return true;
-  }
-
-  Json::Value jsevents(Json::arrayValue);
-
-  for (cChannel* channel = Channels.First(); channel; channel = Channels.Next(channel))
-  {
-    if (channel->GroupSep()) continue;
-
-    const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
-    if (!Schedule) continue;
-
-    bool foundtitle;
-    bool founddescription;
-    for (const cEvent* event = Schedule->Events()->First(); event; event = Schedule->Events()->Next(event))
-    {
-      foundtitle = false;
-      founddescription = false;
-
-      if (event->Title() && strcasestr(event->Title(), searchfor)) foundtitle = true;
-
-      if (!foundtitle && event->Description())
-        if (strcasestr(event->Description(), searchfor)) founddescription = true;
-
-      if (foundtitle || founddescription)
-      {
-        Json::Value oneEvent;
-        oneEvent["ChannelNumber"] = channel->Number();
-        oneEvent["ChannelID"] = (const char*)event->ChannelID().ToString();
-        oneEvent["ID"] = event->EventID();
-        oneEvent["Time"] = (Json::UInt)event->StartTime();
-        oneEvent["Duration"] = event->Duration();
-        oneEvent["Title"] = event->Title() ? event->Title() : "";
-        oneEvent["ShortText"] = event->ShortText() ? event->ShortText() : "";
-        oneEvent["HasTimer"] = event->HasTimer();
-        oneEvent["Description"] = event->Description() ? event->Description() : "";
-        if (founddescription)
-          oneEvent["FoundInDesc"] = true;
-        else
-          oneEvent["FoundInDesc"] = false;
-        jsevents.append(oneEvent);
-      }
-    }
-  }
-
-  js["Result"] = true;
-  js["Events"] = jsevents;
-  return true;
-}
diff --git a/handler.h b/handler.h
deleted file mode 100644
index 92fb10d..0000000
--- a/handler.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef JSONSERVERHANDLER_H
-#define JSONSERVERHANDLER_H
-
-#include <jsoncpp/json/json.h>
-#include "mongoose.h"
-
-class cEvent;
-class cTimer;
-
-int jsonserver_request_handler(struct mg_connection* conn);
-
-bool jsonserver_gettime(Json::Value& js);
-bool jsonserver_diskstats(Json::Value& js);
-bool jsonserver_reclist(Json::Value& js);
-bool jsonserver_recinfo(Json::Value& js, const char* postData);
-bool jsonserver_recdel(Json::Value& js, const char* postData);
-bool jsonserver_recmove(Json::Value& js, const char* postData);
-bool jsonserver_recrename(Json::Value& js, const char* postData);
-bool jsonserver_recstop(Json::Value& js, const char* postData);
-bool jsonserver_recresetresume(Json::Value& js, const char* postData);
-bool jsonserver_channellist(Json::Value& js);
-bool jsonserver_channelschedule(Json::Value& js, const char* postData);
-bool jsonserver_getscheduleevent(Json::Value& js, const char* postData);
-bool jsonserver_timerlist(Json::Value& js);
-bool jsonserver_timerdel(Json::Value& js, const char* postData);
-bool jsonserver_timerset(Json::Value& js, const char* postData);
-bool jsonserver_timersetactive(Json::Value& js, const char* postData);
-bool jsonserver_timerisrecording(Json::Value& js, const char* postData);
-bool jsonserver_timeredit(Json::Value& js, const char* postData);
-bool jsonserver_tunersstatus(Json::Value& js, const char* postData);
-bool jsonserver_epgsearchsame(Json::Value& js, const char* postData);
-bool jsonserver_epgdownload(Json::Value& js, const char* postData);
-bool jsonserver_epgsearch(Json::Value& js, const char* postData);
-
-const cEvent* jsonserver_getEvent(Json::Value& js, int channelNumber, int eventID, int aroundTime);
-cTimer* jsonserver_findTimer(const char* rChannelID, const char* rName, const char* rStartTime, const char* rStopTime, const char* rWeekDays);
-cTimer* jsonserver_findTimer2(const char* rName, const char* rActive, const char* rChannelID, const char* rDay, const char* rWeekDays, const char* rStartTime, const char* rStopTime, const char* rPriority, const char* rLifetime);
-
-#endif
-
diff --git a/httpdclient.c b/httpdclient.c
new file mode 100644
index 0000000..7a25abc
--- /dev/null
+++ b/httpdclient.c
@@ -0,0 +1,305 @@
+#include <stdio.h>
+#include <string.h>
+#include <malloc.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include <memory>
+
+#include "httpdclient.h"
+
+#include "vdrclient.h"
+
+#define POSTBUFFERSIZE  512
+
+std::shared_ptr<spd::logger> HTTPDClient::logger;
+struct MHD_Daemon* HTTPDClient::httpdserver = NULL;
+std::string HTTPDClient::docRoot;
+
+bool HTTPDClient::StartServer(std::string _docRoot, int port)
+{
+  docRoot = _docRoot;
+
+  logger = spd::get("jsonserver_spdlog");
+
+  httpdserver = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY, port, NULL, NULL,
+                           &HTTPDClient::handle_connection, NULL,
+                           MHD_OPTION_NOTIFY_CONNECTION, &HTTPDClient::connection_notify, NULL,
+                           MHD_OPTION_NOTIFY_COMPLETED, &HTTPDClient::request_completed, NULL,
+                           MHD_OPTION_END);
+  if (httpdserver == NULL) { logger.reset(); return false; }
+  logger->info("HTTPDClient: Started");
+  return true;
+}
+
+void HTTPDClient::StopServer()
+{
+  if (httpdserver) MHD_stop_daemon(httpdserver);
+  httpdserver = NULL;
+  logger.reset();
+}
+
+// Now for the libmicrohttpd callbacks
+
+int HTTPDClient::uri_key_value(void *cls, enum MHD_ValueKind kind, const char* key, const char* value)
+{
+  if (kind != MHD_GET_ARGUMENT_KIND) return MHD_NO;
+  HTTPDClient* httpdclient = (HTTPDClient*)cls;
+  httpdclient->addGetVar(key, value);
+  return MHD_YES;
+}
+
+int HTTPDClient::iterate_post(void *clientIdentifier, enum MHD_ValueKind kind, const char *key,
+              const char *filename, const char* content_type,
+              const char *transfer_encoding, const char *data, uint64_t off, size_t size)
+{
+  if (size == 0) return MHD_NO;
+
+  HTTPDClient* httpdclient = (HTTPDClient*)clientIdentifier;
+  httpdclient->addPostField(key, data, size);
+  return MHD_YES;
+
+  //Return MHD_YES to continue iterating, MHD_NO to abort the iteration.
+}
+
+void HTTPDClient::request_completed(void *cls, struct MHD_Connection *mhd_connection,
+                                    void **unused, enum MHD_RequestTerminationCode toe)
+{
+  const MHD_ConnectionInfo* mhdc = MHD_get_connection_info(mhd_connection, MHD_CONNECTION_INFO_SOCKET_CONTEXT);
+  HTTPDClient* httpdclient = (HTTPDClient*)mhdc->socket_context;
+  if (!httpdclient) return;
+  httpdclient->requestComplete();
+}
+
+void HTTPDClient::connection_notify(void *cls, struct MHD_Connection* mhd_connection,
+                                    void **socket_context, enum MHD_ConnectionNotificationCode toe)
+{
+  if (toe == MHD_CONNECTION_NOTIFY_STARTED)
+  {
+    *socket_context = (void*)new HTTPDClient(mhd_connection);
+  }
+  else if (toe == MHD_CONNECTION_NOTIFY_CLOSED)
+  {
+    HTTPDClient* httpdclient = (HTTPDClient*)*socket_context;
+    if (!httpdclient) return;
+    delete httpdclient;
+    *socket_context = NULL;
+  }
+}
+
+int HTTPDClient::handle_connection(void* cls, struct MHD_Connection* mhd_connection,
+                                   const char* url, const char* method,
+                                   const char* version, const char* upload_data,
+                                   size_t* upload_data_size, void** userData)
+{
+/*
+  printf("handle_connection called\n");
+  printf("hc: cls %p\n", cls);
+  printf("hc: mhd_connection %p\n", mhd_connection);
+  printf("hc: url %p\n", url);
+  if (url) printf("hc: url: %s\n", url);
+  printf("hc: method %p\n", method);
+  if (url) printf("hc: method: %s\n",  method);
+  printf("hc: version %p\n", version);
+  if (url) printf("hc: version: %s\n",  version);
+  printf("hc: upload_data %p\n", upload_data);
+  printf("hc: upload_data_size %lu\n", *upload_data_size);
+  printf("hc: userData %p\n", *userData);
+*/
+
+  const MHD_ConnectionInfo* mhdc = MHD_get_connection_info(mhd_connection, MHD_CONNECTION_INFO_SOCKET_CONTEXT);
+
+  HTTPDClient* httpdclient = (HTTPDClient*)mhdc->socket_context;
+
+  // Now we are going to use userData as a flag to say first run or not
+
+  if (!*userData) // new request
+  {
+    *userData = (void*)1;
+    httpdclient->setUrl(url);
+
+    if (!strcmp(method, "POST"))
+    {
+      MHD_get_connection_values(mhd_connection, MHD_GET_ARGUMENT_KIND, HTTPDClient::uri_key_value, (void*)httpdclient);
+
+      // The following returns NULL if there are no POST fields to come
+      httpdclient->postprocessor = MHD_create_post_processor(mhd_connection, POSTBUFFERSIZE,
+                                                            HTTPDClient::iterate_post, (void*)httpdclient);
+    }
+    else if (!strcmp(method, "GET"))
+    {
+      // OK, nothing else to do here
+    }
+    else
+    {
+      return MHD_NO;
+    }
+
+    return MHD_YES;
+  }
+
+  // Not first go at this request
+
+  if (!strcmp(method, "GET"))
+  {
+    return httpdclient->processGET();
+  }
+  else if (!strcmp(method, "POST"))
+  {
+    // HC will be called at least three times. Once above to create the HTTPDClient object (above).
+    // Here the middle calls will be called with upload_data_size > 0
+    // The last call is with upload_data_size == 0 and signals the end, a response must be queued
+
+    if (*upload_data_size != 0) // There is more to process, and signal run again
+    {
+      MHD_post_process(httpdclient->postprocessor, upload_data, *upload_data_size);
+      *upload_data_size = 0;
+      return MHD_YES;
+    }
+    else
+    {
+//      printf("hc: zero post provided, end of upload\n");
+      return httpdclient->processPOST();
+    }
+  }
+  else
+  {
+    return httpdclient->sendStockResponse(405);
+  }
+}
+
+// End of static callbacks, now for the client object itself
+
+HTTPDClient::HTTPDClient(struct MHD_Connection* _mhd_connection)
+: postprocessor(NULL), url(NULL), mhd_connection(_mhd_connection)
+{
+//  printf("HTTPDClient created %p\n", this);
+}
+
+HTTPDClient::~HTTPDClient()
+{
+//  printf("%p HTTPDClient destructor\n", this);
+  if (url) free(url);
+}
+
+void HTTPDClient::requestComplete()
+{
+//  printf("%p HTTPDClient request complete\n", this);
+  if (postprocessor)
+  {
+//    printf("here\n");
+    MHD_destroy_post_processor(postprocessor);
+    postprocessor = NULL;
+  }
+}
+
+void HTTPDClient::setUrl(const char* _url)
+{
+  int size __attribute__((unused)) = asprintf(&url, "%s", _url);
+}
+
+void HTTPDClient::addGetVar(const char* key, const char* value)
+{
+  if (strlen(key) > 50) return;
+  if (value && (strlen(value) > 1000)) return;
+
+  getVars[std::string(key)] = std::string(value);
+/*
+  for(auto gv : getVars)
+  {
+    printf("%s %s\n", gv.first.c_str(), gv.second.c_str());
+  }
+  */
+}
+
+void HTTPDClient::addPostField(const char* key, const char* value, int valueLength)
+{
+  if (strlen(key) > 50) return;
+  if (strlen(value) > 1000) return;
+
+  postFields[std::string(key)] = std::string(value, valueLength);
+
+  /*
+  for(auto pf : postFields)
+  {
+    printf("%s %s\n", pf.first.c_str(), pf.second.c_str());
+  }
+  */
+}
+
+int HTTPDClient::processGET()
+{
+  const char* defaultfilename = "index.html";
+
+  if (url == NULL) return MHD_NO;
+  if (strstr(url, "..")) return MHD_NO; // MHD deals with these already and limits it. If it occurs here, error.
+
+  int size  __attribute__((unused));
+
+  int slen = strlen(url);
+  char* fullpath;
+  if (url[slen-1] == '/')
+    size = asprintf(&fullpath, "%s%s%s", docRoot.c_str(), url, defaultfilename);
+  else
+    size = asprintf(&fullpath, "%s%s", docRoot.c_str(), url);
+
+  //printf("FILENAME: '%s'\n", fullpath);
+
+  struct stat sbuf;
+  if (   (stat(fullpath, &sbuf) == -1)               // failed to stat
+      || ((sbuf.st_mode & S_IFMT) != S_IFREG)  )     // must be regular file
+  {
+    free(fullpath);
+    return sendStockResponse(404);
+  }
+
+  int fd = open(fullpath, O_RDONLY);
+  free(fullpath);
+
+  if (fd == -1) return MHD_NO;
+
+  struct MHD_Response* response = MHD_create_response_from_fd(sbuf.st_size, fd);
+  int ret = MHD_queue_response(mhd_connection, MHD_HTTP_OK, response);
+  MHD_destroy_response(response);
+
+  return ret;
+}
+
+int HTTPDClient::processPOST()
+{
+ // printf("Process POST:\n");
+  //printf("REQ: %s\n", getVars["req"].c_str());
+
+  if (strcmp(url, "/jsonserver")) return sendStockResponse(404);
+  if (getVars["req"].empty()) return sendStockResponse(400);
+
+  std::string returnData;
+
+  bool success = vdrclient.process(getVars["req"], postFields, returnData);
+  if (!success) return sendStockResponse(500);
+
+  struct MHD_Response* response = MHD_create_response_from_buffer(strlen(returnData.c_str()), (void *)returnData.c_str(), MHD_RESPMEM_MUST_COPY);
+  int ret = MHD_queue_response(mhd_connection, MHD_HTTP_OK, response);
+  MHD_destroy_response(response);
+  return ret;
+}
+
+int HTTPDClient::sendStockResponse(int code)
+{
+  const char *page400 = "<html><body>Bad request</body></html>\n";
+  const char *page404 = "<html><body>File not found</body></html>\n";
+  const char *page405 = "<html><body>Method not allowed</body></html>\n";
+  const char *page500 = "<html><body>Internal server error</body></html>\n";
+  const char* page;
+  if      (code == 400) page = page400;
+  else if (code == 404) page = page404;
+  else if (code == 405) page = page405;
+  else if (code == 500) page = page500;
+  else return MHD_NO;
+
+  struct MHD_Response* response = MHD_create_response_from_buffer(strlen(page), (void *)page, MHD_RESPMEM_PERSISTENT);
+  int ret = MHD_queue_response(mhd_connection, code, response);
+  MHD_destroy_response(response);
+  return ret;
+}
diff --git a/httpdclient.h b/httpdclient.h
new file mode 100644
index 0000000..d161188
--- /dev/null
+++ b/httpdclient.h
@@ -0,0 +1,65 @@
+#ifndef HTTPDCLIENT_H
+#define HTTPDCLIENT_H
+
+// Libmicrohttpd: https://www.gnu.org/software/libmicrohttpd/
+#include <sys/types.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <microhttpd.h>
+
+#include <string>
+#include <map>
+
+// Log docs: https://github.com/gabime/spdlog
+#include <spdlog/spdlog.h>
+namespace spd = spdlog;
+
+#include "vdrclient.h"
+
+class HTTPDClient
+{
+  public:
+    static bool StartServer(std::string docRoot, int port);
+    static void StopServer();
+
+    // static callbacks from libmicrohttpd
+    static int uri_key_value(void *cls, enum MHD_ValueKind kind, const char* key, const char* value);
+    static int iterate_post(void *clientIdentifier, enum MHD_ValueKind kind, const char *key,
+              const char *filename, const char* content_type,
+              const char *transfer_encoding, const char *data, uint64_t off, size_t size);
+    static void request_completed(void *cls, struct MHD_Connection *mhd_connection,
+                              void **unused, enum MHD_RequestTerminationCode toe);
+    static void connection_notify(void *cls, struct MHD_Connection* mhd_connection,
+                       void **socket_context, enum MHD_ConnectionNotificationCode toe);
+    static int handle_connection(void *cls, struct MHD_Connection *connection,
+                                 const char *url, const char *method,
+                                 const char *version, const char *upload_data,
+                                 size_t *upload_data_size, void **con_cls);
+
+  private:
+    static std::shared_ptr<spd::logger> logger;
+    static struct MHD_Daemon* httpdserver;
+    static std::string docRoot;
+
+    HTTPDClient(struct MHD_Connection*);
+    ~HTTPDClient();
+
+    void setUrl(const char* url);
+    int processGET();
+    int processPOST();
+
+    std::map<std::string, std::string> getVars;
+    std::map<std::string, std::string> postFields;
+    struct MHD_PostProcessor* postprocessor;
+    char* url;
+    struct MHD_Connection* mhd_connection;
+
+    VDRClient vdrclient;
+
+    void addGetVar(const char* key, const char* value);
+    void addPostField(const char* key, const char* value, int valueLength);
+    void requestComplete();
+    int sendStockResponse(int code);
+};
+
+#endif
diff --git a/jsonserver.c b/jsonserver.c
index caa08b9..ac50fa7 100644
--- a/jsonserver.c
+++ b/jsonserver.c
@@ -17,13 +17,17 @@ critical
 */
 
 #include <vdr/plugin.h>
+
+#if APIVERSNUM < 20102
+#error jsonserver plugin requires VDR API version > 20101
+#endif
+
 #include <stdio.h>
 
 // Config docs: http://www.hyperrealm.com/libconfig/libconfig_manual.html#The-C_002b_002b-API
 #include <libconfig.h++>
 
-#include "mongoose.h"
-#include "handler.h"
+#include "httpdclient.h"
 
 static const char *VERSION        = "0.0.1";
 static const char *DESCRIPTION    = "JSON data server plugin for VDR";
@@ -32,10 +36,8 @@ static const char *MAINMENUENTRY  = "Jsonserver";
 class cPluginJsonserver : public cPlugin {
 private:
   // Add any member variables or functions you may need here.
-  struct mg_context *mg;
   std::shared_ptr<spd::logger> logger;
   libconfig::Config config;
-  bool mgRunning;
 public:
   cPluginJsonserver(void);
   virtual ~cPluginJsonserver();
@@ -64,8 +66,6 @@ cPluginJsonserver::cPluginJsonserver(void)
   // Initialize any member variables here.
   // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
   // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
-
-  mgRunning = false;
 }
 
 cPluginJsonserver::~cPluginJsonserver()
@@ -151,7 +151,7 @@ bool cPluginJsonserver::Start(void)
     return false;
   }
 
-  std::string cfgPort;
+  int cfgPort;
   if (!config.lookupValue("http-port", cfgPort))
   {
     logger->critical("Main: Failed to load http-port from config");
@@ -160,41 +160,21 @@ bool cPluginJsonserver::Start(void)
     return false;
   }
 
-  std::string cfgSSLFilename;
-  if (!config.lookupValue("ssl-pem-file", cfgSSLFilename))
+  if (!HTTPDClient::StartServer(cfgDocRoot, cfgPort))
   {
-    logger->critical("Main: Failed to load ssl-pem-file from config");
-    dsyslog("jsonserver: Could not load ssl-pem-file from plugin config file");
+    logger->critical("Main: Failed to start MHD");
+    dsyslog("jsonserver: Failed to start MHD");
     logger.reset();
     return false;
   }
 
-  // Make Mongoose options
-  const char *options[] =
-  {
-    "document_root", cfgDocRoot.c_str(),
-    "listening_ports", cfgPort.c_str(),
-    "num_threads", "5",
-    "ssl_certificate", cfgSSLFilename.c_str(),
-    NULL
-  };
-
-  // Prepare callbacks structure. We have only one callback, the rest are NULL.
-  struct mg_callbacks callbacks;
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.begin_request = jsonserver_request_handler;
-  
-  mg = mg_start(&callbacks, NULL, options);
-  logger->info("Main: Mongoose started");
-  mgRunning = true;
   return true;
 }
 
 void cPluginJsonserver::Stop(void)
 {
   // Stop any background activities the plugin is performing.
-  if (mgRunning) mg_stop(mg);
-  mgRunning = false;
+  HTTPDClient::StopServer();
 }
 
 void cPluginJsonserver::Housekeeping(void)
diff --git a/jsonserver.conf.sample b/jsonserver.conf.sample
index fa95733..63c411c 100644
--- a/jsonserver.conf.sample
+++ b/jsonserver.conf.sample
@@ -1,4 +1,3 @@
 log-file = "/home/chris/dvb/vdrweb/jsonserver.log";
 doc-root = "/home/chris/dvb/vdrweb/html";
-ssl-pem-file = "/home/chris/dvb/vdrweb/sslcert.pem";
-http-port = "8005";
+http-port = 8005;
diff --git a/mongoose.c b/mongoose.c
deleted file mode 100644
index 6fc3d17..0000000
--- a/mongoose.c
+++ /dev/null
@@ -1,5180 +0,0 @@
-// Copyright (c) 2004-2013 Sergey Lyubka
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#if defined(_WIN32)
-#define _CRT_SECURE_NO_WARNINGS // Disable deprecation warning in VS2005
-#else
-#ifdef __linux__
-#define _XOPEN_SOURCE 600     // For flockfile() on Linux
-#endif
-//#define _LARGEFILE_SOURCE     // Enable 64-bit file offsets
-#define __STDC_FORMAT_MACROS  // <inttypes.h> wants this for C++
-#define __STDC_LIMIT_MACROS   // C++ wants that for INT64_MAX
-#endif
-
-#if defined (_MSC_VER)
-// conditional expression is constant: introduced by FD_SET(..)
-#pragma warning (disable : 4127)
-// non-constant aggregate initializer: issued due to missing C99 support
-#pragma warning (disable : 4204)
-#endif
-
-// Disable WIN32_LEAN_AND_MEAN.
-// This makes windows.h always include winsock2.h
-#ifdef WIN32_LEAN_AND_MEAN
-#undef WIN32_LEAN_AND_MEAN
-#endif
-
-#if defined(__SYMBIAN32__)
-#define NO_SSL // SSL is not supported
-#define NO_CGI // CGI is not supported
-#define PATH_MAX FILENAME_MAX
-#endif // __SYMBIAN32__
-
-#ifndef _WIN32_WCE // Some ANSI #includes are not available on Windows CE
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <signal.h>
-#include <fcntl.h>
-#endif // !_WIN32_WCE
-
-#include <time.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdio.h>
-
-#if defined(_WIN32) && !defined(__SYMBIAN32__) // Windows specific
-#define _WIN32_WINNT 0x0400 // To make it link in VS2005
-#include <windows.h>
-
-#ifndef PATH_MAX
-#define PATH_MAX MAX_PATH
-#endif
-
-#ifndef _WIN32_WCE
-#include <process.h>
-#include <direct.h>
-#include <io.h>
-#else // _WIN32_WCE
-#define NO_CGI // WinCE has no pipes
-
-typedef long off_t;
-
-#define errno   GetLastError()
-#define strerror(x)  _ultoa(x, (char *) _alloca(sizeof(x) *3 ), 10)
-#endif // _WIN32_WCE
-
-#define MAKEUQUAD(lo, hi) ((uint64_t)(((uint32_t)(lo)) | \
-      ((uint64_t)((uint32_t)(hi))) << 32))
-#define RATE_DIFF 10000000 // 100 nsecs
-#define EPOCH_DIFF MAKEUQUAD(0xd53e8000, 0x019db1de)
-#define SYS2UNIX_TIME(lo, hi) \
-  (time_t) ((MAKEUQUAD((lo), (hi)) - EPOCH_DIFF) / RATE_DIFF)
-
-// Visual Studio 6 does not know __func__ or __FUNCTION__
-// The rest of MS compilers use __FUNCTION__, not C99 __func__
-// Also use _strtoui64 on modern M$ compilers
-#if defined(_MSC_VER) && _MSC_VER < 1300
-#define STRX(x) #x
-#define STR(x) STRX(x)
-#define __func__ __FILE__ ":" STR(__LINE__)
-#define strtoull(x, y, z) strtoul(x, y, z)
-#define strtoll(x, y, z) strtol(x, y, z)
-#else
-#define __func__  __FUNCTION__
-#define strtoull(x, y, z) _strtoui64(x, y, z)
-#define strtoll(x, y, z) _strtoi64(x, y, z)
-#endif // _MSC_VER
-
-#define ERRNO   GetLastError()
-#define NO_SOCKLEN_T
-#define SSL_LIB   "ssleay32.dll"
-#define CRYPTO_LIB  "libeay32.dll"
-#define O_NONBLOCK  0
-#if !defined(EWOULDBLOCK)
-#define EWOULDBLOCK  WSAEWOULDBLOCK
-#endif // !EWOULDBLOCK
-#define _POSIX_
-#define INT64_FMT  "I64d"
-
-#define WINCDECL __cdecl
-#define SHUT_WR 1
-#define snprintf _snprintf
-#define vsnprintf _vsnprintf
-#define mg_sleep(x) Sleep(x)
-
-#define pipe(x) _pipe(x, MG_BUF_LEN, _O_BINARY)
-#define popen(x, y) _popen(x, y)
-#define pclose(x) _pclose(x)
-#define close(x) _close(x)
-#define dlsym(x,y) GetProcAddress((HINSTANCE) (x), (y))
-#define RTLD_LAZY  0
-#define fseeko(x, y, z) _lseeki64(_fileno(x), (y), (z))
-#define fdopen(x, y) _fdopen((x), (y))
-#define write(x, y, z) _write((x), (y), (unsigned) z)
-#define read(x, y, z) _read((x), (y), (unsigned) z)
-#define flockfile(x) EnterCriticalSection(&global_log_file_lock)
-#define funlockfile(x) LeaveCriticalSection(&global_log_file_lock)
-#define sleep(x) Sleep((x) * 1000)
-#define va_copy(x, y) x = y
-
-#if !defined(fileno)
-#define fileno(x) _fileno(x)
-#endif // !fileno MINGW #defines fileno
-
-typedef HANDLE pthread_mutex_t;
-typedef struct {HANDLE signal, broadcast;} pthread_cond_t;
-typedef DWORD pthread_t;
-#define pid_t HANDLE // MINGW typedefs pid_t to int. Using #define here.
-
-static int pthread_mutex_lock(pthread_mutex_t *);
-static int pthread_mutex_unlock(pthread_mutex_t *);
-static void to_unicode(const char *path, wchar_t *wbuf, size_t wbuf_len);
-struct file;
-static char *mg_fgets(char *buf, size_t size, struct file *filep, char **p);
-
-#if defined(HAVE_STDINT)
-#include <stdint.h>
-#else
-typedef unsigned int  uint32_t;
-typedef unsigned short  uint16_t;
-typedef unsigned __int64 uint64_t;
-typedef __int64   int64_t;
-#define INT64_MAX  9223372036854775807
-#endif // HAVE_STDINT
-
-// POSIX dirent interface
-struct dirent {
-  char d_name[PATH_MAX];
-};
-
-typedef struct DIR {
-  HANDLE   handle;
-  WIN32_FIND_DATAW info;
-  struct dirent  result;
-} DIR;
-
-#ifndef HAS_POLL
-struct pollfd {
-  int fd;
-  short events;
-  short revents;
-};
-#define POLLIN 1
-#endif
-
-
-// Mark required libraries
-#pragma comment(lib, "Ws2_32.lib")
-
-#else    // UNIX  specific
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/poll.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <netdb.h>
-
-#include <pwd.h>
-#include <unistd.h>
-#include <dirent.h>
-#if !defined(NO_SSL_DL) && !defined(NO_SSL)
-#include <dlfcn.h>
-#endif
-#include <pthread.h>
-#if defined(__MACH__)
-#define SSL_LIB   "libssl.dylib"
-#define CRYPTO_LIB  "libcrypto.dylib"
-#else
-#if !defined(SSL_LIB)
-#define SSL_LIB   "libssl.so"
-#endif
-#if !defined(CRYPTO_LIB)
-#define CRYPTO_LIB  "libcrypto.so"
-#endif
-#endif
-#ifndef O_BINARY
-#define O_BINARY  0
-#endif // O_BINARY
-#define closesocket(a) close(a)
-#define mg_mkdir(x, y) mkdir(x, y)
-#define mg_remove(x) remove(x)
-#define mg_rename(x, y) rename(x, y)
-#define mg_sleep(x) usleep((x) * 1000)
-#define ERRNO errno
-#define INVALID_SOCKET (-1)
-#define INT64_FMT PRId64
-typedef int SOCKET;
-#define WINCDECL
-
-#endif // End of Windows and UNIX specific includes
-
-#include "mongoose.h"
-
-#ifdef USE_LUA
-#include <lua.h>
-#include <lauxlib.h>
-#endif
-
-#define MONGOOSE_VERSION "3.7"
-#define PASSWORDS_FILE_NAME ".htpasswd"
-#define CGI_ENVIRONMENT_SIZE 4096
-#define MAX_CGI_ENVIR_VARS 64
-#define MG_BUF_LEN 8192
-#define MAX_REQUEST_SIZE 16384
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
-
-#ifdef _WIN32
-static CRITICAL_SECTION global_log_file_lock;
-static pthread_t pthread_self(void) {
-  return GetCurrentThreadId();
-}
-#endif // _WIN32
-
-#ifdef DEBUG_TRACE
-#undef DEBUG_TRACE
-#define DEBUG_TRACE(x)
-#else
-#if defined(DEBUG)
-#define DEBUG_TRACE(x) do { \
-  flockfile(stdout); \
-  printf("*** %lu.%p.%s.%d: ", \
-         (unsigned long) time(NULL), (void *) pthread_self(), \
-         __func__, __LINE__); \
-  printf x; \
-  putchar('\n'); \
-  fflush(stdout); \
-  funlockfile(stdout); \
-} while (0)
-#else
-#define DEBUG_TRACE(x)
-#endif // DEBUG
-#endif // DEBUG_TRACE
-
-// Darwin prior to 7.0 and Win32 do not have socklen_t
-#ifdef NO_SOCKLEN_T
-typedef int socklen_t;
-#endif // NO_SOCKLEN_T
-#define _DARWIN_UNLIMITED_SELECT
-
-#if !defined(MSG_NOSIGNAL)
-#define MSG_NOSIGNAL 0
-#endif
-
-#if !defined(SOMAXCONN)
-#define SOMAXCONN 100
-#endif
-
-#if !defined(PATH_MAX)
-#define PATH_MAX 4096
-#endif
-
-static const char *http_500_error = "Internal Server Error";
-
-#if defined(NO_SSL_DL)
-#include <openssl/ssl.h>
-#else
-// SSL loaded dynamically from DLL.
-// I put the prototypes here to be independent from OpenSSL source installation.
-typedef struct ssl_st SSL;
-typedef struct ssl_method_st SSL_METHOD;
-typedef struct ssl_ctx_st SSL_CTX;
-
-struct ssl_func {
-  const char *name;   // SSL function name
-  void  (*ptr)(void); // Function pointer
-};
-
-#define SSL_free (* (void (*)(SSL *)) ssl_sw[0].ptr)
-#define SSL_accept (* (int (*)(SSL *)) ssl_sw[1].ptr)
-#define SSL_connect (* (int (*)(SSL *)) ssl_sw[2].ptr)
-#define SSL_read (* (int (*)(SSL *, void *, int)) ssl_sw[3].ptr)
-#define SSL_write (* (int (*)(SSL *, const void *,int)) ssl_sw[4].ptr)
-#define SSL_get_error (* (int (*)(SSL *, int)) ssl_sw[5].ptr)
-#define SSL_set_fd (* (int (*)(SSL *, SOCKET)) ssl_sw[6].ptr)
-#define SSL_new (* (SSL * (*)(SSL_CTX *)) ssl_sw[7].ptr)
-#define SSL_CTX_new (* (SSL_CTX * (*)(SSL_METHOD *)) ssl_sw[8].ptr)
-#define SSLv23_server_method (* (SSL_METHOD * (*)(void)) ssl_sw[9].ptr)
-#define SSL_library_init (* (int (*)(void)) ssl_sw[10].ptr)
-#define SSL_CTX_use_PrivateKey_file (* (int (*)(SSL_CTX *, \
-        const char *, int)) ssl_sw[11].ptr)
-#define SSL_CTX_use_certificate_file (* (int (*)(SSL_CTX *, \
-        const char *, int)) ssl_sw[12].ptr)
-#define SSL_CTX_set_default_passwd_cb \
-  (* (void (*)(SSL_CTX *, mg_callback_t)) ssl_sw[13].ptr)
-#define SSL_CTX_free (* (void (*)(SSL_CTX *)) ssl_sw[14].ptr)
-#define SSL_load_error_strings (* (void (*)(void)) ssl_sw[15].ptr)
-#define SSL_CTX_use_certificate_chain_file \
-  (* (int (*)(SSL_CTX *, const char *)) ssl_sw[16].ptr)
-#define SSLv23_client_method (* (SSL_METHOD * (*)(void)) ssl_sw[17].ptr)
-#define SSL_pending (* (int (*)(SSL *)) ssl_sw[18].ptr)
-#define SSL_CTX_set_verify (* (void (*)(SSL_CTX *, int, int)) ssl_sw[19].ptr)
-
-#define CRYPTO_num_locks (* (int (*)(void)) crypto_sw[0].ptr)
-#define CRYPTO_set_locking_callback \
-  (* (void (*)(void (*)(int, int, const char *, int))) crypto_sw[1].ptr)
-#define CRYPTO_set_id_callback \
-  (* (void (*)(unsigned long (*)(void))) crypto_sw[2].ptr)
-#define ERR_get_error (* (unsigned long (*)(void)) crypto_sw[3].ptr)
-#define ERR_error_string (* (char * (*)(unsigned long,char *)) crypto_sw[4].ptr)
-
-// set_ssl_option() function updates this array.
-// It loads SSL library dynamically and changes NULLs to the actual addresses
-// of respective functions. The macros above (like SSL_connect()) are really
-// just calling these functions indirectly via the pointer.
-static struct ssl_func ssl_sw[] = {
-  {"SSL_free",   NULL},
-  {"SSL_accept",   NULL},
-  {"SSL_connect",   NULL},
-  {"SSL_read",   NULL},
-  {"SSL_write",   NULL},
-  {"SSL_get_error",  NULL},
-  {"SSL_set_fd",   NULL},
-  {"SSL_new",   NULL},
-  {"SSL_CTX_new",   NULL},
-  {"SSLv23_server_method", NULL},
-  {"SSL_library_init",  NULL},
-  {"SSL_CTX_use_PrivateKey_file", NULL},
-  {"SSL_CTX_use_certificate_file",NULL},
-  {"SSL_CTX_set_default_passwd_cb",NULL},
-  {"SSL_CTX_free",  NULL},
-  {"SSL_load_error_strings", NULL},
-  {"SSL_CTX_use_certificate_chain_file", NULL},
-  {"SSLv23_client_method", NULL},
-  {"SSL_pending", NULL},
-  {"SSL_CTX_set_verify", NULL},
-  {NULL,    NULL}
-};
-
-// Similar array as ssl_sw. These functions could be located in different lib.
-#if !defined(NO_SSL)
-static struct ssl_func crypto_sw[] = {
-  {"CRYPTO_num_locks",  NULL},
-  {"CRYPTO_set_locking_callback", NULL},
-  {"CRYPTO_set_id_callback", NULL},
-  {"ERR_get_error",  NULL},
-  {"ERR_error_string", NULL},
-  {NULL,    NULL}
-};
-#endif // NO_SSL
-#endif // NO_SSL_DL
-
-static const char *month_names[] = {
-  "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-  "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-// Unified socket address. For IPv6 support, add IPv6 address structure
-// in the union u.
-union usa {
-  struct sockaddr sa;
-  struct sockaddr_in sin;
-#if defined(USE_IPV6)
-  struct sockaddr_in6 sin6;
-#endif
-};
-
-// Describes a string (chunk of memory).
-struct vec {
-  const char *ptr;
-  size_t len;
-};
-
-struct file {
-  int is_directory;
-  time_t modification_time;
-  int64_t size;
-  FILE *fp;
-  const char *membuf;   // Non-NULL if file data is in memory
-};
-#define STRUCT_FILE_INITIALIZER {0, 0, 0, NULL, NULL}
-
-// Describes listening socket, or socket which was accept()-ed by the master
-// thread and queued for future handling by the worker thread.
-struct socket {
-  SOCKET sock;          // Listening socket
-  union usa lsa;        // Local socket address
-  union usa rsa;        // Remote socket address
-  unsigned is_ssl:1;    // Is port SSL-ed
-  unsigned ssl_redir:1; // Is port supposed to redirect everything to SSL port
-};
-
-// NOTE(lsm): this enum shoulds be in sync with the config_options below.
-enum {
-  CGI_EXTENSIONS, CGI_ENVIRONMENT, PUT_DELETE_PASSWORDS_FILE, CGI_INTERPRETER,
-  PROTECT_URI, AUTHENTICATION_DOMAIN, SSI_EXTENSIONS, THROTTLE,
-  ACCESS_LOG_FILE, ENABLE_DIRECTORY_LISTING, ERROR_LOG_FILE,
-  GLOBAL_PASSWORDS_FILE, INDEX_FILES, ENABLE_KEEP_ALIVE, ACCESS_CONTROL_LIST,
-  EXTRA_MIME_TYPES, LISTENING_PORTS, DOCUMENT_ROOT, SSL_CERTIFICATE,
-  NUM_THREADS, RUN_AS_USER, REWRITE, HIDE_FILES, REQUEST_TIMEOUT,
-  NUM_OPTIONS
-};
-
-static const char *config_options[] = {
-  "C", "cgi_pattern", "**.cgi$|**.pl$|**.php$",
-  "E", "cgi_environment", NULL,
-  "G", "put_delete_auth_file", NULL,
-  "I", "cgi_interpreter", NULL,
-  "P", "protect_uri", NULL,
-  "R", "authentication_domain", "mydomain.com",
-  "S", "ssi_pattern", "**.shtml$|**.shtm$",
-  "T", "throttle", NULL,
-  "a", "access_log_file", NULL,
-  "d", "enable_directory_listing", "yes",
-  "e", "error_log_file", NULL,
-  "g", "global_auth_file", NULL,
-  "i", "index_files", "index.html,index.htm,index.cgi,index.shtml,index.php",
-  "k", "enable_keep_alive", "no",
-  "l", "access_control_list", NULL,
-  "m", "extra_mime_types", NULL,
-  "p", "listening_ports", "8080",
-  "r", "document_root",  ".",
-  "s", "ssl_certificate", NULL,
-  "t", "num_threads", "20",
-  "u", "run_as_user", NULL,
-  "w", "url_rewrite_patterns", NULL,
-  "x", "hide_files_patterns", NULL,
-  "z", "request_timeout_ms", "30000",
-  NULL
-};
-#define ENTRIES_PER_CONFIG_OPTION 3
-
-struct mg_context {
-  volatile int stop_flag;         // Should we stop event loop
-  SSL_CTX *ssl_ctx;               // SSL context
-  char *config[NUM_OPTIONS];      // Mongoose configuration parameters
-  struct mg_callbacks callbacks;  // User-defined callback function
-  void *user_data;                // User-defined data
-
-  struct socket *listening_sockets;
-  int num_listening_sockets;
-
-  volatile int num_threads;  // Number of threads
-  pthread_mutex_t mutex;     // Protects (max|num)_threads
-  pthread_cond_t  cond;      // Condvar for tracking workers terminations
-
-  struct socket queue[20];   // Accepted sockets
-  volatile int sq_head;      // Head of the socket queue
-  volatile int sq_tail;      // Tail of the socket queue
-  pthread_cond_t sq_full;    // Signaled when socket is produced
-  pthread_cond_t sq_empty;   // Signaled when socket is consumed
-};
-
-struct mg_connection {
-  struct mg_request_info request_info;
-  struct mg_context *ctx;
-  SSL *ssl;                   // SSL descriptor
-  SSL_CTX *client_ssl_ctx;    // SSL context for client connections
-  struct socket client;       // Connected client
-  time_t birth_time;          // Time when request was received
-  int64_t num_bytes_sent;     // Total bytes sent to client
-  int64_t content_len;        // Content-Length header value
-  int64_t consumed_content;   // How many bytes of content have been read
-  char *buf;                  // Buffer for received data
-  char *path_info;            // PATH_INFO part of the URL
-  int must_close;             // 1 if connection must be closed
-  int buf_size;               // Buffer size
-  int request_len;            // Size of the request + headers in a buffer
-  int data_len;               // Total size of data in a buffer
-  int status_code;            // HTTP reply status code, e.g. 200
-  int throttle;               // Throttling, bytes/sec. <= 0 means no throttle
-  time_t last_throttle_time;  // Last time throttled data was sent
-  int64_t last_throttle_bytes;// Bytes sent this second
-};
-
-const char **mg_get_valid_option_names(void) {
-  return config_options;
-}
-
-static int is_file_in_memory(struct mg_connection *conn, const char *path,
-                             struct file *filep) {
-  size_t size = 0;
-  if ((filep->membuf = conn->ctx->callbacks.open_file == NULL ? NULL :
-       conn->ctx->callbacks.open_file(conn, path, &size)) != NULL) {
-    // NOTE: override filep->size only on success. Otherwise, it might break
-    // constructs like if (!mg_stat() || !mg_fopen()) ...
-    filep->size = size;
-  }
-  return filep->membuf != NULL;
-}
-
-static int is_file_opened(const struct file *filep) {
-  return filep->membuf != NULL || filep->fp != NULL;
-}
-
-static int mg_fopen(struct mg_connection *conn, const char *path,
-                    const char *mode, struct file *filep) {
-  if (!is_file_in_memory(conn, path, filep)) {
-#ifdef _WIN32
-    wchar_t wbuf[PATH_MAX], wmode[20];
-    to_unicode(path, wbuf, ARRAY_SIZE(wbuf));
-    MultiByteToWideChar(CP_UTF8, 0, mode, -1, wmode, ARRAY_SIZE(wmode));
-    filep->fp = _wfopen(wbuf, wmode);
-#else
-    filep->fp = fopen(path, mode);
-#endif
-  }
-
-  return is_file_opened(filep);
-}
-
-static void mg_fclose(struct file *filep) {
-  if (filep != NULL && filep->fp != NULL) {
-    fclose(filep->fp);
-  }
-}
-
-static int get_option_index(const char *name) {
-  int i;
-
-  for (i = 0; config_options[i] != NULL; i += ENTRIES_PER_CONFIG_OPTION) {
-    if (strcmp(config_options[i], name) == 0 ||
-        strcmp(config_options[i + 1], name) == 0) {
-      return i / ENTRIES_PER_CONFIG_OPTION;
-    }
-  }
-  return -1;
-}
-
-const char *mg_get_option(const struct mg_context *ctx, const char *name) {
-  int i;
-  if ((i = get_option_index(name)) == -1) {
-    return NULL;
-  } else if (ctx->config[i] == NULL) {
-    return "";
-  } else {
-    return ctx->config[i];
-  }
-}
-
-static void sockaddr_to_string(char *buf, size_t len,
-                                     const union usa *usa) {
-  buf[0] = '\0';
-#if defined(USE_IPV6)
-  inet_ntop(usa->sa.sa_family, usa->sa.sa_family == AF_INET ?
-            (void *) &usa->sin.sin_addr :
-            (void *) &usa->sin6.sin6_addr, buf, len);
-#elif defined(_WIN32)
-  // Only Windoze Vista (and newer) have inet_ntop()
-  strncpy(buf, inet_ntoa(usa->sin.sin_addr), len);
-#else
-  inet_ntop(usa->sa.sa_family, (void *) &usa->sin.sin_addr, buf, len);
-#endif
-}
-
-static void cry(struct mg_connection *conn,
-                PRINTF_FORMAT_STRING(const char *fmt), ...) PRINTF_ARGS(2, 3);
-
-// Print error message to the opened error log stream.
-static void cry(struct mg_connection *conn, const char *fmt, ...) {
-  char buf[MG_BUF_LEN], src_addr[20];
-  va_list ap;
-  FILE *fp;
-  time_t timestamp;
-
-  va_start(ap, fmt);
-  (void) vsnprintf(buf, sizeof(buf), fmt, ap);
-  va_end(ap);
-
-  // Do not lock when getting the callback value, here and below.
-  // I suppose this is fine, since function cannot disappear in the
-  // same way string option can.
-  if (conn->ctx->callbacks.log_message == NULL ||
-      conn->ctx->callbacks.log_message(conn, buf) == 0) {
-    fp = conn->ctx == NULL || conn->ctx->config[ERROR_LOG_FILE] == NULL ? NULL :
-      fopen(conn->ctx->config[ERROR_LOG_FILE], "a+");
-
-    if (fp != NULL) {
-      flockfile(fp);
-      timestamp = time(NULL);
-
-      sockaddr_to_string(src_addr, sizeof(src_addr), &conn->client.rsa);
-      fprintf(fp, "[%010lu] [error] [client %s] ", (unsigned long) timestamp,
-              src_addr);
-
-      if (conn->request_info.request_method != NULL) {
-        fprintf(fp, "%s %s: ", conn->request_info.request_method,
-                conn->request_info.uri);
-      }
-
-      fprintf(fp, "%s", buf);
-      fputc('\n', fp);
-      funlockfile(fp);
-      fclose(fp);
-    }
-  }
-}
-
-// Return fake connection structure. Used for logging, if connection
-// is not applicable at the moment of logging.
-static struct mg_connection *fc(struct mg_context *ctx) {
-  static struct mg_connection fake_connection;
-  fake_connection.ctx = ctx;
-  return &fake_connection;
-}
-
-const char *mg_version(void) {
-  return MONGOOSE_VERSION;
-}
-
-struct mg_request_info *mg_get_request_info(struct mg_connection *conn) {
-  return &conn->request_info;
-}
-
-static void mg_strlcpy(register char *dst, register const char *src, size_t n) {
-  for (; *src != '\0' && n > 1; n--) {
-    *dst++ = *src++;
-  }
-  *dst = '\0';
-}
-
-static int lowercase(const char *s) {
-  return tolower(* (const unsigned char *) s);
-}
-
-static int mg_strncasecmp(const char *s1, const char *s2, size_t len) {
-  int diff = 0;
-
-  if (len > 0)
-    do {
-      diff = lowercase(s1++) - lowercase(s2++);
-    } while (diff == 0 && s1[-1] != '\0' && --len > 0);
-
-  return diff;
-}
-
-static int mg_strcasecmp(const char *s1, const char *s2) {
-  int diff;
-
-  do {
-    diff = lowercase(s1++) - lowercase(s2++);
-  } while (diff == 0 && s1[-1] != '\0');
-
-  return diff;
-}
-
-static char * mg_strndup(const char *ptr, size_t len) {
-  char *p;
-
-  if ((p = (char *) malloc(len + 1)) != NULL) {
-    mg_strlcpy(p, ptr, len + 1);
-  }
-
-  return p;
-}
-
-static char * mg_strdup(const char *str) {
-  return mg_strndup(str, strlen(str));
-}
-
-// Like snprintf(), but never returns negative value, or a value
-// that is larger than a supplied buffer.
-// Thanks to Adam Zeldis to pointing snprintf()-caused vulnerability
-// in his audit report.
-static int mg_vsnprintf(struct mg_connection *conn, char *buf, size_t buflen,
-                        const char *fmt, va_list ap) {
-  int n;
-
-  if (buflen == 0)
-    return 0;
-
-  n = vsnprintf(buf, buflen, fmt, ap);
-
-  if (n < 0) {
-    cry(conn, "vsnprintf error");
-    n = 0;
-  } else if (n >= (int) buflen) {
-    cry(conn, "truncating vsnprintf buffer: [%.*s]",
-        n > 200 ? 200 : n, buf);
-    n = (int) buflen - 1;
-  }
-  buf[n] = '\0';
-
-  return n;
-}
-
-static int mg_snprintf(struct mg_connection *conn, char *buf, size_t buflen,
-                       PRINTF_FORMAT_STRING(const char *fmt), ...)
-  PRINTF_ARGS(4, 5);
-
-static int mg_snprintf(struct mg_connection *conn, char *buf, size_t buflen,
-                       const char *fmt, ...) {
-  va_list ap;
-  int n;
-
-  va_start(ap, fmt);
-  n = mg_vsnprintf(conn, buf, buflen, fmt, ap);
-  va_end(ap);
-
-  return n;
-}
-
-// Skip the characters until one of the delimiters characters found.
-// 0-terminate resulting word. Skip the delimiter and following whitespaces.
-// Advance pointer to buffer to the next word. Return found 0-terminated word.
-// Delimiters can be quoted with quotechar.
-static char *skip_quoted(char **buf, const char *delimiters,
-                         const char *whitespace, char quotechar) {
-  char *p, *begin_word, *end_word, *end_whitespace;
-
-  begin_word = *buf;
-  end_word = begin_word + strcspn(begin_word, delimiters);
-
-  // Check for quotechar
-  if (end_word > begin_word) {
-    p = end_word - 1;
-    while (*p == quotechar) {
-      // If there is anything beyond end_word, copy it
-      if (*end_word == '\0') {
-        *p = '\0';
-        break;
-      } else {
-        size_t end_off = strcspn(end_word + 1, delimiters);
-        memmove (p, end_word, end_off + 1);
-        p += end_off; // p must correspond to end_word - 1
-        end_word += end_off + 1;
-      }
-    }
-    for (p++; p < end_word; p++) {
-      *p = '\0';
-    }
-  }
-
-  if (*end_word == '\0') {
-    *buf = end_word;
-  } else {
-    end_whitespace = end_word + 1 + strspn(end_word + 1, whitespace);
-
-    for (p = end_word; p < end_whitespace; p++) {
-      *p = '\0';
-    }
-
-    *buf = end_whitespace;
-  }
-
-  return begin_word;
-}
-
-// Simplified version of skip_quoted without quote char
-// and whitespace == delimiters
-static char *skip(char **buf, const char *delimiters) {
-  return skip_quoted(buf, delimiters, delimiters, 0);
-}
-
-
-// Return HTTP header value, or NULL if not found.
-static const char *get_header(const struct mg_request_info *ri,
-                              const char *name) {
-  int i;
-
-  for (i = 0; i < ri->num_headers; i++)
-    if (!mg_strcasecmp(name, ri->http_headers[i].name))
-      return ri->http_headers[i].value;
-
-  return NULL;
-}
-
-const char *mg_get_header(const struct mg_connection *conn, const char *name) {
-  return get_header(&conn->request_info, name);
-}
-
-// A helper function for traversing a comma separated list of values.
-// It returns a list pointer shifted to the next value, or NULL if the end
-// of the list found.
-// Value is stored in val vector. If value has form "x=y", then eq_val
-// vector is initialized to point to the "y" part, and val vector length
-// is adjusted to point only to "x".
-static const char *next_option(const char *list, struct vec *val,
-                               struct vec *eq_val) {
-  if (list == NULL || *list == '\0') {
-    // End of the list
-    list = NULL;
-  } else {
-    val->ptr = list;
-    if ((list = strchr(val->ptr, ',')) != NULL) {
-      // Comma found. Store length and shift the list ptr
-      val->len = list - val->ptr;
-      list++;
-    } else {
-      // This value is the last one
-      list = val->ptr + strlen(val->ptr);
-      val->len = list - val->ptr;
-    }
-
-    if (eq_val != NULL) {
-      // Value has form "x=y", adjust pointers and lengths
-      // so that val points to "x", and eq_val points to "y".
-      eq_val->len = 0;
-      eq_val->ptr = (const char *) memchr(val->ptr, '=', val->len);
-      if (eq_val->ptr != NULL) {
-        eq_val->ptr++;  // Skip over '=' character
-        eq_val->len = val->ptr + val->len - eq_val->ptr;
-        val->len = (eq_val->ptr - val->ptr) - 1;
-      }
-    }
-  }
-
-  return list;
-}
-
-static int match_prefix(const char *pattern, int pattern_len, const char *str) {
-  const char *or_str;
-  int i, j, len, res;
-
-  if ((or_str = (const char *) memchr(pattern, '|', pattern_len)) != NULL) {
-    res = match_prefix(pattern, or_str - pattern, str);
-    return res > 0 ? res :
-        match_prefix(or_str + 1, (pattern + pattern_len) - (or_str + 1), str);
-  }
-
-  i = j = 0;
-  res = -1;
-  for (; i < pattern_len; i++, j++) {
-    if (pattern[i] == '?' && str[j] != '\0') {
-      continue;
-    } else if (pattern[i] == '$') {
-      return str[j] == '\0' ? j : -1;
-    } else if (pattern[i] == '*') {
-      i++;
-      if (pattern[i] == '*') {
-        i++;
-        len = (int) strlen(str + j);
-      } else {
-        len = (int) strcspn(str + j, "/");
-      }
-      if (i == pattern_len) {
-        return j + len;
-      }
-      do {
-        res = match_prefix(pattern + i, pattern_len - i, str + j + len);
-      } while (res == -1 && len-- > 0);
-      return res == -1 ? -1 : j + res + len;
-    } else if (pattern[i] != str[j]) {
-      return -1;
-    }
-  }
-  return j;
-}
-
-// HTTP 1.1 assumes keep alive if "Connection:" header is not set
-// This function must tolerate situations when connection info is not
-// set up, for example if request parsing failed.
-static int should_keep_alive(const struct mg_connection *conn) {
-  const char *http_version = conn->request_info.http_version;
-  const char *header = mg_get_header(conn, "Connection");
-  if (conn->must_close ||
-      conn->status_code == 401 ||
-      mg_strcasecmp(conn->ctx->config[ENABLE_KEEP_ALIVE], "yes") != 0 ||
-      (header != NULL && mg_strcasecmp(header, "keep-alive") != 0) ||
-      (header == NULL && http_version && strcmp(http_version, "1.1"))) {
-    return 0;
-  }
-  return 1;
-}
-
-static const char *suggest_connection_header(const struct mg_connection *conn) {
-  return should_keep_alive(conn) ? "keep-alive" : "close";
-}
-
-static void send_http_error(struct mg_connection *, int, const char *,
-                            PRINTF_FORMAT_STRING(const char *fmt), ...)
-  PRINTF_ARGS(4, 5);
-
-
-static void send_http_error(struct mg_connection *conn, int status,
-                            const char *reason, const char *fmt, ...) {
-  char buf[MG_BUF_LEN];
-  va_list ap;
-  int len = 0;
-
-  conn->status_code = status;
-  buf[0] = '\0';
-
-  // Errors 1xx, 204 and 304 MUST NOT send a body
-  if (status > 199 && status != 204 && status != 304) {
-    len = mg_snprintf(conn, buf, sizeof(buf), "Error %d: %s", status, reason);
-    buf[len++] = '\n';
-
-    va_start(ap, fmt);
-    len += mg_vsnprintf(conn, buf + len, sizeof(buf) - len, fmt, ap);
-    va_end(ap);
-  }
-  DEBUG_TRACE(("[%s]", buf));
-
-  mg_printf(conn, "HTTP/1.1 %d %s\r\n"
-            "Content-Length: %d\r\n"
-            "Connection: %s\r\n\r\n", status, reason, len,
-            suggest_connection_header(conn));
-  conn->num_bytes_sent += mg_printf(conn, "%s", buf);
-}
-
-#if defined(_WIN32) && !defined(__SYMBIAN32__)
-static int pthread_mutex_init(pthread_mutex_t *mutex, void *unused) {
-  unused = NULL;
-  *mutex = CreateMutex(NULL, FALSE, NULL);
-  return *mutex == NULL ? -1 : 0;
-}
-
-static int pthread_mutex_destroy(pthread_mutex_t *mutex) {
-  return CloseHandle(*mutex) == 0 ? -1 : 0;
-}
-
-static int pthread_mutex_lock(pthread_mutex_t *mutex) {
-  return WaitForSingleObject(*mutex, INFINITE) == WAIT_OBJECT_0? 0 : -1;
-}
-
-static int pthread_mutex_unlock(pthread_mutex_t *mutex) {
-  return ReleaseMutex(*mutex) == 0 ? -1 : 0;
-}
-
-static int pthread_cond_init(pthread_cond_t *cv, const void *unused) {
-  unused = NULL;
-  cv->signal = CreateEvent(NULL, FALSE, FALSE, NULL);
-  cv->broadcast = CreateEvent(NULL, TRUE, FALSE, NULL);
-  return cv->signal != NULL && cv->broadcast != NULL ? 0 : -1;
-}
-
-static int pthread_cond_wait(pthread_cond_t *cv, pthread_mutex_t *mutex) {
-  HANDLE handles[] = {cv->signal, cv->broadcast};
-  ReleaseMutex(*mutex);
-  WaitForMultipleObjects(2, handles, FALSE, INFINITE);
-  return WaitForSingleObject(*mutex, INFINITE) == WAIT_OBJECT_0? 0 : -1;
-}
-
-static int pthread_cond_signal(pthread_cond_t *cv) {
-  return SetEvent(cv->signal) == 0 ? -1 : 0;
-}
-
-static int pthread_cond_broadcast(pthread_cond_t *cv) {
-  // Implementation with PulseEvent() has race condition, see
-  // http://www.cs.wustl.edu/~schmidt/win32-cv-1.html
-  return PulseEvent(cv->broadcast) == 0 ? -1 : 0;
-}
-
-static int pthread_cond_destroy(pthread_cond_t *cv) {
-  return CloseHandle(cv->signal) && CloseHandle(cv->broadcast) ? 0 : -1;
-}
-
-// For Windows, change all slashes to backslashes in path names.
-static void change_slashes_to_backslashes(char *path) {
-  int i;
-
-  for (i = 0; path[i] != '\0'; i++) {
-    if (path[i] == '/')
-      path[i] = '\\';
-    // i > 0 check is to preserve UNC paths, like \\server\file.txt
-    if (path[i] == '\\' && i > 0)
-      while (path[i + 1] == '\\' || path[i + 1] == '/')
-        (void) memmove(path + i + 1,
-            path + i + 2, strlen(path + i + 1));
-  }
-}
-
-// Encode 'path' which is assumed UTF-8 string, into UNICODE string.
-// wbuf and wbuf_len is a target buffer and its length.
-static void to_unicode(const char *path, wchar_t *wbuf, size_t wbuf_len) {
-  char buf[PATH_MAX], buf2[PATH_MAX], *p;
-
-  mg_strlcpy(buf, path, sizeof(buf));
-  change_slashes_to_backslashes(buf);
-
-  // Point p to the end of the file name
-  p = buf + strlen(buf) - 1;
-
-  // Convert to Unicode and back. If doubly-converted string does not
-  // match the original, something is fishy, reject.
-  memset(wbuf, 0, wbuf_len * sizeof(wchar_t));
-  MultiByteToWideChar(CP_UTF8, 0, buf, -1, wbuf, (int) wbuf_len);
-  WideCharToMultiByte(CP_UTF8, 0, wbuf, (int) wbuf_len, buf2, sizeof(buf2),
-                      NULL, NULL);
-  if (strcmp(buf, buf2) != 0) {
-    wbuf[0] = L'\0';
-  }
-}
-
-#if defined(_WIN32_WCE)
-static time_t time(time_t *ptime) {
-  time_t t;
-  SYSTEMTIME st;
-  FILETIME ft;
-
-  GetSystemTime(&st);
-  SystemTimeToFileTime(&st, &ft);
-  t = SYS2UNIX_TIME(ft.dwLowDateTime, ft.dwHighDateTime);
-
-  if (ptime != NULL) {
-    *ptime = t;
-  }
-
-  return t;
-}
-
-static struct tm *localtime(const time_t *ptime, struct tm *ptm) {
-  int64_t t = ((int64_t) *ptime) * RATE_DIFF + EPOCH_DIFF;
-  FILETIME ft, lft;
-  SYSTEMTIME st;
-  TIME_ZONE_INFORMATION tzinfo;
-
-  if (ptm == NULL) {
-    return NULL;
-  }
-
-  * (int64_t *) &ft = t;
-  FileTimeToLocalFileTime(&ft, &lft);
-  FileTimeToSystemTime(&lft, &st);
-  ptm->tm_year = st.wYear - 1900;
-  ptm->tm_mon = st.wMonth - 1;
-  ptm->tm_wday = st.wDayOfWeek;
-  ptm->tm_mday = st.wDay;
-  ptm->tm_hour = st.wHour;
-  ptm->tm_min = st.wMinute;
-  ptm->tm_sec = st.wSecond;
-  ptm->tm_yday = 0; // hope nobody uses this
-  ptm->tm_isdst =
-    GetTimeZoneInformation(&tzinfo) == TIME_ZONE_ID_DAYLIGHT ? 1 : 0;
-
-  return ptm;
-}
-
-static struct tm *gmtime(const time_t *ptime, struct tm *ptm) {
-  // FIXME(lsm): fix this.
-  return localtime(ptime, ptm);
-}
-
-static size_t strftime(char *dst, size_t dst_size, const char *fmt,
-                       const struct tm *tm) {
-  (void) snprintf(dst, dst_size, "implement strftime() for WinCE");
-  return 0;
-}
-#endif
-
-static int mg_rename(const char* oldname, const char* newname) {
-  wchar_t woldbuf[PATH_MAX];
-  wchar_t wnewbuf[PATH_MAX];
-
-  to_unicode(oldname, woldbuf, ARRAY_SIZE(woldbuf));
-  to_unicode(newname, wnewbuf, ARRAY_SIZE(wnewbuf));
-
-  return MoveFileW(woldbuf, wnewbuf) ? 0 : -1;
-}
-
-// Windows happily opens files with some garbage at the end of file name.
-// For example, fopen("a.cgi    ", "r") on Windows successfully opens
-// "a.cgi", despite one would expect an error back.
-// This function returns non-0 if path ends with some garbage.
-static int path_cannot_disclose_cgi(const char *path) {
-  static const char *allowed_last_characters = "_-";
-  int last = path[strlen(path) - 1];
-  return isalnum(last) || strchr(allowed_last_characters, last) != NULL;
-}
-
-static int mg_stat(struct mg_connection *conn, const char *path,
-                   struct file *filep) {
-  wchar_t wbuf[PATH_MAX];
-  WIN32_FILE_ATTRIBUTE_DATA info;
-
-  if (!is_file_in_memory(conn, path, filep)) {
-    to_unicode(path, wbuf, ARRAY_SIZE(wbuf));
-    if (GetFileAttributesExW(wbuf, GetFileExInfoStandard, &info) != 0) {
-      filep->size = MAKEUQUAD(info.nFileSizeLow, info.nFileSizeHigh);
-      filep->modification_time = SYS2UNIX_TIME(
-          info.ftLastWriteTime.dwLowDateTime,
-          info.ftLastWriteTime.dwHighDateTime);
-      filep->is_directory = info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
-      // If file name is fishy, reset the file structure and return error.
-      // Note it is important to reset, not just return the error, cause
-      // functions like is_file_opened() check the struct.
-      if (!filep->is_directory && !path_cannot_disclose_cgi(path)) {
-        memset(filep, 0, sizeof(*filep));
-      }
-    }
-  }
-
-  return filep->membuf != NULL || filep->modification_time != 0;
-}
-
-static int mg_remove(const char *path) {
-  wchar_t wbuf[PATH_MAX];
-  to_unicode(path, wbuf, ARRAY_SIZE(wbuf));
-  return DeleteFileW(wbuf) ? 0 : -1;
-}
-
-static int mg_mkdir(const char *path, int mode) {
-  char buf[PATH_MAX];
-  wchar_t wbuf[PATH_MAX];
-
-  mode = 0; // Unused
-  mg_strlcpy(buf, path, sizeof(buf));
-  change_slashes_to_backslashes(buf);
-
-  (void) MultiByteToWideChar(CP_UTF8, 0, buf, -1, wbuf, ARRAY_SIZE(wbuf));
-
-  return CreateDirectoryW(wbuf, NULL) ? 0 : -1;
-}
-
-// Implementation of POSIX opendir/closedir/readdir for Windows.
-static DIR * opendir(const char *name) {
-  DIR *dir = NULL;
-  wchar_t wpath[PATH_MAX];
-  DWORD attrs;
-
-  if (name == NULL) {
-    SetLastError(ERROR_BAD_ARGUMENTS);
-  } else if ((dir = (DIR *) malloc(sizeof(*dir))) == NULL) {
-    SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-  } else {
-    to_unicode(name, wpath, ARRAY_SIZE(wpath));
-    attrs = GetFileAttributesW(wpath);
-    if (attrs != 0xFFFFFFFF &&
-        ((attrs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY)) {
-      (void) wcscat(wpath, L"\\*");
-      dir->handle = FindFirstFileW(wpath, &dir->info);
-      dir->result.d_name[0] = '\0';
-    } else {
-      free(dir);
-      dir = NULL;
-    }
-  }
-
-  return dir;
-}
-
-static int closedir(DIR *dir) {
-  int result = 0;
-
-  if (dir != NULL) {
-    if (dir->handle != INVALID_HANDLE_VALUE)
-      result = FindClose(dir->handle) ? 0 : -1;
-
-    free(dir);
-  } else {
-    result = -1;
-    SetLastError(ERROR_BAD_ARGUMENTS);
-  }
-
-  return result;
-}
-
-static struct dirent *readdir(DIR *dir) {
-  struct dirent *result = 0;
-
-  if (dir) {
-    if (dir->handle != INVALID_HANDLE_VALUE) {
-      result = &dir->result;
-      (void) WideCharToMultiByte(CP_UTF8, 0,
-          dir->info.cFileName, -1, result->d_name,
-          sizeof(result->d_name), NULL, NULL);
-
-      if (!FindNextFileW(dir->handle, &dir->info)) {
-        (void) FindClose(dir->handle);
-        dir->handle = INVALID_HANDLE_VALUE;
-      }
-
-    } else {
-      SetLastError(ERROR_FILE_NOT_FOUND);
-    }
-  } else {
-    SetLastError(ERROR_BAD_ARGUMENTS);
-  }
-
-  return result;
-}
-
-#ifndef HAVE_POLL
-static int poll(struct pollfd *pfd, int n, int milliseconds) {
-  struct timeval tv;
-  fd_set set;
-  int i, result;
-
-  tv.tv_sec = milliseconds / 1000;
-  tv.tv_usec = (milliseconds % 1000) * 1000;
-  FD_ZERO(&set);
-
-  for (i = 0; i < n; i++) {
-    FD_SET((SOCKET) pfd[i].fd, &set);
-    pfd[i].revents = 0;
-  }
-
-  if ((result = select(0, &set, NULL, NULL, &tv)) > 0) {
-    for (i = 0; i < n; i++) {
-      if (FD_ISSET(pfd[i].fd, &set)) {
-        pfd[i].revents = POLLIN;
-      }
-    }
-  }
-
-  return result;
-}
-#endif // HAVE_POLL
-
-#define set_close_on_exec(x) // No FD_CLOEXEC on Windows
-
-int mg_start_thread(mg_thread_func_t f, void *p) {
-  return _beginthread((void (__cdecl *)(void *)) f, 0, p) == -1L ? -1 : 0;
-}
-
-static HANDLE dlopen(const char *dll_name, int flags) {
-  wchar_t wbuf[PATH_MAX];
-  flags = 0; // Unused
-  to_unicode(dll_name, wbuf, ARRAY_SIZE(wbuf));
-  return LoadLibraryW(wbuf);
-}
-
-#if !defined(NO_CGI)
-#define SIGKILL 0
-static int kill(pid_t pid, int sig_num) {
-  (void) TerminateProcess(pid, sig_num);
-  (void) CloseHandle(pid);
-  return 0;
-}
-
-static void trim_trailing_whitespaces(char *s) {
-  char *e = s + strlen(s) - 1;
-  while (e > s && isspace(* (unsigned char *) e)) {
-    *e-- = '\0';
-  }
-}
-
-static pid_t spawn_process(struct mg_connection *conn, const char *prog,
-                           char *envblk, char *envp[], int fd_stdin,
-                           int fd_stdout, const char *dir) {
-  HANDLE me;
-  char *p, *interp, full_interp[PATH_MAX], full_dir[PATH_MAX],
-       cmdline[PATH_MAX], buf[PATH_MAX];
-  struct file file = STRUCT_FILE_INITIALIZER;
-  STARTUPINFOA si = { sizeof(si) };
-  PROCESS_INFORMATION pi = { 0 };
-
-  envp = NULL; // Unused
-
-  // TODO(lsm): redirect CGI errors to the error log file
-  si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
-  si.wShowWindow = SW_HIDE;
-
-  me = GetCurrentProcess();
-  DuplicateHandle(me, (HANDLE) _get_osfhandle(fd_stdin), me,
-                  &si.hStdInput, 0, TRUE, DUPLICATE_SAME_ACCESS);
-  DuplicateHandle(me, (HANDLE) _get_osfhandle(fd_stdout), me,
-                  &si.hStdOutput, 0, TRUE, DUPLICATE_SAME_ACCESS);
-
-  // If CGI file is a script, try to read the interpreter line
-  interp = conn->ctx->config[CGI_INTERPRETER];
-  if (interp == NULL) {
-    buf[0] = buf[1] = '\0';
-
-    // Read the first line of the script into the buffer
-    snprintf(cmdline, sizeof(cmdline), "%s%c%s", dir, '/', prog);
-    if (mg_fopen(conn, cmdline, "r", &file)) {
-      p = (char *) file.membuf;
-      mg_fgets(buf, sizeof(buf), &file, &p);
-      mg_fclose(&file);
-      buf[sizeof(buf) - 1] = '\0';
-    }
-
-    if (buf[0] == '#' && buf[1] == '!') {
-      trim_trailing_whitespaces(buf + 2);
-    } else {
-      buf[2] = '\0';
-    }
-    interp = buf + 2;
-  }
-
-  if (interp[0] != '\0') {
-    GetFullPathNameA(interp, sizeof(full_interp), full_interp, NULL);
-    interp = full_interp;
-  }
-  GetFullPathNameA(dir, sizeof(full_dir), full_dir, NULL);
-
-  mg_snprintf(conn, cmdline, sizeof(cmdline), "%s%s%s\\%s",
-              interp, interp[0] == '\0' ? "" : " ", full_dir, prog);
-
-  DEBUG_TRACE(("Running [%s]", cmdline));
-  if (CreateProcessA(NULL, cmdline, NULL, NULL, TRUE,
-        CREATE_NEW_PROCESS_GROUP, envblk, NULL, &si, &pi) == 0) {
-    cry(conn, "%s: CreateProcess(%s): %d",
-        __func__, cmdline, ERRNO);
-    pi.hProcess = (pid_t) -1;
-  }
-
-  // Always close these to prevent handle leakage.
-  (void) close(fd_stdin);
-  (void) close(fd_stdout);
-
-  (void) CloseHandle(si.hStdOutput);
-  (void) CloseHandle(si.hStdInput);
-  (void) CloseHandle(pi.hThread);
-
-  return (pid_t) pi.hProcess;
-}
-#endif // !NO_CGI
-
-static int set_non_blocking_mode(SOCKET sock) {
-  unsigned long on = 1;
-  return ioctlsocket(sock, FIONBIO, &on);
-}
-
-#else
-static int mg_stat(struct mg_connection *conn, const char *path,
-                   struct file *filep) {
-  struct stat st;
-
-  if (!is_file_in_memory(conn, path, filep) && !stat(path, &st)) {
-    filep->size = st.st_size;
-    filep->modification_time = st.st_mtime;
-    filep->is_directory = S_ISDIR(st.st_mode);
-  } else {
-    filep->modification_time = (time_t) 0;
-  }
-
-  return filep->membuf != NULL || filep->modification_time != (time_t) 0;
-}
-
-static void set_close_on_exec(int fd) {
-  fcntl(fd, F_SETFD, FD_CLOEXEC);
-}
-
-int mg_start_thread(mg_thread_func_t func, void *param) {
-  pthread_t thread_id;
-  pthread_attr_t attr;
-
-  (void) pthread_attr_init(&attr);
-  (void) pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-  // TODO(lsm): figure out why mongoose dies on Linux if next line is enabled
-  // (void) pthread_attr_setstacksize(&attr, sizeof(struct mg_connection) * 5);
-
-  return pthread_create(&thread_id, &attr, func, param);
-}
-
-#ifndef NO_CGI
-static pid_t spawn_process(struct mg_connection *conn, const char *prog,
-                           char *envblk, char *envp[], int fd_stdin,
-                           int fd_stdout, const char *dir) {
-  pid_t pid;
-  const char *interp;
-
-  (void) envblk;
-
-  if ((pid = fork()) == -1) {
-    // Parent
-    send_http_error(conn, 500, http_500_error, "fork(): %s", strerror(ERRNO));
-  } else if (pid == 0) {
-    // Child
-    if (chdir(dir) != 0) {
-      cry(conn, "%s: chdir(%s): %s", __func__, dir, strerror(ERRNO));
-    } else if (dup2(fd_stdin, 0) == -1) {
-      cry(conn, "%s: dup2(%d, 0): %s", __func__, fd_stdin, strerror(ERRNO));
-    } else if (dup2(fd_stdout, 1) == -1) {
-      cry(conn, "%s: dup2(%d, 1): %s", __func__, fd_stdout, strerror(ERRNO));
-    } else {
-      (void) dup2(fd_stdout, 2);
-      (void) close(fd_stdin);
-      (void) close(fd_stdout);
-
-      // After exec, all signal handlers are restored to their default values,
-      // with one exception of SIGCHLD. According to POSIX.1-2001 and Linux's
-      // implementation, SIGCHLD's handler will leave unchanged after exec
-      // if it was set to be ignored. Restore it to default action.
-      signal(SIGCHLD, SIG_DFL);
-
-      interp = conn->ctx->config[CGI_INTERPRETER];
-      if (interp == NULL) {
-        (void) execle(prog, prog, NULL, envp);
-        cry(conn, "%s: execle(%s): %s", __func__, prog, strerror(ERRNO));
-      } else {
-        (void) execle(interp, interp, prog, NULL, envp);
-        cry(conn, "%s: execle(%s %s): %s", __func__, interp, prog,
-            strerror(ERRNO));
-      }
-    }
-    exit(EXIT_FAILURE);
-  }
-
-  // Parent. Close stdio descriptors
-  (void) close(fd_stdin);
-  (void) close(fd_stdout);
-
-  return pid;
-}
-#endif // !NO_CGI
-
-static int set_non_blocking_mode(SOCKET sock) {
-  int flags;
-
-  flags = fcntl(sock, F_GETFL, 0);
-  (void) fcntl(sock, F_SETFL, flags | O_NONBLOCK);
-
-  return 0;
-}
-#endif // _WIN32
-
-// Write data to the IO channel - opened file descriptor, socket or SSL
-// descriptor. Return number of bytes written.
-static int64_t push(FILE *fp, SOCKET sock, SSL *ssl, const char *buf,
-                    int64_t len) {
-  int64_t sent;
-  int n, k;
-
-  sent = 0;
-  while (sent < len) {
-
-    // How many bytes we send in this iteration
-    k = len - sent > INT_MAX ? INT_MAX : (int) (len - sent);
-
-#ifndef NO_SSL
-    if (ssl != NULL) {
-      n = SSL_write(ssl, buf + sent, k);
-    } else
-#endif
-      if (fp != NULL) {
-      n = (int) fwrite(buf + sent, 1, (size_t) k, fp);
-      if (ferror(fp))
-        n = -1;
-    } else {
-      n = send(sock, buf + sent, (size_t) k, MSG_NOSIGNAL);
-    }
-
-    if (n <= 0)
-      break;
-
-    sent += n;
-  }
-
-  return sent;
-}
-
-// Read from IO channel - opened file descriptor, socket, or SSL descriptor.
-// Return negative value on error, or number of bytes read on success.
-static int pull(FILE *fp, struct mg_connection *conn, char *buf, int len) {
-  int nread;
-
-  if (fp != NULL) {
-    // Use read() instead of fread(), because if we're reading from the CGI
-    // pipe, fread() may block until IO buffer is filled up. We cannot afford
-    // to block and must pass all read bytes immediately to the client.
-    nread = read(fileno(fp), buf, (size_t) len);
-#ifndef NO_SSL
-  } else if (conn->ssl != NULL) {
-    nread = SSL_read(conn->ssl, buf, len);
-#endif
-  } else {
-    nread = recv(conn->client.sock, buf, (size_t) len, 0);
-  }
-
-  return conn->ctx->stop_flag ? -1 : nread;
-}
-
-int mg_read(struct mg_connection *conn, void *buf, size_t len) {
-  int n, buffered_len, nread;
-  const char *body;
-
-  nread = 0;
-  if (conn->consumed_content < conn->content_len) {
-    // Adjust number of bytes to read.
-    int64_t to_read = conn->content_len - conn->consumed_content;
-    if (to_read < (int64_t) len) {
-      len = (size_t) to_read;
-    }
-
-    // Return buffered data
-    body = conn->buf + conn->request_len + conn->consumed_content;
-    buffered_len = &conn->buf[conn->data_len] - body;
-    if (buffered_len > 0) {
-      if (len < (size_t) buffered_len) {
-        buffered_len = (int) len;
-      }
-      memcpy(buf, body, (size_t) buffered_len);
-      len -= buffered_len;
-      conn->consumed_content += buffered_len;
-      nread += buffered_len;
-      buf = (char *) buf + buffered_len;
-    }
-
-    // We have returned all buffered data. Read new data from the remote socket.
-    while (len > 0) {
-      n = pull(NULL, conn, (char *) buf, (int) len);
-      if (n < 0) {
-        nread = n;  // Propagate the error
-        break;
-      } else if (n == 0) {
-        break;  // No more data to read
-      } else {
-        buf = (char *) buf + n;
-        conn->consumed_content += n;
-        nread += n;
-        len -= n;
-      }
-    }
-  }
-  return nread;
-}
-
-int mg_write(struct mg_connection *conn, const void *buf, size_t len) {
-  time_t now;
-  int64_t n, total, allowed;
-
-  if (conn->throttle > 0) {
-    if ((now = time(NULL)) != conn->last_throttle_time) {
-      conn->last_throttle_time = now;
-      conn->last_throttle_bytes = 0;
-    }
-    allowed = conn->throttle - conn->last_throttle_bytes;
-    if (allowed > (int64_t) len) {
-      allowed = len;
-    }
-    if ((total = push(NULL, conn->client.sock, conn->ssl, (const char *) buf,
-                      (int64_t) allowed)) == allowed) {
-      buf = (char *) buf + total;
-      conn->last_throttle_bytes += total;
-      while (total < (int64_t) len && conn->ctx->stop_flag == 0) {
-        allowed = conn->throttle > (int64_t) len - total ?
-          (int64_t) len - total : conn->throttle;
-        if ((n = push(NULL, conn->client.sock, conn->ssl, (const char *) buf,
-                      (int64_t) allowed)) != allowed) {
-          break;
-        }
-        sleep(1);
-        conn->last_throttle_bytes = allowed;
-        conn->last_throttle_time = time(NULL);
-        buf = (char *) buf + n;
-        total += n;
-      }
-    }
-  } else {
-    total = push(NULL, conn->client.sock, conn->ssl, (const char *) buf,
-                 (int64_t) len);
-  }
-  return (int) total;
-}
-
-// Print message to buffer. If buffer is large enough to hold the message,
-// return buffer. If buffer is to small, allocate large enough buffer on heap,
-// and return allocated buffer.
-static int alloc_vprintf(char **buf, size_t size, const char *fmt, va_list ap) {
-  va_list ap_copy;
-  int len;
-
-  // Windows is not standard-compliant, and vsnprintf() returns -1 if
-  // buffer is too small. Also, older versions of msvcrt.dll do not have
-  // _vscprintf().  However, if size is 0, vsnprintf() behaves correctly.
-  // Therefore, we make two passes: on first pass, get required message length.
-  // On second pass, actually print the message.
-  va_copy(ap_copy, ap);
-  len = vsnprintf(NULL, 0, fmt, ap_copy);
-
-  if (len > (int) size &&
-      (size = len + 1) > 0 &&
-      (*buf = (char *) malloc(size)) == NULL) {
-    len = -1;  // Allocation failed, mark failure
-  } else {
-    va_copy(ap_copy, ap);
-    vsnprintf(*buf, size, fmt, ap_copy);
-  }
-
-  return len;
-}
-
-int mg_vprintf(struct mg_connection *conn, const char *fmt, va_list ap) {
-  char mem[MG_BUF_LEN], *buf = mem;
-  int len;
-
-  if ((len = alloc_vprintf(&buf, sizeof(mem), fmt, ap)) > 0) {
-    len = mg_write(conn, buf, (size_t) len);
-  }
-  if (buf != mem && buf != NULL) {
-    free(buf);
-  }
-
-  return len;
-}
-
-int mg_printf(struct mg_connection *conn, const char *fmt, ...) {
-  va_list ap;
-  va_start(ap, fmt);
-  return mg_vprintf(conn, fmt, ap);
-}
-
-// URL-decode input buffer into destination buffer.
-// 0-terminate the destination buffer. Return the length of decoded data.
-// form-url-encoded data differs from URI encoding in a way that it
-// uses '+' as character for space, see RFC 1866 section 8.2.1
-// http://ftp.ics.uci.edu/pub/ietf/html/rfc1866.txt
-static int url_decode(const char *src, int src_len, char *dst,
-                      int dst_len, int is_form_url_encoded) {
-  int i, j, a, b;
-#define HEXTOI(x) (isdigit(x) ? x - '0' : x - 'W')
-
-  for (i = j = 0; i < src_len && j < dst_len - 1; i++, j++) {
-    if (src[i] == '%' &&
-        isxdigit(* (const unsigned char *) (src + i + 1)) &&
-        isxdigit(* (const unsigned char *) (src + i + 2))) {
-      a = tolower(* (const unsigned char *) (src + i + 1));
-      b = tolower(* (const unsigned char *) (src + i + 2));
-      dst[j] = (char) ((HEXTOI(a) << 4) | HEXTOI(b));
-      i += 2;
-    } else if (is_form_url_encoded && src[i] == '+') {
-      dst[j] = ' ';
-    } else {
-      dst[j] = src[i];
-    }
-  }
-
-  dst[j] = '\0'; // Null-terminate the destination
-
-  return i >= src_len ? j : -1;
-}
-
-int mg_get_var(const char *data, size_t data_len, const char *name,
-               char *dst, size_t dst_len) {
-  const char *p, *e, *s;
-  size_t name_len;
-  int len;
-
-  if (dst == NULL || dst_len == 0) {
-    len = -2;
-  } else if (data == NULL || name == NULL || data_len == 0) {
-    len = -1;
-    dst[0] = '\0';
-  } else {
-    name_len = strlen(name);
-    e = data + data_len;
-    len = -1;
-    dst[0] = '\0';
-
-    // data is "var1=val1&var2=val2...". Find variable first
-    for (p = data; p + name_len < e; p++) {
-      if ((p == data || p[-1] == '&') && p[name_len] == '=' &&
-          !mg_strncasecmp(name, p, name_len)) {
-
-        // Point p to variable value
-        p += name_len + 1;
-
-        // Point s to the end of the value
-        s = (const char *) memchr(p, '&', (size_t)(e - p));
-        if (s == NULL) {
-          s = e;
-        }
-        assert(s >= p);
-
-        // Decode variable into destination buffer
-        len = url_decode(p, (size_t)(s - p), dst, dst_len, 1);
-
-        // Redirect error code from -1 to -2 (destination buffer too small).
-        if (len == -1) {
-          len = -2;
-        }
-        break;
-      }
-    }
-  }
-
-  return len;
-}
-
-int mg_get_cookie(const struct mg_connection *conn, const char *cookie_name,
-                  char *dst, size_t dst_size) {
-  const char *s, *p, *end;
-  int name_len, len = -1;
-
-  if (dst == NULL || dst_size == 0) {
-      len = -2;
-  } else if (cookie_name == NULL || (s = mg_get_header(conn, "Cookie")) == NULL) {
-      len = -1;
-      dst[0] = '\0';
-  } else {
-    name_len = (int) strlen(cookie_name);
-    end = s + strlen(s);
-    dst[0] = '\0';
-
-    for (; (s = strstr(s, cookie_name)) != NULL; s += name_len) {
-      if (s[name_len] == '=') {
-        s += name_len + 1;
-        if ((p = strchr(s, ' ')) == NULL)
-          p = end;
-        if (p[-1] == ';')
-          p--;
-        if (*s == '"' && p[-1] == '"' && p > s + 1) {
-          s++;
-          p--;
-        }
-        if ((size_t) (p - s) < dst_size) {
-          len = p - s;
-          mg_strlcpy(dst, s, (size_t) len + 1);
-        } else {
-          len = -2;
-        }
-        break;
-      }
-    }
-  }
-  return len;
-}
-
-static void convert_uri_to_file_name(struct mg_connection *conn, char *buf,
-                                     size_t buf_len, struct file *filep) {
-  struct vec a, b;
-  const char *rewrite, *uri = conn->request_info.uri;
-  char *p;
-  int match_len;
-
-  // Using buf_len - 1 because memmove() for PATH_INFO may shift part
-  // of the path one byte on the right.
-  mg_snprintf(conn, buf, buf_len - 1, "%s%s", conn->ctx->config[DOCUMENT_ROOT],
-              uri);
-
-  rewrite = conn->ctx->config[REWRITE];
-  while ((rewrite = next_option(rewrite, &a, &b)) != NULL) {
-    if ((match_len = match_prefix(a.ptr, a.len, uri)) > 0) {
-      mg_snprintf(conn, buf, buf_len - 1, "%.*s%s", (int) b.len, b.ptr,
-                  uri + match_len);
-      break;
-    }
-  }
-
-  if (!mg_stat(conn, buf, filep)) {
-    // Support PATH_INFO for CGI scripts.
-    for (p = buf + strlen(buf); p > buf + 1; p--) {
-      if (*p == '/') {
-        *p = '\0';
-        if (match_prefix(conn->ctx->config[CGI_EXTENSIONS],
-                         strlen(conn->ctx->config[CGI_EXTENSIONS]), buf) > 0 &&
-            mg_stat(conn, buf, filep)) {
-          // Shift PATH_INFO block one character right, e.g.
-          //  "/x.cgi/foo/bar\x00" => "/x.cgi\x00/foo/bar\x00"
-          // conn->path_info is pointing to the local variable "path" declared
-          // in handle_request(), so PATH_INFO is not valid after
-          // handle_request returns.
-          conn->path_info = p + 1;
-          memmove(p + 2, p + 1, strlen(p + 1) + 1);  // +1 is for trailing \0
-          p[1] = '/';
-          break;
-        } else {
-          *p = '/';
-        }
-      }
-    }
-  }
-}
-
-// Check whether full request is buffered. Return:
-//   -1  if request is malformed
-//    0  if request is not yet fully buffered
-//   >0  actual request length, including last \r\n\r\n
-static int get_request_len(const char *buf, int buflen) {
-  const char *s, *e;
-  int len = 0;
-
-  for (s = buf, e = s + buflen - 1; len <= 0 && s < e; s++)
-    // Control characters are not allowed but >=128 is.
-    if (!isprint(* (const unsigned char *) s) && *s != '\r' &&
-        *s != '\n' && * (const unsigned char *) s < 128) {
-      len = -1;
-      break;  // [i_a] abort scan as soon as one malformed character is found;
-              // don't let subsequent \r\n\r\n win us over anyhow
-    } else if (s[0] == '\n' && s[1] == '\n') {
-      len = (int) (s - buf) + 2;
-    } else if (s[0] == '\n' && &s[1] < e &&
-        s[1] == '\r' && s[2] == '\n') {
-      len = (int) (s - buf) + 3;
-    }
-
-  return len;
-}
-
-// Convert month to the month number. Return -1 on error, or month number
-static int get_month_index(const char *s) {
-  size_t i;
-
-  for (i = 0; i < ARRAY_SIZE(month_names); i++)
-    if (!strcmp(s, month_names[i]))
-      return (int) i;
-
-  return -1;
-}
-
-static int num_leap_years(int year) {
-  return year / 4 - year / 100 + year / 400;
-}
-
-// Parse UTC date-time string, and return the corresponding time_t value.
-static time_t parse_date_string(const char *datetime) {
-  static const unsigned short days_before_month[] = {
-    0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
-  };
-  char month_str[32];
-  int second, minute, hour, day, month, year, leap_days, days;
-  time_t result = (time_t) 0;
-
-  if (((sscanf(datetime, "%d/%3s/%d %d:%d:%d",
-               &day, month_str, &year, &hour, &minute, &second) == 6) ||
-       (sscanf(datetime, "%d %3s %d %d:%d:%d",
-               &day, month_str, &year, &hour, &minute, &second) == 6) ||
-       (sscanf(datetime, "%*3s, %d %3s %d %d:%d:%d",
-               &day, month_str, &year, &hour, &minute, &second) == 6) ||
-       (sscanf(datetime, "%d-%3s-%d %d:%d:%d",
-               &day, month_str, &year, &hour, &minute, &second) == 6)) &&
-      year > 1970 &&
-      (month = get_month_index(month_str)) != -1) {
-    leap_days = num_leap_years(year) - num_leap_years(1970);
-    year -= 1970;
-    days = year * 365 + days_before_month[month] + (day - 1) + leap_days;
-    result = days * 24 * 3600 + hour * 3600 + minute * 60 + second;
-  }
-
-  return result;
-}
-
-// Protect against directory disclosure attack by removing '..',
-// excessive '/' and '\' characters
-static void remove_double_dots_and_double_slashes(char *s) {
-  char *p = s;
-
-  while (*s != '\0') {
-    *p++ = *s++;
-    if (s[-1] == '/' || s[-1] == '\\') {
-      // Skip all following slashes, backslashes and double-dots
-      while (s[0] != '\0') {
-        if (s[0] == '/' || s[0] == '\\') {
-          s++;
-        } else if (s[0] == '.' && s[1] == '.') {
-          s += 2;
-        } else {
-          break;
-        }
-      }
-    }
-  }
-  *p = '\0';
-}
-
-static const struct {
-  const char *extension;
-  size_t ext_len;
-  const char *mime_type;
-} builtin_mime_types[] = {
-  {".html", 5, "text/html"},
-  {".htm", 4, "text/html"},
-  {".shtm", 5, "text/html"},
-  {".shtml", 6, "text/html"},
-  {".css", 4, "text/css"},
-  {".js",  3, "application/x-javascript"},
-  {".ico", 4, "image/x-icon"},
-  {".gif", 4, "image/gif"},
-  {".jpg", 4, "image/jpeg"},
-  {".jpeg", 5, "image/jpeg"},
-  {".png", 4, "image/png"},
-  {".svg", 4, "image/svg+xml"},
-  {".txt", 4, "text/plain"},
-  {".torrent", 8, "application/x-bittorrent"},
-  {".wav", 4, "audio/x-wav"},
-  {".mp3", 4, "audio/x-mp3"},
-  {".mid", 4, "audio/mid"},
-  {".m3u", 4, "audio/x-mpegurl"},
-  {".ogg", 4, "audio/ogg"},
-  {".ram", 4, "audio/x-pn-realaudio"},
-  {".xml", 4, "text/xml"},
-  {".json",  5, "text/json"},
-  {".xslt", 5, "application/xml"},
-  {".xsl", 4, "application/xml"},
-  {".ra",  3, "audio/x-pn-realaudio"},
-  {".doc", 4, "application/msword"},
-  {".exe", 4, "application/octet-stream"},
-  {".zip", 4, "application/x-zip-compressed"},
-  {".xls", 4, "application/excel"},
-  {".tgz", 4, "application/x-tar-gz"},
-  {".tar", 4, "application/x-tar"},
-  {".gz",  3, "application/x-gunzip"},
-  {".arj", 4, "application/x-arj-compressed"},
-  {".rar", 4, "application/x-arj-compressed"},
-  {".rtf", 4, "application/rtf"},
-  {".pdf", 4, "application/pdf"},
-  {".swf", 4, "application/x-shockwave-flash"},
-  {".mpg", 4, "video/mpeg"},
-  {".webm", 5, "video/webm"},
-  {".mpeg", 5, "video/mpeg"},
-  {".mp4", 4, "video/mp4"},
-  {".m4v", 4, "video/x-m4v"},
-  {".asf", 4, "video/x-ms-asf"},
-  {".avi", 4, "video/x-msvideo"},
-  {".bmp", 4, "image/bmp"},
-  {NULL,  0, NULL}
-};
-
-const char *mg_get_builtin_mime_type(const char *path) {
-  const char *ext;
-  size_t i, path_len;
-
-  path_len = strlen(path);
-
-  for (i = 0; builtin_mime_types[i].extension != NULL; i++) {
-    ext = path + (path_len - builtin_mime_types[i].ext_len);
-    if (path_len > builtin_mime_types[i].ext_len &&
-        mg_strcasecmp(ext, builtin_mime_types[i].extension) == 0) {
-      return builtin_mime_types[i].mime_type;
-    }
-  }
-
-  return "text/plain";
-}
-
-// Look at the "path" extension and figure what mime type it has.
-// Store mime type in the vector.
-static void get_mime_type(struct mg_context *ctx, const char *path,
-                          struct vec *vec) {
-  struct vec ext_vec, mime_vec;
-  const char *list, *ext;
-  size_t path_len;
-
-  path_len = strlen(path);
-
-  // Scan user-defined mime types first, in case user wants to
-  // override default mime types.
-  list = ctx->config[EXTRA_MIME_TYPES];
-  while ((list = next_option(list, &ext_vec, &mime_vec)) != NULL) {
-    // ext now points to the path suffix
-    ext = path + path_len - ext_vec.len;
-    if (mg_strncasecmp(ext, ext_vec.ptr, ext_vec.len) == 0) {
-      *vec = mime_vec;
-      return;
-    }
-  }
-
-  vec->ptr = mg_get_builtin_mime_type(path);
-  vec->len = strlen(vec->ptr);
-}
-
-static int is_big_endian(void) {
-  static const int n = 1;
-  return ((char *) &n)[0] == 0;
-}
-
-#ifndef HAVE_MD5
-typedef struct MD5Context {
-  uint32_t buf[4];
-  uint32_t bits[2];
-  unsigned char in[64];
-} MD5_CTX;
-
-static void byteReverse(unsigned char *buf, unsigned longs) {
-  uint32_t t;
-
-  // Forrest: MD5 expect LITTLE_ENDIAN, swap if BIG_ENDIAN
-  if (is_big_endian()) {
-    do {
-      t = (uint32_t) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
-        ((unsigned) buf[1] << 8 | buf[0]);
-      * (uint32_t *) buf = t;
-      buf += 4;
-    } while (--longs);
-  }
-}
-
-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-#define F2(x, y, z) F1(z, x, y)
-#define F3(x, y, z) (x ^ y ^ z)
-#define F4(x, y, z) (y ^ (x | ~z))
-
-#define MD5STEP(f, w, x, y, z, data, s) \
-  ( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
-
-// Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
-// initialization constants.
-static void MD5Init(MD5_CTX *ctx) {
-  ctx->buf[0] = 0x67452301;
-  ctx->buf[1] = 0xefcdab89;
-  ctx->buf[2] = 0x98badcfe;
-  ctx->buf[3] = 0x10325476;
-
-  ctx->bits[0] = 0;
-  ctx->bits[1] = 0;
-}
-
-static void MD5Transform(uint32_t buf[4], uint32_t const in[16]) {
-  register uint32_t a, b, c, d;
-
-  a = buf[0];
-  b = buf[1];
-  c = buf[2];
-  d = buf[3];
-
-  MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
-  MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
-  MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
-  MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
-  MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
-  MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
-  MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
-  MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
-  MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
-  MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
-  MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
-  MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
-  MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
-  MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
-  MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
-  MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-
-  MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
-  MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
-  MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
-  MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
-  MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
-  MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
-  MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
-  MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
-  MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
-  MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
-  MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
-  MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
-  MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
-  MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
-  MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
-  MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-
-  MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
-  MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
-  MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
-  MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
-  MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
-  MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
-  MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
-  MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
-  MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
-  MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
-  MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
-  MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
-  MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
-  MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
-  MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
-  MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-
-  MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
-  MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
-  MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
-  MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
-  MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
-  MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
-  MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
-  MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
-  MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
-  MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
-  MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
-  MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
-  MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
-  MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
-  MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
-  MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-
-  buf[0] += a;
-  buf[1] += b;
-  buf[2] += c;
-  buf[3] += d;
-}
-
-static void MD5Update(MD5_CTX *ctx, unsigned char const *buf, unsigned len) {
-  uint32_t t;
-
-  t = ctx->bits[0];
-  if ((ctx->bits[0] = t + ((uint32_t) len << 3)) < t)
-    ctx->bits[1]++;
-  ctx->bits[1] += len >> 29;
-
-  t = (t >> 3) & 0x3f;
-
-  if (t) {
-    unsigned char *p = (unsigned char *) ctx->in + t;
-
-    t = 64 - t;
-    if (len < t) {
-      memcpy(p, buf, len);
-      return;
-    }
-    memcpy(p, buf, t);
-    byteReverse(ctx->in, 16);
-    MD5Transform(ctx->buf, (uint32_t *) ctx->in);
-    buf += t;
-    len -= t;
-  }
-
-  while (len >= 64) {
-    memcpy(ctx->in, buf, 64);
-    byteReverse(ctx->in, 16);
-    MD5Transform(ctx->buf, (uint32_t *) ctx->in);
-    buf += 64;
-    len -= 64;
-  }
-
-  memcpy(ctx->in, buf, len);
-}
-
-static void MD5Final(unsigned char digest[16], MD5_CTX *ctx) {
-  unsigned count;
-  unsigned char *p;
-
-  count = (ctx->bits[0] >> 3) & 0x3F;
-
-  p = ctx->in + count;
-  *p++ = 0x80;
-  count = 64 - 1 - count;
-  if (count < 8) {
-    memset(p, 0, count);
-    byteReverse(ctx->in, 16);
-    MD5Transform(ctx->buf, (uint32_t *) ctx->in);
-    memset(ctx->in, 0, 56);
-  } else {
-    memset(p, 0, count - 8);
-  }
-  byteReverse(ctx->in, 14);
-
-  ((uint32_t *) ctx->in)[14] = ctx->bits[0];
-  ((uint32_t *) ctx->in)[15] = ctx->bits[1];
-
-  MD5Transform(ctx->buf, (uint32_t *) ctx->in);
-  byteReverse((unsigned char *) ctx->buf, 4);
-  memcpy(digest, ctx->buf, 16);
-  memset((char *) ctx, 0, sizeof(*ctx));
-}
-#endif // !HAVE_MD5
-
-// Stringify binary data. Output buffer must be twice as big as input,
-// because each byte takes 2 bytes in string representation
-static void bin2str(char *to, const unsigned char *p, size_t len) {
-  static const char *hex = "0123456789abcdef";
-
-  for (; len--; p++) {
-    *to++ = hex[p[0] >> 4];
-    *to++ = hex[p[0] & 0x0f];
-  }
-  *to = '\0';
-}
-
-// Return stringified MD5 hash for list of strings. Buffer must be 33 bytes.
-void mg_md5(char buf[33], ...) {
-  unsigned char hash[16];
-  const char *p;
-  va_list ap;
-  MD5_CTX ctx;
-
-  MD5Init(&ctx);
-
-  va_start(ap, buf);
-  while ((p = va_arg(ap, const char *)) != NULL) {
-    MD5Update(&ctx, (const unsigned char *) p, (unsigned) strlen(p));
-  }
-  va_end(ap);
-
-  MD5Final(hash, &ctx);
-  bin2str(buf, hash, sizeof(hash));
-}
-
-// Check the user's password, return 1 if OK
-static int check_password(const char *method, const char *ha1, const char *uri,
-                          const char *nonce, const char *nc, const char *cnonce,
-                          const char *qop, const char *response) {
-  char ha2[32 + 1], expected_response[32 + 1];
-
-  // Some of the parameters may be NULL
-  if (method == NULL || nonce == NULL || nc == NULL || cnonce == NULL ||
-      qop == NULL || response == NULL) {
-    return 0;
-  }
-
-  // NOTE(lsm): due to a bug in MSIE, we do not compare the URI
-  // TODO(lsm): check for authentication timeout
-  if (// strcmp(dig->uri, c->ouri) != 0 ||
-      strlen(response) != 32
-      // || now - strtoul(dig->nonce, NULL, 10) > 3600
-      ) {
-    return 0;
-  }
-
-  mg_md5(ha2, method, ":", uri, NULL);
-  mg_md5(expected_response, ha1, ":", nonce, ":", nc,
-      ":", cnonce, ":", qop, ":", ha2, NULL);
-
-  return mg_strcasecmp(response, expected_response) == 0;
-}
-
-// Use the global passwords file, if specified by auth_gpass option,
-// or search for .htpasswd in the requested directory.
-static void open_auth_file(struct mg_connection *conn, const char *path,
-                           struct file *filep) {
-  char name[PATH_MAX];
-  const char *p, *e, *gpass = conn->ctx->config[GLOBAL_PASSWORDS_FILE];
-
-  if (gpass != NULL) {
-    // Use global passwords file
-    if (!mg_fopen(conn, gpass, "r", filep)) {
-      cry(conn, "fopen(%s): %s", gpass, strerror(ERRNO));
-    }
-  } else if (mg_stat(conn, path, filep) && filep->is_directory) {
-    mg_snprintf(conn, name, sizeof(name), "%s%c%s",
-                path, '/', PASSWORDS_FILE_NAME);
-    mg_fopen(conn, name, "r", filep);
-  } else {
-     // Try to find .htpasswd in requested directory.
-    for (p = path, e = p + strlen(p) - 1; e > p; e--)
-      if (e[0] == '/')
-        break;
-    mg_snprintf(conn, name, sizeof(name), "%.*s%c%s",
-                (int) (e - p), p, '/', PASSWORDS_FILE_NAME);
-    mg_fopen(conn, name, "r", filep);
-  }
-}
-
-// Parsed Authorization header
-struct ah {
-  char *user, *uri, *cnonce, *response, *qop, *nc, *nonce;
-};
-
-// Return 1 on success. Always initializes the ah structure.
-static int parse_auth_header(struct mg_connection *conn, char *buf,
-                             size_t buf_size, struct ah *ah) {
-  char *name, *value, *s;
-  const char *auth_header;
-
-  (void) memset(ah, 0, sizeof(*ah));
-  if ((auth_header = mg_get_header(conn, "Authorization")) == NULL ||
-      mg_strncasecmp(auth_header, "Digest ", 7) != 0) {
-    return 0;
-  }
-
-  // Make modifiable copy of the auth header
-  (void) mg_strlcpy(buf, auth_header + 7, buf_size);
-  s = buf;
-
-  // Parse authorization header
-  for (;;) {
-    // Gobble initial spaces
-    while (isspace(* (unsigned char *) s)) {
-      s++;
-    }
-    name = skip_quoted(&s, "=", " ", 0);
-    // Value is either quote-delimited, or ends at first comma or space.
-    if (s[0] == '\"') {
-      s++;
-      value = skip_quoted(&s, "\"", " ", '\\');
-      if (s[0] == ',') {
-        s++;
-      }
-    } else {
-      value = skip_quoted(&s, ", ", " ", 0);  // IE uses commas, FF uses spaces
-    }
-    if (*name == '\0') {
-      break;
-    }
-
-    if (!strcmp(name, "username")) {
-      ah->user = value;
-    } else if (!strcmp(name, "cnonce")) {
-      ah->cnonce = value;
-    } else if (!strcmp(name, "response")) {
-      ah->response = value;
-    } else if (!strcmp(name, "uri")) {
-      ah->uri = value;
-    } else if (!strcmp(name, "qop")) {
-      ah->qop = value;
-    } else if (!strcmp(name, "nc")) {
-      ah->nc = value;
-    } else if (!strcmp(name, "nonce")) {
-      ah->nonce = value;
-    }
-  }
-
-  // CGI needs it as REMOTE_USER
-  if (ah->user != NULL) {
-    conn->request_info.remote_user = mg_strdup(ah->user);
-  } else {
-    return 0;
-  }
-
-  return 1;
-}
-
-static char *mg_fgets(char *buf, size_t size, struct file *filep, char **p) {
-  char *eof;
-  size_t len;
-
-  if (filep->membuf != NULL && *p != NULL) {
-    eof = memchr(*p, '\n', &filep->membuf[filep->size] - *p);
-    len = (size_t) (eof - *p) > size - 1 ? size - 1 : (size_t) (eof - *p);
-    memcpy(buf, *p, len);
-    buf[len] = '\0';
-    *p = eof;
-    return eof;
-  } else if (filep->fp != NULL) {
-    return fgets(buf, size, filep->fp);
-  } else {
-    return NULL;
-  }
-}
-
-// Authorize against the opened passwords file. Return 1 if authorized.
-static int authorize(struct mg_connection *conn, struct file *filep) {
-  struct ah ah;
-  char line[256], f_user[256], ha1[256], f_domain[256], buf[MG_BUF_LEN], *p;
-
-  if (!parse_auth_header(conn, buf, sizeof(buf), &ah)) {
-    return 0;
-  }
-
-  // Loop over passwords file
-  p = (char *) filep->membuf;
-  while (mg_fgets(line, sizeof(line), filep, &p) != NULL) {
-    if (sscanf(line, "%[^:]:%[^:]:%s", f_user, f_domain, ha1) != 3) {
-      continue;
-    }
-
-    if (!strcmp(ah.user, f_user) &&
-        !strcmp(conn->ctx->config[AUTHENTICATION_DOMAIN], f_domain))
-      return check_password(conn->request_info.request_method, ha1, ah.uri,
-                            ah.nonce, ah.nc, ah.cnonce, ah.qop, ah.response);
-  }
-
-  return 0;
-}
-
-// Return 1 if request is authorised, 0 otherwise.
-static int check_authorization(struct mg_connection *conn, const char *path) {
-  char fname[PATH_MAX];
-  struct vec uri_vec, filename_vec;
-  const char *list;
-  struct file file = STRUCT_FILE_INITIALIZER;
-  int authorized = 1;
-
-  list = conn->ctx->config[PROTECT_URI];
-  while ((list = next_option(list, &uri_vec, &filename_vec)) != NULL) {
-    if (!memcmp(conn->request_info.uri, uri_vec.ptr, uri_vec.len)) {
-      mg_snprintf(conn, fname, sizeof(fname), "%.*s",
-                  (int) filename_vec.len, filename_vec.ptr);
-      if (!mg_fopen(conn, fname, "r", &file)) {
-        cry(conn, "%s: cannot open %s: %s", __func__, fname, strerror(errno));
-      }
-      break;
-    }
-  }
-
-  if (!is_file_opened(&file)) {
-    open_auth_file(conn, path, &file);
-  }
-
-  if (is_file_opened(&file)) {
-    authorized = authorize(conn, &file);
-    mg_fclose(&file);
-  }
-
-  return authorized;
-}
-
-static void send_authorization_request(struct mg_connection *conn) {
-  conn->status_code = 401;
-  mg_printf(conn,
-            "HTTP/1.1 401 Unauthorized\r\n"
-            "Content-Length: 0\r\n"
-            "WWW-Authenticate: Digest qop=\"auth\", "
-            "realm=\"%s\", nonce=\"%lu\"\r\n\r\n",
-            conn->ctx->config[AUTHENTICATION_DOMAIN],
-            (unsigned long) time(NULL));
-}
-
-static int is_authorized_for_put(struct mg_connection *conn) {
-  struct file file = STRUCT_FILE_INITIALIZER;
-  const char *passfile = conn->ctx->config[PUT_DELETE_PASSWORDS_FILE];
-  int ret = 0;
-
-  if (passfile != NULL && mg_fopen(conn, passfile, "r", &file)) {
-    ret = authorize(conn, &file);
-    mg_fclose(&file);
-  }
-
-  return ret;
-}
-
-int mg_modify_passwords_file(const char *fname, const char *domain,
-                             const char *user, const char *pass) {
-  int found;
-  char line[512], u[512], d[512], ha1[33], tmp[PATH_MAX];
-  FILE *fp, *fp2;
-
-  found = 0;
-  fp = fp2 = NULL;
-
-  // Regard empty password as no password - remove user record.
-  if (pass != NULL && pass[0] == '\0') {
-    pass = NULL;
-  }
-
-  (void) snprintf(tmp, sizeof(tmp), "%s.tmp", fname);
-
-  // Create the file if does not exist
-  if ((fp = fopen(fname, "a+")) != NULL) {
-    (void) fclose(fp);
-  }
-
-  // Open the given file and temporary file
-  if ((fp = fopen(fname, "r")) == NULL) {
-    return 0;
-  } else if ((fp2 = fopen(tmp, "w+")) == NULL) {
-    fclose(fp);
-    return 0;
-  }
-
-  // Copy the stuff to temporary file
-  while (fgets(line, sizeof(line), fp) != NULL) {
-    if (sscanf(line, "%[^:]:%[^:]:%*s", u, d) != 2) {
-      continue;
-    }
-
-    if (!strcmp(u, user) && !strcmp(d, domain)) {
-      found++;
-      if (pass != NULL) {
-        mg_md5(ha1, user, ":", domain, ":", pass, NULL);
-        fprintf(fp2, "%s:%s:%s\n", user, domain, ha1);
-      }
-    } else {
-      fprintf(fp2, "%s", line);
-    }
-  }
-
-  // If new user, just add it
-  if (!found && pass != NULL) {
-    mg_md5(ha1, user, ":", domain, ":", pass, NULL);
-    fprintf(fp2, "%s:%s:%s\n", user, domain, ha1);
-  }
-
-  // Close files
-  fclose(fp);
-  fclose(fp2);
-
-  // Put the temp file in place of real file
-  remove(fname);
-  rename(tmp, fname);
-
-  return 1;
-}
-
-struct de {
-  struct mg_connection *conn;
-  char *file_name;
-  struct file file;
-};
-
-static void url_encode(const char *src, char *dst, size_t dst_len) {
-  static const char *dont_escape = "._-$,;~()";
-  static const char *hex = "0123456789abcdef";
-  const char *end = dst + dst_len - 1;
-
-  for (; *src != '\0' && dst < end; src++, dst++) {
-    if (isalnum(*(const unsigned char *) src) ||
-        strchr(dont_escape, * (const unsigned char *) src) != NULL) {
-      *dst = *src;
-    } else if (dst + 2 < end) {
-      dst[0] = '%';
-      dst[1] = hex[(* (const unsigned char *) src) >> 4];
-      dst[2] = hex[(* (const unsigned char *) src) & 0xf];
-      dst += 2;
-    }
-  }
-
-  *dst = '\0';
-}
-
-static void print_dir_entry(struct de *de) {
-  char size[64], mod[64], href[PATH_MAX];
-
-  if (de->file.is_directory) {
-    mg_snprintf(de->conn, size, sizeof(size), "%s", "[DIRECTORY]");
-  } else {
-     // We use (signed) cast below because MSVC 6 compiler cannot
-     // convert unsigned __int64 to double. Sigh.
-    if (de->file.size < 1024) {
-      mg_snprintf(de->conn, size, sizeof(size), "%d", (int) de->file.size);
-    } else if (de->file.size < 0x100000) {
-      mg_snprintf(de->conn, size, sizeof(size),
-                  "%.1fk", (double) de->file.size / 1024.0);
-    } else if (de->file.size < 0x40000000) {
-      mg_snprintf(de->conn, size, sizeof(size),
-                  "%.1fM", (double) de->file.size / 1048576);
-    } else {
-      mg_snprintf(de->conn, size, sizeof(size),
-                  "%.1fG", (double) de->file.size / 1073741824);
-    }
-  }
-  strftime(mod, sizeof(mod), "%d-%b-%Y %H:%M",
-           localtime(&de->file.modification_time));
-  url_encode(de->file_name, href, sizeof(href));
-  de->conn->num_bytes_sent += mg_printf(de->conn,
-      "<tr><td><a href=\"%s%s%s\">%s%s</a></td>"
-      "<td>&nbsp;%s</td><td>&nbsp;&nbsp;%s</td></tr>\n",
-      de->conn->request_info.uri, href, de->file.is_directory ? "/" : "",
-      de->file_name, de->file.is_directory ? "/" : "", mod, size);
-}
-
-// This function is called from send_directory() and used for
-// sorting directory entries by size, or name, or modification time.
-// On windows, __cdecl specification is needed in case if project is built
-// with __stdcall convention. qsort always requires __cdels callback.
-static int WINCDECL compare_dir_entries(const void *p1, const void *p2) {
-  const struct de *a = (const struct de *) p1, *b = (const struct de *) p2;
-  const char *query_string = a->conn->request_info.query_string;
-  int cmp_result = 0;
-
-  if (query_string == NULL) {
-    query_string = "na";
-  }
-
-  if (a->file.is_directory && !b->file.is_directory) {
-    return -1;  // Always put directories on top
-  } else if (!a->file.is_directory && b->file.is_directory) {
-    return 1;   // Always put directories on top
-  } else if (*query_string == 'n') {
-    cmp_result = strcmp(a->file_name, b->file_name);
-  } else if (*query_string == 's') {
-    cmp_result = a->file.size == b->file.size ? 0 :
-      a->file.size > b->file.size ? 1 : -1;
-  } else if (*query_string == 'd') {
-    cmp_result = a->file.modification_time == b->file.modification_time ? 0 :
-      a->file.modification_time > b->file.modification_time ? 1 : -1;
-  }
-
-  return query_string[1] == 'd' ? -cmp_result : cmp_result;
-}
-
-static int must_hide_file(struct mg_connection *conn, const char *path) {
-  const char *pw_pattern = "**" PASSWORDS_FILE_NAME "$";
-  const char *pattern = conn->ctx->config[HIDE_FILES];
-  return match_prefix(pw_pattern, strlen(pw_pattern), path) > 0 ||
-    (pattern != NULL && match_prefix(pattern, strlen(pattern), path) > 0);
-}
-
-static int scan_directory(struct mg_connection *conn, const char *dir,
-                          void *data, void (*cb)(struct de *, void *)) {
-  char path[PATH_MAX];
-  struct dirent *dp;
-  DIR *dirp;
-  struct de de;
-
-  if ((dirp = opendir(dir)) == NULL) {
-    return 0;
-  } else {
-    de.conn = conn;
-
-    while ((dp = readdir(dirp)) != NULL) {
-      // Do not show current dir and hidden files
-      if (!strcmp(dp->d_name, ".") ||
-          !strcmp(dp->d_name, "..") ||
-          must_hide_file(conn, dp->d_name)) {
-        continue;
-      }
-
-      mg_snprintf(conn, path, sizeof(path), "%s%c%s", dir, '/', dp->d_name);
-
-      // If we don't memset stat structure to zero, mtime will have
-      // garbage and strftime() will segfault later on in
-      // print_dir_entry(). memset is required only if mg_stat()
-      // fails. For more details, see
-      // http://code.google.com/p/mongoose/issues/detail?id=79
-      memset(&de.file, 0, sizeof(de.file));
-      mg_stat(conn, path, &de.file);
-
-      de.file_name = dp->d_name;
-      cb(&de, data);
-    }
-    (void) closedir(dirp);
-  }
-  return 1;
-}
-
-struct dir_scan_data {
-  struct de *entries;
-  int num_entries;
-  int arr_size;
-};
-
-static void dir_scan_callback(struct de *de, void *data) {
-  struct dir_scan_data *dsd = (struct dir_scan_data *) data;
-
-  if (dsd->entries == NULL || dsd->num_entries >= dsd->arr_size) {
-    dsd->arr_size *= 2;
-    dsd->entries = (struct de *) realloc(dsd->entries, dsd->arr_size *
-                                         sizeof(dsd->entries[0]));
-  }
-  if (dsd->entries == NULL) {
-    // TODO(lsm): propagate an error to the caller
-    dsd->num_entries = 0;
-  } else {
-    dsd->entries[dsd->num_entries].file_name = mg_strdup(de->file_name);
-    dsd->entries[dsd->num_entries].file = de->file;
-    dsd->entries[dsd->num_entries].conn = de->conn;
-    dsd->num_entries++;
-  }
-}
-
-static void handle_directory_request(struct mg_connection *conn,
-                                     const char *dir) {
-  int i, sort_direction;
-  struct dir_scan_data data = { NULL, 0, 128 };
-
-  if (!scan_directory(conn, dir, &data, dir_scan_callback)) {
-    send_http_error(conn, 500, "Cannot open directory",
-                    "Error: opendir(%s): %s", dir, strerror(ERRNO));
-    return;
-  }
-
-  sort_direction = conn->request_info.query_string != NULL &&
-    conn->request_info.query_string[1] == 'd' ? 'a' : 'd';
-
-  conn->must_close = 1;
-  mg_printf(conn, "%s",
-            "HTTP/1.1 200 OK\r\n"
-            "Connection: close\r\n"
-            "Content-Type: text/html; charset=utf-8\r\n\r\n");
-
-  conn->num_bytes_sent += mg_printf(conn,
-      "<html><head><title>Index of %s</title>"
-      "<style>th {text-align: left;}</style></head>"
-      "<body><h1>Index of %s</h1><pre><table cellpadding=\"0\">"
-      "<tr><th><a href=\"?n%c\">Name</a></th>"
-      "<th><a href=\"?d%c\">Modified</a></th>"
-      "<th><a href=\"?s%c\">Size</a></th></tr>"
-      "<tr><td colspan=\"3\"><hr></td></tr>",
-      conn->request_info.uri, conn->request_info.uri,
-      sort_direction, sort_direction, sort_direction);
-
-  // Print first entry - link to a parent directory
-  conn->num_bytes_sent += mg_printf(conn,
-      "<tr><td><a href=\"%s%s\">%s</a></td>"
-      "<td>&nbsp;%s</td><td>&nbsp;&nbsp;%s</td></tr>\n",
-      conn->request_info.uri, "..", "Parent directory", "-", "-");
-
-  // Sort and print directory entries
-  qsort(data.entries, (size_t) data.num_entries, sizeof(data.entries[0]),
-        compare_dir_entries);
-  for (i = 0; i < data.num_entries; i++) {
-    print_dir_entry(&data.entries[i]);
-    free(data.entries[i].file_name);
-  }
-  free(data.entries);
-
-  conn->num_bytes_sent += mg_printf(conn, "%s", "</table></body></html>");
-  conn->status_code = 200;
-}
-
-// Send len bytes from the opened file to the client.
-static void send_file_data(struct mg_connection *conn, struct file *filep,
-                           int64_t offset, int64_t len) {
-  char buf[MG_BUF_LEN];
-  int to_read, num_read, num_written;
-
-  if (len > 0 && filep->membuf != NULL && filep->size > 0) {
-    if (len > filep->size - offset) {
-      len = filep->size - offset;
-    }
-    mg_write(conn, filep->membuf + offset, (size_t) len);
-  } else if (len > 0 && filep->fp != NULL) {
-    fseeko(filep->fp, offset, SEEK_SET);
-    while (len > 0) {
-      // Calculate how much to read from the file in the buffer
-      to_read = sizeof(buf);
-      if ((int64_t) to_read > len) {
-        to_read = (int) len;
-      }
-
-      // Read from file, exit the loop on error
-      if ((num_read = fread(buf, 1, (size_t) to_read, filep->fp)) <= 0) {
-        break;
-      }
-
-      // Send read bytes to the client, exit the loop on error
-      if ((num_written = mg_write(conn, buf, (size_t) num_read)) != num_read) {
-        break;
-      }
-
-      // Both read and were successful, adjust counters
-      conn->num_bytes_sent += num_written;
-      len -= num_written;
-    }
-  }
-}
-
-static int parse_range_header(const char *header, int64_t *a, int64_t *b) {
-  return sscanf(header, "bytes=%" INT64_FMT "-%" INT64_FMT, a, b);
-}
-
-static void gmt_time_string(char *buf, size_t buf_len, time_t *t) {
-  strftime(buf, buf_len, "%a, %d %b %Y %H:%M:%S GMT", gmtime(t));
-}
-
-static void construct_etag(char *buf, size_t buf_len,
-                           const struct file *filep) {
-  snprintf(buf, buf_len, "\"%lx.%" INT64_FMT "\"",
-           (unsigned long) filep->modification_time, filep->size);
-}
-
-static void fclose_on_exec(struct file *filep) {
-  if (filep != NULL && filep->fp != NULL) {
-#ifndef _WIN32
-    fcntl(fileno(filep->fp), F_SETFD, FD_CLOEXEC);
-#endif
-  }
-}
-
-static void handle_file_request(struct mg_connection *conn, const char *path,
-                                struct file *filep) {
-  char date[64], lm[64], etag[64], range[64];
-  const char *msg = "OK", *hdr;
-  time_t curtime = time(NULL);
-  int64_t cl, r1, r2;
-  struct vec mime_vec;
-  int n;
-
-  get_mime_type(conn->ctx, path, &mime_vec);
-  cl = filep->size;
-  conn->status_code = 200;
-  range[0] = '\0';
-
-  if (!mg_fopen(conn, path, "rb", filep)) {
-    send_http_error(conn, 500, http_500_error,
-                    "fopen(%s): %s", path, strerror(ERRNO));
-    return;
-  }
-  fclose_on_exec(filep);
-
-  // If Range: header specified, act accordingly
-  r1 = r2 = 0;
-  hdr = mg_get_header(conn, "Range");
-  if (hdr != NULL && (n = parse_range_header(hdr, &r1, &r2)) > 0 &&
-      r1 >= 0 && r2 > 0) {
-    conn->status_code = 206;
-    cl = n == 2 ? (r2 > cl ? cl : r2) - r1 + 1: cl - r1;
-    mg_snprintf(conn, range, sizeof(range),
-                "Content-Range: bytes "
-                "%" INT64_FMT "-%"
-                INT64_FMT "/%" INT64_FMT "\r\n",
-                r1, r1 + cl - 1, filep->size);
-    msg = "Partial Content";
-  }
-
-  // Prepare Etag, Date, Last-Modified headers. Must be in UTC, according to
-  // http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3
-  gmt_time_string(date, sizeof(date), &curtime);
-  gmt_time_string(lm, sizeof(lm), &filep->modification_time);
-  construct_etag(etag, sizeof(etag), filep);
-
-  (void) mg_printf(conn,
-      "HTTP/1.1 %d %s\r\n"
-      "Date: %s\r\n"
-      "Last-Modified: %s\r\n"
-      "Etag: %s\r\n"
-      "Content-Type: %.*s\r\n"
-      "Content-Length: %" INT64_FMT "\r\n"
-      "Connection: %s\r\n"
-      "Accept-Ranges: bytes\r\n"
-      "%s\r\n",
-      conn->status_code, msg, date, lm, etag, (int) mime_vec.len,
-      mime_vec.ptr, cl, suggest_connection_header(conn), range);
-
-  if (strcmp(conn->request_info.request_method, "HEAD") != 0) {
-    send_file_data(conn, filep, r1, cl);
-  }
-  mg_fclose(filep);
-}
-
-void mg_send_file(struct mg_connection *conn, const char *path) {
-  struct file file = STRUCT_FILE_INITIALIZER;
-  if (mg_stat(conn, path, &file)) {
-    handle_file_request(conn, path, &file);
-  } else {
-    send_http_error(conn, 404, "Not Found", "%s", "File not found");
-  }
-}
-
-
-// Parse HTTP headers from the given buffer, advance buffer to the point
-// where parsing stopped.
-static void parse_http_headers(char **buf, struct mg_request_info *ri) {
-  int i;
-
-  for (i = 0; i < (int) ARRAY_SIZE(ri->http_headers); i++) {
-    ri->http_headers[i].name = skip_quoted(buf, ":", " ", 0);
-    ri->http_headers[i].value = skip(buf, "\r\n");
-    if (ri->http_headers[i].name[0] == '\0')
-      break;
-    ri->num_headers = i + 1;
-  }
-}
-
-static int is_valid_http_method(const char *method) {
-  return !strcmp(method, "GET") || !strcmp(method, "POST") ||
-    !strcmp(method, "HEAD") || !strcmp(method, "CONNECT") ||
-    !strcmp(method, "PUT") || !strcmp(method, "DELETE") ||
-    !strcmp(method, "OPTIONS") || !strcmp(method, "PROPFIND");
-}
-
-// Parse HTTP request, fill in mg_request_info structure.
-// This function modifies the buffer by NUL-terminating
-// HTTP request components, header names and header values.
-static int parse_http_message(char *buf, int len, struct mg_request_info *ri) {
-  int is_request, request_length = get_request_len(buf, len);
-  if (request_length > 0) {
-    // Reset attributes. DO NOT TOUCH is_ssl, remote_ip, remote_port
-    ri->remote_user = ri->request_method = ri->uri = ri->http_version = NULL;
-    ri->num_headers = 0;
-
-    buf[request_length - 1] = '\0';
-
-    // RFC says that all initial whitespaces should be ingored
-    while (*buf != '\0' && isspace(* (unsigned char *) buf)) {
-      buf++;
-    }
-    ri->request_method = skip(&buf, " ");
-    ri->uri = skip(&buf, " ");
-    ri->http_version = skip(&buf, "\r\n");
-    if (((is_request = is_valid_http_method(ri->request_method)) &&
-         memcmp(ri->http_version, "HTTP/", 5) != 0) ||
-        (!is_request && memcmp(ri->request_method, "HTTP/", 5)) != 0) {
-      request_length = -1;
-    } else {
-      if (is_request) {
-        ri->http_version += 5;
-      }
-      parse_http_headers(&buf, ri);
-    }
-  }
-  return request_length;
-}
-
-// Keep reading the input (either opened file descriptor fd, or socket sock,
-// or SSL descriptor ssl) into buffer buf, until \r\n\r\n appears in the
-// buffer (which marks the end of HTTP request). Buffer buf may already
-// have some data. The length of the data is stored in nread.
-// Upon every read operation, increase nread by the number of bytes read.
-static int read_request(FILE *fp, struct mg_connection *conn,
-                        char *buf, int bufsiz, int *nread) {
-  int request_len, n = 0;
-
-  request_len = get_request_len(buf, *nread);
-  while (*nread < bufsiz && request_len == 0 &&
-         (n = pull(fp, conn, buf + *nread, bufsiz - *nread)) > 0) {
-    *nread += n;
-    request_len = get_request_len(buf, *nread);
-  }
-
-  return request_len <= 0 && n <= 0 ? -1 : request_len;
-}
-
-// For given directory path, substitute it to valid index file.
-// Return 0 if index file has been found, -1 if not found.
-// If the file is found, it's stats is returned in stp.
-static int substitute_index_file(struct mg_connection *conn, char *path,
-                                 size_t path_len, struct file *filep) {
-  const char *list = conn->ctx->config[INDEX_FILES];
-  struct file file = STRUCT_FILE_INITIALIZER;
-  struct vec filename_vec;
-  size_t n = strlen(path);
-  int found = 0;
-
-  // The 'path' given to us points to the directory. Remove all trailing
-  // directory separator characters from the end of the path, and
-  // then append single directory separator character.
-  while (n > 0 && path[n - 1] == '/') {
-    n--;
-  }
-  path[n] = '/';
-
-  // Traverse index files list. For each entry, append it to the given
-  // path and see if the file exists. If it exists, break the loop
-  while ((list = next_option(list, &filename_vec, NULL)) != NULL) {
-
-    // Ignore too long entries that may overflow path buffer
-    if (filename_vec.len > path_len - (n + 2))
-      continue;
-
-    // Prepare full path to the index file
-    mg_strlcpy(path + n + 1, filename_vec.ptr, filename_vec.len + 1);
-
-    // Does it exist?
-    if (mg_stat(conn, path, &file)) {
-      // Yes it does, break the loop
-      *filep = file;
-      found = 1;
-      break;
-    }
-  }
-
-  // If no index file exists, restore directory path
-  if (!found) {
-    path[n] = '\0';
-  }
-
-  return found;
-}
-
-// Return True if we should reply 304 Not Modified.
-static int is_not_modified(const struct mg_connection *conn,
-                           const struct file *filep) {
-  char etag[64];
-  const char *ims = mg_get_header(conn, "If-Modified-Since");
-  const char *inm = mg_get_header(conn, "If-None-Match");
-  construct_etag(etag, sizeof(etag), filep);
-  return (inm != NULL && !mg_strcasecmp(etag, inm)) ||
-    (ims != NULL && filep->modification_time <= parse_date_string(ims));
-}
-
-static int forward_body_data(struct mg_connection *conn, FILE *fp,
-                             SOCKET sock, SSL *ssl) {
-  const char *expect, *body;
-  char buf[MG_BUF_LEN];
-  int to_read, nread, buffered_len, success = 0;
-
-  expect = mg_get_header(conn, "Expect");
-  assert(fp != NULL);
-
-  if (conn->content_len == -1) {
-    send_http_error(conn, 411, "Length Required", "%s", "");
-  } else if (expect != NULL && mg_strcasecmp(expect, "100-continue")) {
-    send_http_error(conn, 417, "Expectation Failed", "%s", "");
-  } else {
-    if (expect != NULL) {
-      (void) mg_printf(conn, "%s", "HTTP/1.1 100 Continue\r\n\r\n");
-    }
-
-    body = conn->buf + conn->request_len + conn->consumed_content;
-    buffered_len = &conn->buf[conn->data_len] - body;
-    assert(buffered_len >= 0);
-    assert(conn->consumed_content == 0);
-
-    if (buffered_len > 0) {
-      if ((int64_t) buffered_len > conn->content_len) {
-        buffered_len = (int) conn->content_len;
-      }
-      push(fp, sock, ssl, body, (int64_t) buffered_len);
-      conn->consumed_content += buffered_len;
-    }
-
-    nread = 0;
-    while (conn->consumed_content < conn->content_len) {
-      to_read = sizeof(buf);
-      if ((int64_t) to_read > conn->content_len - conn->consumed_content) {
-        to_read = (int) (conn->content_len - conn->consumed_content);
-      }
-      nread = pull(NULL, conn, buf, to_read);
-      if (nread <= 0 || push(fp, sock, ssl, buf, nread) != nread) {
-        break;
-      }
-      conn->consumed_content += nread;
-    }
-
-    if (conn->consumed_content == conn->content_len) {
-      success = nread >= 0;
-    }
-
-    // Each error code path in this function must send an error
-    if (!success) {
-      send_http_error(conn, 577, http_500_error, "%s", "");
-    }
-  }
-
-  return success;
-}
-
-#if !defined(NO_CGI)
-// This structure helps to create an environment for the spawned CGI program.
-// Environment is an array of "VARIABLE=VALUE\0" ASCIIZ strings,
-// last element must be NULL.
-// However, on Windows there is a requirement that all these VARIABLE=VALUE\0
-// strings must reside in a contiguous buffer. The end of the buffer is
-// marked by two '\0' characters.
-// We satisfy both worlds: we create an envp array (which is vars), all
-// entries are actually pointers inside buf.
-struct cgi_env_block {
-  struct mg_connection *conn;
-  char buf[CGI_ENVIRONMENT_SIZE]; // Environment buffer
-  int len; // Space taken
-  char *vars[MAX_CGI_ENVIR_VARS]; // char **envp
-  int nvars; // Number of variables
-};
-
-static char *addenv(struct cgi_env_block *block,
-                    PRINTF_FORMAT_STRING(const char *fmt), ...)
-  PRINTF_ARGS(2, 3);
-
-// Append VARIABLE=VALUE\0 string to the buffer, and add a respective
-// pointer into the vars array.
-static char *addenv(struct cgi_env_block *block, const char *fmt, ...) {
-  int n, space;
-  char *added;
-  va_list ap;
-
-  // Calculate how much space is left in the buffer
-  space = sizeof(block->buf) - block->len - 2;
-  assert(space >= 0);
-
-  // Make a pointer to the free space int the buffer
-  added = block->buf + block->len;
-
-  // Copy VARIABLE=VALUE\0 string into the free space
-  va_start(ap, fmt);
-  n = mg_vsnprintf(block->conn, added, (size_t) space, fmt, ap);
-  va_end(ap);
-
-  // Make sure we do not overflow buffer and the envp array
-  if (n > 0 && n + 1 < space &&
-      block->nvars < (int) ARRAY_SIZE(block->vars) - 2) {
-    // Append a pointer to the added string into the envp array
-    block->vars[block->nvars++] = added;
-    // Bump up used length counter. Include \0 terminator
-    block->len += n + 1;
-  } else {
-    cry(block->conn, "%s: CGI env buffer truncated for [%s]", __func__, fmt);
-  }
-
-  return added;
-}
-
-static void prepare_cgi_environment(struct mg_connection *conn,
-                                    const char *prog,
-                                    struct cgi_env_block *blk) {
-  const char *s, *slash;
-  struct vec var_vec;
-  char *p, src_addr[20];
-  int  i;
-
-  blk->len = blk->nvars = 0;
-  blk->conn = conn;
-  sockaddr_to_string(src_addr, sizeof(src_addr), &conn->client.rsa);
-
-  addenv(blk, "SERVER_NAME=%s", conn->ctx->config[AUTHENTICATION_DOMAIN]);
-  addenv(blk, "SERVER_ROOT=%s", conn->ctx->config[DOCUMENT_ROOT]);
-  addenv(blk, "DOCUMENT_ROOT=%s", conn->ctx->config[DOCUMENT_ROOT]);
-
-  // Prepare the environment block
-  addenv(blk, "%s", "GATEWAY_INTERFACE=CGI/1.1");
-  addenv(blk, "%s", "SERVER_PROTOCOL=HTTP/1.1");
-  addenv(blk, "%s", "REDIRECT_STATUS=200"); // For PHP
-
-  // TODO(lsm): fix this for IPv6 case
-  addenv(blk, "SERVER_PORT=%d", ntohs(conn->client.lsa.sin.sin_port));
-
-  addenv(blk, "REQUEST_METHOD=%s", conn->request_info.request_method);
-  addenv(blk, "REMOTE_ADDR=%s", src_addr);
-  addenv(blk, "REMOTE_PORT=%d", conn->request_info.remote_port);
-  addenv(blk, "REQUEST_URI=%s", conn->request_info.uri);
-
-  // SCRIPT_NAME
-  assert(conn->request_info.uri[0] == '/');
-  slash = strrchr(conn->request_info.uri, '/');
-  if ((s = strrchr(prog, '/')) == NULL)
-    s = prog;
-  addenv(blk, "SCRIPT_NAME=%.*s%s", (int) (slash - conn->request_info.uri),
-         conn->request_info.uri, s);
-
-  addenv(blk, "SCRIPT_FILENAME=%s", prog);
-  addenv(blk, "PATH_TRANSLATED=%s", prog);
-  addenv(blk, "HTTPS=%s", conn->ssl == NULL ? "off" : "on");
-
-  if ((s = mg_get_header(conn, "Content-Type")) != NULL)
-    addenv(blk, "CONTENT_TYPE=%s", s);
-
-  if (conn->request_info.query_string != NULL)
-    addenv(blk, "QUERY_STRING=%s", conn->request_info.query_string);
-
-  if ((s = mg_get_header(conn, "Content-Length")) != NULL)
-    addenv(blk, "CONTENT_LENGTH=%s", s);
-
-  if ((s = getenv("PATH")) != NULL)
-    addenv(blk, "PATH=%s", s);
-
-  if (conn->path_info != NULL) {
-    addenv(blk, "PATH_INFO=%s", conn->path_info);
-  }
-
-#if defined(_WIN32)
-  if ((s = getenv("COMSPEC")) != NULL) {
-    addenv(blk, "COMSPEC=%s", s);
-  }
-  if ((s = getenv("SYSTEMROOT")) != NULL) {
-    addenv(blk, "SYSTEMROOT=%s", s);
-  }
-  if ((s = getenv("SystemDrive")) != NULL) {
-    addenv(blk, "SystemDrive=%s", s);
-  }
-#else
-  if ((s = getenv("LD_LIBRARY_PATH")) != NULL)
-    addenv(blk, "LD_LIBRARY_PATH=%s", s);
-#endif // _WIN32
-
-  if ((s = getenv("PERLLIB")) != NULL)
-    addenv(blk, "PERLLIB=%s", s);
-
-  if (conn->request_info.remote_user != NULL) {
-    addenv(blk, "REMOTE_USER=%s", conn->request_info.remote_user);
-    addenv(blk, "%s", "AUTH_TYPE=Digest");
-  }
-
-  // Add all headers as HTTP_* variables
-  for (i = 0; i < conn->request_info.num_headers; i++) {
-    p = addenv(blk, "HTTP_%s=%s",
-        conn->request_info.http_headers[i].name,
-        conn->request_info.http_headers[i].value);
-
-    // Convert variable name into uppercase, and change - to _
-    for (; *p != '=' && *p != '\0'; p++) {
-      if (*p == '-')
-        *p = '_';
-      *p = (char) toupper(* (unsigned char *) p);
-    }
-  }
-
-  // Add user-specified variables
-  s = conn->ctx->config[CGI_ENVIRONMENT];
-  while ((s = next_option(s, &var_vec, NULL)) != NULL) {
-    addenv(blk, "%.*s", (int) var_vec.len, var_vec.ptr);
-  }
-
-  blk->vars[blk->nvars++] = NULL;
-  blk->buf[blk->len++] = '\0';
-
-  assert(blk->nvars < (int) ARRAY_SIZE(blk->vars));
-  assert(blk->len > 0);
-  assert(blk->len < (int) sizeof(blk->buf));
-}
-
-static void handle_cgi_request(struct mg_connection *conn, const char *prog) {
-  int headers_len, data_len, i, fd_stdin[2], fd_stdout[2];
-  const char *status, *status_text;
-  char buf[16384], *pbuf, dir[PATH_MAX], *p;
-  struct mg_request_info ri;
-  struct cgi_env_block blk;
-  FILE *in, *out;
-  struct file fout = STRUCT_FILE_INITIALIZER;
-  pid_t pid;
-
-  prepare_cgi_environment(conn, prog, &blk);
-
-  // CGI must be executed in its own directory. 'dir' must point to the
-  // directory containing executable program, 'p' must point to the
-  // executable program name relative to 'dir'.
-  (void) mg_snprintf(conn, dir, sizeof(dir), "%s", prog);
-  if ((p = strrchr(dir, '/')) != NULL) {
-    *p++ = '\0';
-  } else {
-    dir[0] = '.', dir[1] = '\0';
-    p = (char *) prog;
-  }
-
-  pid = (pid_t) -1;
-  fd_stdin[0] = fd_stdin[1] = fd_stdout[0] = fd_stdout[1] = -1;
-  in = out = NULL;
-
-  if (pipe(fd_stdin) != 0 || pipe(fd_stdout) != 0) {
-    send_http_error(conn, 500, http_500_error,
-        "Cannot create CGI pipe: %s", strerror(ERRNO));
-    goto done;
-  }
-
-  pid = spawn_process(conn, p, blk.buf, blk.vars, fd_stdin[0], fd_stdout[1],
-                      dir);
-  // spawn_process() must close those!
-  // If we don't mark them as closed, close() attempt before
-  // return from this function throws an exception on Windows.
-  // Windows does not like when closed descriptor is closed again.
-  fd_stdin[0] = fd_stdout[1] = -1;
-
-  if (pid == (pid_t) -1) {
-    send_http_error(conn, 500, http_500_error,
-        "Cannot spawn CGI process [%s]: %s", prog, strerror(ERRNO));
-    goto done;
-  }
-
-  if ((in = fdopen(fd_stdin[1], "wb")) == NULL ||
-      (out = fdopen(fd_stdout[0], "rb")) == NULL) {
-    send_http_error(conn, 500, http_500_error,
-        "fopen: %s", strerror(ERRNO));
-    goto done;
-  }
-
-  setbuf(in, NULL);
-  setbuf(out, NULL);
-  fout.fp = out;
-
-  // Send POST data to the CGI process if needed
-  if (!strcmp(conn->request_info.request_method, "POST") &&
-      !forward_body_data(conn, in, INVALID_SOCKET, NULL)) {
-    goto done;
-  }
-
-  // Close so child gets an EOF.
-  fclose(in);
-  in = NULL;
-  fd_stdin[1] = -1;
-
-  // Now read CGI reply into a buffer. We need to set correct
-  // status code, thus we need to see all HTTP headers first.
-  // Do not send anything back to client, until we buffer in all
-  // HTTP headers.
-  data_len = 0;
-  headers_len = read_request(out, conn, buf, sizeof(buf), &data_len);
-  if (headers_len <= 0) {
-    send_http_error(conn, 500, http_500_error,
-                    "CGI program sent malformed or too big (>%u bytes) "
-                    "HTTP headers: [%.*s]",
-                    (unsigned) sizeof(buf), data_len, buf);
-    goto done;
-  }
-  pbuf = buf;
-  buf[headers_len - 1] = '\0';
-  parse_http_headers(&pbuf, &ri);
-
-  // Make up and send the status line
-  status_text = "OK";
-  if ((status = get_header(&ri, "Status")) != NULL) {
-    conn->status_code = atoi(status);
-    status_text = status;
-    while (isdigit(* (unsigned char *) status_text) || *status_text == ' ') {
-      status_text++;
-    }
-  } else if (get_header(&ri, "Location") != NULL) {
-    conn->status_code = 302;
-  } else {
-    conn->status_code = 200;
-  }
-  if (get_header(&ri, "Connection") != NULL &&
-      !mg_strcasecmp(get_header(&ri, "Connection"), "keep-alive")) {
-    conn->must_close = 1;
-  }
-  (void) mg_printf(conn, "HTTP/1.1 %d %s\r\n", conn->status_code,
-                   status_text);
-
-  // Send headers
-  for (i = 0; i < ri.num_headers; i++) {
-    mg_printf(conn, "%s: %s\r\n",
-              ri.http_headers[i].name, ri.http_headers[i].value);
-  }
-  mg_write(conn, "\r\n", 2);
-
-  // Send chunk of data that may have been read after the headers
-  conn->num_bytes_sent += mg_write(conn, buf + headers_len,
-                                   (size_t)(data_len - headers_len));
-
-  // Read the rest of CGI output and send to the client
-  send_file_data(conn, &fout, 0, INT64_MAX);
-
-done:
-  if (pid != (pid_t) -1) {
-    kill(pid, SIGKILL);
-  }
-  if (fd_stdin[0] != -1) {
-    close(fd_stdin[0]);
-  }
-  if (fd_stdout[1] != -1) {
-    close(fd_stdout[1]);
-  }
-
-  if (in != NULL) {
-    fclose(in);
-  } else if (fd_stdin[1] != -1) {
-    close(fd_stdin[1]);
-  }
-
-  if (out != NULL) {
-    fclose(out);
-  } else if (fd_stdout[0] != -1) {
-    close(fd_stdout[0]);
-  }
-}
-#endif // !NO_CGI
-
-// For a given PUT path, create all intermediate subdirectories
-// for given path. Return 0 if the path itself is a directory,
-// or -1 on error, 1 if OK.
-static int put_dir(struct mg_connection *conn, const char *path) {
-  char buf[PATH_MAX];
-  const char *s, *p;
-  struct file file = STRUCT_FILE_INITIALIZER;
-  int len, res = 1;
-
-  for (s = p = path + 2; (p = strchr(s, '/')) != NULL; s = ++p) {
-    len = p - path;
-    if (len >= (int) sizeof(buf)) {
-      res = -1;
-      break;
-    }
-    memcpy(buf, path, len);
-    buf[len] = '\0';
-
-    // Try to create intermediate directory
-    DEBUG_TRACE(("mkdir(%s)", buf));
-    if (!mg_stat(conn, buf, &file) && mg_mkdir(buf, 0755) != 0) {
-      res = -1;
-      break;
-    }
-
-    // Is path itself a directory?
-    if (p[1] == '\0') {
-      res = 0;
-    }
-  }
-
-  return res;
-}
-
-static void put_file(struct mg_connection *conn, const char *path) {
-  struct file file = STRUCT_FILE_INITIALIZER;
-  const char *range;
-  int64_t r1, r2;
-  int rc;
-
-  conn->status_code = mg_stat(conn, path, &file) ? 200 : 201;
-
-  if ((rc = put_dir(conn, path)) == 0) {
-    mg_printf(conn, "HTTP/1.1 %d OK\r\n\r\n", conn->status_code);
-  } else if (rc == -1) {
-    send_http_error(conn, 500, http_500_error,
-                    "put_dir(%s): %s", path, strerror(ERRNO));
-  } else if (!mg_fopen(conn, path, "wb+", &file) || file.fp == NULL) {
-    mg_fclose(&file);
-    send_http_error(conn, 500, http_500_error,
-                    "fopen(%s): %s", path, strerror(ERRNO));
-  } else {
-    fclose_on_exec(&file);
-    range = mg_get_header(conn, "Content-Range");
-    r1 = r2 = 0;
-    if (range != NULL && parse_range_header(range, &r1, &r2) > 0) {
-      conn->status_code = 206;
-      fseeko(file.fp, r1, SEEK_SET);
-    }
-    if (forward_body_data(conn, file.fp, INVALID_SOCKET, NULL)) {
-      mg_printf(conn, "HTTP/1.1 %d OK\r\n\r\n", conn->status_code);
-    }
-    mg_fclose(&file);
-  }
-}
-
-static void send_ssi_file(struct mg_connection *, const char *,
-                          struct file *, int);
-
-static void do_ssi_include(struct mg_connection *conn, const char *ssi,
-                           char *tag, int include_level) {
-  char file_name[MG_BUF_LEN], path[PATH_MAX], *p;
-  struct file file = STRUCT_FILE_INITIALIZER;
-
-  // sscanf() is safe here, since send_ssi_file() also uses buffer
-  // of size MG_BUF_LEN to get the tag. So strlen(tag) is always < MG_BUF_LEN.
-  if (sscanf(tag, " virtual=\"%[^\"]\"", file_name) == 1) {
-    // File name is relative to the webserver root
-    (void) mg_snprintf(conn, path, sizeof(path), "%s%c%s",
-        conn->ctx->config[DOCUMENT_ROOT], '/', file_name);
-  } else if (sscanf(tag, " file=\"%[^\"]\"", file_name) == 1) {
-    // File name is relative to the webserver working directory
-    // or it is absolute system path
-    (void) mg_snprintf(conn, path, sizeof(path), "%s", file_name);
-  } else if (sscanf(tag, " \"%[^\"]\"", file_name) == 1) {
-    // File name is relative to the currect document
-    (void) mg_snprintf(conn, path, sizeof(path), "%s", ssi);
-    if ((p = strrchr(path, '/')) != NULL) {
-      p[1] = '\0';
-    }
-    (void) mg_snprintf(conn, path + strlen(path),
-        sizeof(path) - strlen(path), "%s", file_name);
-  } else {
-    cry(conn, "Bad SSI #include: [%s]", tag);
-    return;
-  }
-
-  if (!mg_fopen(conn, path, "rb", &file)) {
-    cry(conn, "Cannot open SSI #include: [%s]: fopen(%s): %s",
-        tag, path, strerror(ERRNO));
-  } else {
-    fclose_on_exec(&file);
-    if (match_prefix(conn->ctx->config[SSI_EXTENSIONS],
-                     strlen(conn->ctx->config[SSI_EXTENSIONS]), path) > 0) {
-      send_ssi_file(conn, path, &file, include_level + 1);
-    } else {
-      send_file_data(conn, &file, 0, INT64_MAX);
-    }
-    mg_fclose(&file);
-  }
-}
-
-#if !defined(NO_POPEN)
-static void do_ssi_exec(struct mg_connection *conn, char *tag) {
-  char cmd[MG_BUF_LEN];
-  struct file file = STRUCT_FILE_INITIALIZER;
-
-  if (sscanf(tag, " \"%[^\"]\"", cmd) != 1) {
-    cry(conn, "Bad SSI #exec: [%s]", tag);
-  } else if ((file.fp = popen(cmd, "r")) == NULL) {
-    cry(conn, "Cannot SSI #exec: [%s]: %s", cmd, strerror(ERRNO));
-  } else {
-    send_file_data(conn, &file, 0, INT64_MAX);
-    pclose(file.fp);
-  }
-}
-#endif // !NO_POPEN
-
-static int mg_fgetc(struct file *filep, int offset) {
-  if (filep->membuf != NULL && offset >=0 && offset < filep->size) {
-    return ((unsigned char *) filep->membuf)[offset];
-  } else if (filep->fp != NULL) {
-    return fgetc(filep->fp);
-  } else {
-    return EOF;
-  }
-}
-
-static void send_ssi_file(struct mg_connection *conn, const char *path,
-                          struct file *filep, int include_level) {
-  char buf[MG_BUF_LEN];
-  int ch, offset, len, in_ssi_tag;
-
-  if (include_level > 10) {
-    cry(conn, "SSI #include level is too deep (%s)", path);
-    return;
-  }
-
-  in_ssi_tag = len = offset = 0;
-  while ((ch = mg_fgetc(filep, offset)) != EOF) {
-    if (in_ssi_tag && ch == '>') {
-      in_ssi_tag = 0;
-      buf[len++] = (char) ch;
-      buf[len] = '\0';
-      assert(len <= (int) sizeof(buf));
-      if (len < 6 || memcmp(buf, "<!--#", 5) != 0) {
-        // Not an SSI tag, pass it
-        (void) mg_write(conn, buf, (size_t) len);
-      } else {
-        if (!memcmp(buf + 5, "include", 7)) {
-          do_ssi_include(conn, path, buf + 12, include_level);
-#if !defined(NO_POPEN)
-        } else if (!memcmp(buf + 5, "exec", 4)) {
-          do_ssi_exec(conn, buf + 9);
-#endif // !NO_POPEN
-        } else {
-          cry(conn, "%s: unknown SSI " "command: \"%s\"", path, buf);
-        }
-      }
-      len = 0;
-    } else if (in_ssi_tag) {
-      if (len == 5 && memcmp(buf, "<!--#", 5) != 0) {
-        // Not an SSI tag
-        in_ssi_tag = 0;
-      } else if (len == (int) sizeof(buf) - 2) {
-        cry(conn, "%s: SSI tag is too large", path);
-        len = 0;
-      }
-      buf[len++] = ch & 0xff;
-    } else if (ch == '<') {
-      in_ssi_tag = 1;
-      if (len > 0) {
-        mg_write(conn, buf, (size_t) len);
-      }
-      len = 0;
-      buf[len++] = ch & 0xff;
-    } else {
-      buf[len++] = ch & 0xff;
-      if (len == (int) sizeof(buf)) {
-        mg_write(conn, buf, (size_t) len);
-        len = 0;
-      }
-    }
-  }
-
-  // Send the rest of buffered data
-  if (len > 0) {
-    mg_write(conn, buf, (size_t) len);
-  }
-}
-
-static void handle_ssi_file_request(struct mg_connection *conn,
-                                    const char *path) {
-  struct file file = STRUCT_FILE_INITIALIZER;
-
-  if (!mg_fopen(conn, path, "rb", &file)) {
-    send_http_error(conn, 500, http_500_error, "fopen(%s): %s", path,
-                    strerror(ERRNO));
-  } else {
-    conn->must_close = 1;
-    fclose_on_exec(&file);
-    mg_printf(conn, "HTTP/1.1 200 OK\r\n"
-              "Content-Type: text/html\r\nConnection: %s\r\n\r\n",
-              suggest_connection_header(conn));
-    send_ssi_file(conn, path, &file, 0);
-    mg_fclose(&file);
-  }
-}
-
-static void send_options(struct mg_connection *conn) {
-  conn->status_code = 200;
-
-  mg_printf(conn, "%s", "HTTP/1.1 200 OK\r\n"
-            "Allow: GET, POST, HEAD, CONNECT, PUT, DELETE, OPTIONS\r\n"
-            "DAV: 1\r\n\r\n");
-}
-
-// Writes PROPFIND properties for a collection element
-static void print_props(struct mg_connection *conn, const char* uri,
-                        struct file *filep) {
-  char mtime[64];
-  gmt_time_string(mtime, sizeof(mtime), &filep->modification_time);
-  conn->num_bytes_sent += mg_printf(conn,
-      "<d:response>"
-       "<d:href>%s</d:href>"
-       "<d:propstat>"
-        "<d:prop>"
-         "<d:resourcetype>%s</d:resourcetype>"
-         "<d:getcontentlength>%" INT64_FMT "</d:getcontentlength>"
-         "<d:getlastmodified>%s</d:getlastmodified>"
-        "</d:prop>"
-        "<d:status>HTTP/1.1 200 OK</d:status>"
-       "</d:propstat>"
-      "</d:response>\n",
-      uri,
-      filep->is_directory ? "<d:collection/>" : "",
-      filep->size,
-      mtime);
-}
-
-static void print_dav_dir_entry(struct de *de, void *data) {
-  char href[PATH_MAX];
-  struct mg_connection *conn = (struct mg_connection *) data;
-  mg_snprintf(conn, href, sizeof(href), "%s%s",
-              conn->request_info.uri, de->file_name);
-  print_props(conn, href, &de->file);
-}
-
-static void handle_propfind(struct mg_connection *conn, const char *path,
-                            struct file *filep) {
-  const char *depth = mg_get_header(conn, "Depth");
-
-  conn->must_close = 1;
-  conn->status_code = 207;
-  mg_printf(conn, "HTTP/1.1 207 Multi-Status\r\n"
-            "Connection: close\r\n"
-            "Content-Type: text/xml; charset=utf-8\r\n\r\n");
-
-  conn->num_bytes_sent += mg_printf(conn,
-      "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
-      "<d:multistatus xmlns:d='DAV:'>\n");
-
-  // Print properties for the requested resource itself
-  print_props(conn, conn->request_info.uri, filep);
-
-  // If it is a directory, print directory entries too if Depth is not 0
-  if (filep->is_directory &&
-      !mg_strcasecmp(conn->ctx->config[ENABLE_DIRECTORY_LISTING], "yes") &&
-      (depth == NULL || strcmp(depth, "0") != 0)) {
-    scan_directory(conn, path, conn, &print_dav_dir_entry);
-  }
-
-  conn->num_bytes_sent += mg_printf(conn, "%s\n", "</d:multistatus>");
-}
-
-#if defined(USE_WEBSOCKET)
-
-// START OF SHA-1 code
-// Copyright(c) By Steve Reid <steve@edmweb.com>
-#define SHA1HANDSOFF
-#if defined(__sun)
-#include "solarisfixes.h"
-#endif
-
-union char64long16 { unsigned char c[64]; uint32_t l[16]; };
-
-#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
-
-static uint32_t blk0(union char64long16 *block, int i) {
-  // Forrest: SHA expect BIG_ENDIAN, swap if LITTLE_ENDIAN
-  if (!is_big_endian()) {
-    block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) |
-      (rol(block->l[i], 8) & 0x00FF00FF);
-  }
-  return block->l[i];
-}
-
-#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
-    ^block->l[(i+2)&15]^block->l[i&15],1))
-#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(block, i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
-#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
-#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
-
-typedef struct {
-    uint32_t state[5];
-    uint32_t count[2];
-    unsigned char buffer[64];
-} SHA1_CTX;
-
-static void SHA1Transform(uint32_t state[5], const unsigned char buffer[64]) {
-  uint32_t a, b, c, d, e;
-  union char64long16 block[1];
-
-  memcpy(block, buffer, 64);
-  a = state[0];
-  b = state[1];
-  c = state[2];
-  d = state[3];
-  e = state[4];
-  R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
-  R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
-  R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
-  R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
-  R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
-  R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
-  R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
-  R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
-  R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
-  R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
-  R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
-  R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
-  R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
-  R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
-  R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
-  R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
-  R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
-  R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
-  R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
-  R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
-  state[0] += a;
-  state[1] += b;
-  state[2] += c;
-  state[3] += d;
-  state[4] += e;
-  a = b = c = d = e = 0;
-  memset(block, '\0', sizeof(block));
-}
-
-static void SHA1Init(SHA1_CTX* context) {
-  context->state[0] = 0x67452301;
-  context->state[1] = 0xEFCDAB89;
-  context->state[2] = 0x98BADCFE;
-  context->state[3] = 0x10325476;
-  context->state[4] = 0xC3D2E1F0;
-  context->count[0] = context->count[1] = 0;
-}
-
-static void SHA1Update(SHA1_CTX* context, const unsigned char* data,
-                       uint32_t len) {
-  uint32_t i, j;
-
-  j = context->count[0];
-  if ((context->count[0] += len << 3) < j)
-    context->count[1]++;
-  context->count[1] += (len>>29);
-  j = (j >> 3) & 63;
-  if ((j + len) > 63) {
-    memcpy(&context->buffer[j], data, (i = 64-j));
-    SHA1Transform(context->state, context->buffer);
-    for ( ; i + 63 < len; i += 64) {
-      SHA1Transform(context->state, &data[i]);
-    }
-    j = 0;
-  }
-  else i = 0;
-  memcpy(&context->buffer[j], &data[i], len - i);
-}
-
-static void SHA1Final(unsigned char digest[20], SHA1_CTX* context) {
-  unsigned i;
-  unsigned char finalcount[8], c;
-
-  for (i = 0; i < 8; i++) {
-    finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
-                                     >> ((3-(i & 3)) * 8) ) & 255);
-  }
-  c = 0200;
-  SHA1Update(context, &c, 1);
-  while ((context->count[0] & 504) != 448) {
-    c = 0000;
-    SHA1Update(context, &c, 1);
-  }
-  SHA1Update(context, finalcount, 8);
-  for (i = 0; i < 20; i++) {
-    digest[i] = (unsigned char)
-      ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
-  }
-  memset(context, '\0', sizeof(*context));
-  memset(&finalcount, '\0', sizeof(finalcount));
-}
-// END OF SHA1 CODE
-
-static void base64_encode(const unsigned char *src, int src_len, char *dst) {
-  static const char *b64 =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-  int i, j, a, b, c;
-
-  for (i = j = 0; i < src_len; i += 3) {
-    a = src[i];
-    b = i + 1 >= src_len ? 0 : src[i + 1];
-    c = i + 2 >= src_len ? 0 : src[i + 2];
-
-    dst[j++] = b64[a >> 2];
-    dst[j++] = b64[((a & 3) << 4) | (b >> 4)];
-    if (i + 1 < src_len) {
-      dst[j++] = b64[(b & 15) << 2 | (c >> 6)];
-    }
-    if (i + 2 < src_len) {
-      dst[j++] = b64[c & 63];
-    }
-  }
-  while (j % 4 != 0) {
-    dst[j++] = '=';
-  }
-  dst[j++] = '\0';
-}
-
-static void send_websocket_handshake(struct mg_connection *conn) {
-  static const char *magic = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-  char buf[100], sha[20], b64_sha[sizeof(sha) * 2];
-  SHA1_CTX sha_ctx;
-
-  mg_snprintf(conn, buf, sizeof(buf), "%s%s",
-              mg_get_header(conn, "Sec-WebSocket-Key"), magic);
-  SHA1Init(&sha_ctx);
-  SHA1Update(&sha_ctx, (unsigned char *) buf, strlen(buf));
-  SHA1Final((unsigned char *) sha, &sha_ctx);
-  base64_encode((unsigned char *) sha, sizeof(sha), b64_sha);
-  mg_printf(conn, "%s%s%s",
-            "HTTP/1.1 101 Switching Protocols\r\n"
-            "Upgrade: websocket\r\n"
-            "Connection: Upgrade\r\n"
-            "Sec-WebSocket-Accept: ", b64_sha, "\r\n\r\n");
-}
-
-static void read_websocket(struct mg_connection *conn) {
-  unsigned char *buf = (unsigned char *) conn->buf + conn->request_len;
-  int n, len, mask_len, body_len, discard_len;
-
-  for (;;) {
-    if ((body_len = conn->data_len - conn->request_len) >= 2) {
-      len = buf[1] & 127;
-      mask_len = buf[1] & 128 ? 4 : 0;
-      if (len < 126) {
-        conn->content_len = 2 + mask_len + len;
-      } else if (len == 126 && body_len >= 4) {
-        conn->content_len = 4 + mask_len + ((((int) buf[2]) << 8) + buf[3]);
-      } else if (body_len >= 10) {
-        conn->content_len = 10 + mask_len +
-          (((uint64_t) htonl(* (uint32_t *) &buf[2])) << 32) +
-          htonl(* (uint32_t *) &buf[6]);
-      }
-    }
-
-    if (conn->content_len > 0) {
-      if (conn->ctx->callbacks.websocket_data != NULL &&
-          conn->ctx->callbacks.websocket_data(conn) == 0) {
-        break;  // Callback signalled to exit
-      }
-      discard_len = conn->content_len > body_len ?
-          body_len : (int) conn->content_len;
-      memmove(buf, buf + discard_len, conn->data_len - discard_len);
-      conn->data_len -= discard_len;
-      conn->content_len = conn->consumed_content = 0;
-    } else {
-      n = pull(NULL, conn, conn->buf + conn->data_len,
-               conn->buf_size - conn->data_len);
-      if (n <= 0) {
-        break;
-      }
-      conn->data_len += n;
-    }
-  }
-}
-
-static void handle_websocket_request(struct mg_connection *conn) {
-  if (strcmp(mg_get_header(conn, "Sec-WebSocket-Version"), "13") != 0) {
-    send_http_error(conn, 426, "Upgrade Required", "%s", "Upgrade Required");
-  } else if (conn->ctx->callbacks.websocket_connect != NULL &&
-             conn->ctx->callbacks.websocket_connect(conn) != 0) {
-    // Callback has returned non-zero, do not proceed with handshake
-  } else {
-    send_websocket_handshake(conn);
-    if (conn->ctx->callbacks.websocket_ready != NULL) {
-      conn->ctx->callbacks.websocket_ready(conn);
-    }
-    read_websocket(conn);
-  }
-}
-
-static int is_websocket_request(const struct mg_connection *conn) {
-  const char *host, *upgrade, *connection, *version, *key;
-
-  host = mg_get_header(conn, "Host");
-  upgrade = mg_get_header(conn, "Upgrade");
-  connection = mg_get_header(conn, "Connection");
-  key = mg_get_header(conn, "Sec-WebSocket-Key");
-  version = mg_get_header(conn, "Sec-WebSocket-Version");
-
-  return host != NULL && upgrade != NULL && connection != NULL &&
-    key != NULL && version != NULL &&
-    strstr(upgrade, "websocket") != NULL &&
-    strstr(connection, "Upgrade") != NULL;
-}
-#endif // !USE_WEBSOCKET
-
-static int isbyte(int n) {
-  return n >= 0 && n <= 255;
-}
-
-static int parse_net(const char *spec, uint32_t *net, uint32_t *mask) {
-  int n, a, b, c, d, slash = 32, len = 0;
-
-  if ((sscanf(spec, "%d.%d.%d.%d/%d%n", &a, &b, &c, &d, &slash, &n) == 5 ||
-      sscanf(spec, "%d.%d.%d.%d%n", &a, &b, &c, &d, &n) == 4) &&
-      isbyte(a) && isbyte(b) && isbyte(c) && isbyte(d) &&
-      slash >= 0 && slash < 33) {
-    len = n;
-    *net = ((uint32_t)a << 24) | ((uint32_t)b << 16) | ((uint32_t)c << 8) | d;
-    *mask = slash ? 0xffffffffU << (32 - slash) : 0;
-  }
-
-  return len;
-}
-
-static int set_throttle(const char *spec, uint32_t remote_ip, const char *uri) {
-  int throttle = 0;
-  struct vec vec, val;
-  uint32_t net, mask;
-  char mult;
-  double v;
-
-  while ((spec = next_option(spec, &vec, &val)) != NULL) {
-    mult = ',';
-    if (sscanf(val.ptr, "%lf%c", &v, &mult) < 1 || v < 0 ||
-        (lowercase(&mult) != 'k' && lowercase(&mult) != 'm' && mult != ',')) {
-      continue;
-    }
-    v *= lowercase(&mult) == 'k' ? 1024 : lowercase(&mult) == 'm' ? 1048576 : 1;
-    if (vec.len == 1 && vec.ptr[0] == '*') {
-      throttle = (int) v;
-    } else if (parse_net(vec.ptr, &net, &mask) > 0) {
-      if ((remote_ip & mask) == net) {
-        throttle = (int) v;
-      }
-    } else if (match_prefix(vec.ptr, vec.len, uri) > 0) {
-      throttle = (int) v;
-    }
-  }
-
-  return throttle;
-}
-
-static uint32_t get_remote_ip(const struct mg_connection *conn) {
-  return ntohl(* (uint32_t *) &conn->client.rsa.sin.sin_addr);
-}
-
-#ifdef USE_LUA
-
-#ifdef _WIN32
-static void *mmap(void *addr, int64_t len, int prot, int flags, int fd,
-                  int offset) {
-  HANDLE fh = (HANDLE) _get_osfhandle(fd);
-  HANDLE mh = CreateFileMapping(fh, 0, PAGE_READONLY, 0, 0, 0);
-  void *p = MapViewOfFile(mh, FILE_MAP_READ, 0, 0, (size_t) len);
-  CloseHandle(fh);
-  CloseHandle(mh);
-  return p;
-}
-#define munmap(x, y)  UnmapViewOfFile(x)
-#define MAP_FAILED NULL
-#define MAP_PRIVATE 0
-#define PROT_READ 0
-#else
-#include <sys/mman.h>
-#endif
-
-static void lsp(struct mg_connection *conn, const char *p, int64_t len,
-                lua_State *L) {
-  int i, j, pos = 0;
-
-  for (i = 0; i < len; i++) {
-    if (p[i] == '<' && p[i + 1] == '?') {
-      for (j = i + 1; j < len ; j++) {
-        if (p[j] == '?' && p[j + 1] == '>') {
-          mg_write(conn, p + pos, i - pos);
-          if (luaL_loadbuffer(L, p + (i + 2), j - (i + 2), "") == LUA_OK) {
-            lua_pcall(L, 0, LUA_MULTRET, 0);
-          }
-          pos = j + 2;
-          i = pos - 1;
-          break;
-        }
-      }
-    }
-  }
-
-  if (i > pos) {
-    mg_write(conn, p + pos, i - pos);
-  }
-}
-
-static int lsp_mg_print(lua_State *L) {
-  int i, num_args;
-  const char *str;
-  size_t size;
-  struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));
-
-  num_args = lua_gettop(L);
-  for (i = 1; i <= num_args; i++) {
-    if (lua_isstring(L, i)) {
-      str = lua_tolstring(L, i, &size);
-      mg_write(conn, str, size);
-    }
-  }
-
-  return 0;
-}
-
-static int lsp_mg_read(lua_State *L) {
-  struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));
-  char buf[1024];
-  int len = mg_read(conn, buf, sizeof(buf));
-
-  lua_settop(L, 0);
-  lua_pushlstring(L, buf, len);
-
-  return 1;
-}
-
-static void reg_string(struct lua_State *L, const char *name, const char *val) {
-  lua_pushstring(L, name);
-  lua_pushstring(L, val);
-  lua_rawset(L, -3);
-}
-
-static void reg_int(struct lua_State *L, const char *name, int val) {
-  lua_pushstring(L, name);
-  lua_pushinteger(L, val);
-  lua_rawset(L, -3);
-}
-
-static void prepare_lua_environment(struct mg_connection *conn, lua_State *L) {
-  const struct mg_request_info *ri = mg_get_request_info(conn);
-  extern void luaL_openlibs(lua_State *);
-  int i;
-
-  luaL_openlibs(L);
-#ifdef USE_LUA_SQLITE3
-  { extern int luaopen_lsqlite3(lua_State *); luaopen_lsqlite3(L); }
-#endif
-
-  // Register "print" function which calls mg_write()
-  lua_pushlightuserdata(L, conn);
-  lua_pushcclosure(L, lsp_mg_print, 1);
-  lua_setglobal(L, "print");
-
-  // Register mg_read()
-  lua_pushlightuserdata(L, conn);
-  lua_pushcclosure(L, lsp_mg_read, 1);
-  lua_setglobal(L, "read");
-
-  // Export request_info
-  lua_newtable(L);
-  reg_string(L, "request_method", ri->request_method);
-  reg_string(L, "uri", ri->uri);
-  reg_string(L, "http_version", ri->http_version);
-  reg_string(L, "query_string", ri->query_string);
-  reg_int(L, "remote_ip", ri->remote_ip);
-  reg_int(L, "remote_port", ri->remote_port);
-  reg_int(L, "num_headers", ri->num_headers);
-  lua_pushstring(L, "http_headers");
-  lua_newtable(L);
-  for (i = 0; i < ri->num_headers; i++) {
-    reg_string(L, ri->http_headers[i].name, ri->http_headers[i].value);
-  }
-  lua_rawset(L, -3);
-  lua_setglobal(L, "request_info");
-}
-
-static void handle_lsp_request(struct mg_connection *conn, const char *path,
-                               struct file *filep) {
-  void *p = NULL;
-  lua_State *L = NULL;
-
-  if (!mg_stat(conn, path, filep) || !mg_fopen(conn, path, "r", filep)) {
-    send_http_error(conn, 404, "Not Found", "%s", "File not found");
-  } else if (filep->membuf == NULL &&
-             (p = mmap(NULL, (size_t) filep->size, PROT_READ, MAP_PRIVATE,
-                       fileno(filep->fp), 0)) == MAP_FAILED) {
-    send_http_error(conn, 500, http_500_error, "mmap(%s, %zu, %d): %s", path,
-                    (size_t) filep->size, fileno(filep->fp), strerror(errno));
-  } else if ((L = luaL_newstate()) == NULL) {
-    send_http_error(conn, 500, http_500_error, "%s", "luaL_newstate failed");
-  } else {
-    // We're not sending HTTP headers here, Lua page must do it.
-    prepare_lua_environment(conn, L);
-    if (conn->ctx->callbacks.init_lua != NULL) {
-      conn->ctx->callbacks.init_lua(conn, L);
-    }
-    lsp(conn, filep->membuf == NULL ? p : filep->membuf, filep->size, L);
-  }
-
-  if (L) lua_close(L);
-  if (p) munmap(p, filep->size);
-  mg_fclose(filep);
-}
-#endif // USE_LUA
-
-int mg_upload(struct mg_connection *conn, const char *destination_dir) {
-  const char *content_type_header, *boundary_start;
-  char buf[MG_BUF_LEN], path[PATH_MAX], fname[1024], boundary[100], *s;
-  FILE *fp;
-  int bl, n, i, j, headers_len, boundary_len, len = 0, num_uploaded_files = 0;
-
-  // Request looks like this:
-  //
-  // POST /upload HTTP/1.1
-  // Host: 127.0.0.1:8080
-  // Content-Length: 244894
-  // Content-Type: multipart/form-data; boundary=----WebKitFormBoundaryRVr
-  //
-  // ------WebKitFormBoundaryRVr
-  // Content-Disposition: form-data; name="file"; filename="accum.png"
-  // Content-Type: image/png
-  //
-  //  <89>PNG
-  //  <PNG DATA>
-  // ------WebKitFormBoundaryRVr
-
-  // Extract boundary string from the Content-Type header
-  if ((content_type_header = mg_get_header(conn, "Content-Type")) == NULL ||
-      (boundary_start = strstr(content_type_header, "boundary=")) == NULL ||
-      (sscanf(boundary_start, "boundary=\"%99[^\"]\"", boundary) == 0 &&
-       sscanf(boundary_start, "boundary=%99s", boundary) == 0) ||
-      boundary[0] == '\0') {
-    return num_uploaded_files;
-  }
-
-  boundary_len = strlen(boundary);
-  bl = boundary_len + 4;  // \r\n--<boundary>
-  for (;;) {
-    // Pull in headers
-    assert(len >= 0 && len <= (int) sizeof(buf));
-    while ((n = mg_read(conn, buf + len, sizeof(buf) - len)) > 0) {
-      len += n;
-    }
-    if ((headers_len = get_request_len(buf, len)) <= 0) {
-      break;
-    }
-
-    // Fetch file name.
-    fname[0] = '\0';
-    for (i = j = 0; i < headers_len; i++) {
-      if (buf[i] == '\r' && buf[i + 1] == '\n') {
-        buf[i] = buf[i + 1] = '\0';
-        // TODO(lsm): don't expect filename to be the 3rd field,
-        // parse the header properly instead.
-        sscanf(&buf[j], "Content-Disposition: %*s %*s filename=\"%1023[^\"]",
-               fname);
-        j = i + 2;
-      }
-    }
-
-    // Give up if the headers are not what we expect
-    if (fname[0] == '\0') {
-      break;
-    }
-
-    // Move data to the beginning of the buffer
-    assert(len >= headers_len);
-    memmove(buf, &buf[headers_len], len - headers_len);
-    len -= headers_len;
-
-    // We open the file with exclusive lock held. This guarantee us
-    // there is no other thread can save into the same file simultaneously.
-    fp = NULL;
-    // Construct destination file name. Do not allow paths to have slashes.
-    if ((s = strrchr(fname, '/')) == NULL) {
-      s = fname;
-    }
-    // Open file in binary mode. TODO: set an exclusive lock.
-    snprintf(path, sizeof(path), "%s/%s", destination_dir, s);
-    if ((fp = fopen(path, "wb")) == NULL) {
-      break;
-    }
-
-    // Read POST data, write into file until boundary is found.
-    n = 0;
-    do {
-      len += n;
-      for (i = 0; i < len - bl; i++) {
-        if (!memcmp(&buf[i], "\r\n--", 4) &&
-            !memcmp(&buf[i + 4], boundary, boundary_len)) {
-          // Found boundary, that's the end of file data.
-          fwrite(buf, 1, i, fp);
-          fflush(fp);
-          num_uploaded_files++;
-          if (conn->ctx->callbacks.upload != NULL) {
-            conn->ctx->callbacks.upload(conn, path);
-          }
-          memmove(buf, &buf[i + bl], len - (i + bl));
-          len -= i + bl;
-          break;
-        }
-      }
-      if (len > bl) {
-        fwrite(buf, 1, len - bl, fp);
-        memmove(buf, &buf[len - bl], bl);
-        len = bl;
-      }
-    } while ((n = mg_read(conn, buf + len, sizeof(buf) - len)) > 0);
-    fclose(fp);
-  }
-
-  return num_uploaded_files;
-}
-
-static int is_put_or_delete_request(const struct mg_connection *conn) {
-  const char *s = conn->request_info.request_method;
-  return s != NULL && (!strcmp(s, "PUT") || !strcmp(s, "DELETE"));
-}
-
-static int get_first_ssl_listener_index(const struct mg_context *ctx) {
-  int i, index = -1;
-  for (i = 0; index == -1 && i < ctx->num_listening_sockets; i++) {
-    index = ctx->listening_sockets[i].is_ssl ? i : -1;
-  }
-  return index;
-}
-
-static void redirect_to_https_port(struct mg_connection *conn, int ssl_index) {
-  char host[1025];
-  const char *host_header;
-
-  if ((host_header = mg_get_header(conn, "Host")) == NULL ||
-      sscanf(host_header, "%1024[^:]", host) == 0) {
-    // Cannot get host from the Host: header. Fallback to our IP address.
-    sockaddr_to_string(host, sizeof(host), &conn->client.lsa);
-  }
-
-  mg_printf(conn, "HTTP/1.1 302 Found\r\nLocation: https://%s:%d%s\r\n\r\n",
-            host, (int) ntohs(conn->ctx->listening_sockets[ssl_index].
-                              lsa.sin.sin_port), conn->request_info.uri);
-}
-
-// This is the heart of the Mongoose's logic.
-// This function is called when the request is read, parsed and validated,
-// and Mongoose must decide what action to take: serve a file, or
-// a directory, or call embedded function, etcetera.
-static void handle_request(struct mg_connection *conn) {
-  struct mg_request_info *ri = &conn->request_info;
-  char path[PATH_MAX];
-  int uri_len, ssl_index;
-  struct file file = STRUCT_FILE_INITIALIZER;
-
-  if ((conn->request_info.query_string = strchr(ri->uri, '?')) != NULL) {
-    * ((char *) conn->request_info.query_string++) = '\0';
-  }
-  uri_len = (int) strlen(ri->uri);
-  url_decode(ri->uri, uri_len, (char *) ri->uri, uri_len + 1, 0);
-  remove_double_dots_and_double_slashes((char *) ri->uri);
-  convert_uri_to_file_name(conn, path, sizeof(path), &file);
-  conn->throttle = set_throttle(conn->ctx->config[THROTTLE],
-                                get_remote_ip(conn), ri->uri);
-
-  DEBUG_TRACE(("%s", ri->uri));
-  if (conn->ctx->callbacks.begin_request != NULL &&
-      conn->ctx->callbacks.begin_request(conn)) {
-    // Do nothing, callback has served the request
-  } else if (!conn->client.is_ssl && conn->client.ssl_redir &&
-      (ssl_index = get_first_ssl_listener_index(conn->ctx)) > -1) {
-    redirect_to_https_port(conn, ssl_index);
-  } else if (!is_put_or_delete_request(conn) &&
-             !check_authorization(conn, path)) {
-    send_authorization_request(conn);
-#if defined(USE_WEBSOCKET)
-  } else if (is_websocket_request(conn)) {
-    handle_websocket_request(conn);
-#endif
-  } else if (!strcmp(ri->request_method, "OPTIONS")) {
-    send_options(conn);
-  } else if (conn->ctx->config[DOCUMENT_ROOT] == NULL) {
-    send_http_error(conn, 404, "Not Found", "Not Found");
-  } else if (is_put_or_delete_request(conn) &&
-             (conn->ctx->config[PUT_DELETE_PASSWORDS_FILE] == NULL ||
-              is_authorized_for_put(conn) != 1)) {
-    send_authorization_request(conn);
-  } else if (!strcmp(ri->request_method, "PUT")) {
-    put_file(conn, path);
-  } else if (!strcmp(ri->request_method, "DELETE")) {
-    if (mg_remove(path) == 0) {
-      send_http_error(conn, 200, "OK", "%s", "");
-    } else {
-      send_http_error(conn, 500, http_500_error, "remove(%s): %s", path,
-                      strerror(ERRNO));
-    }
-  } else if ((file.membuf == NULL && file.modification_time == (time_t) 0) ||
-             must_hide_file(conn, path)) {
-    send_http_error(conn, 404, "Not Found", "%s", "File not found");
-  } else if (file.is_directory && ri->uri[uri_len - 1] != '/') {
-    mg_printf(conn, "HTTP/1.1 301 Moved Permanently\r\n"
-              "Location: %s/\r\n\r\n", ri->uri);
-  } else if (!strcmp(ri->request_method, "PROPFIND")) {
-    handle_propfind(conn, path, &file);
-  } else if (file.is_directory &&
-             !substitute_index_file(conn, path, sizeof(path), &file)) {
-    if (!mg_strcasecmp(conn->ctx->config[ENABLE_DIRECTORY_LISTING], "yes")) {
-      handle_directory_request(conn, path);
-    } else {
-      send_http_error(conn, 403, "Directory Listing Denied",
-          "Directory listing denied");
-    }
-#ifdef USE_LUA
-  } else if (match_prefix("**.lp$", 6, path) > 0) {
-    handle_lsp_request(conn, path, &file);
-#endif
-#if !defined(NO_CGI)
-  } else if (match_prefix(conn->ctx->config[CGI_EXTENSIONS],
-                          strlen(conn->ctx->config[CGI_EXTENSIONS]),
-                          path) > 0) {
-    if (strcmp(ri->request_method, "POST") &&
-        strcmp(ri->request_method, "HEAD") &&
-        strcmp(ri->request_method, "GET")) {
-      send_http_error(conn, 501, "Not Implemented",
-                      "Method %s is not implemented", ri->request_method);
-    } else {
-      handle_cgi_request(conn, path);
-    }
-#endif // !NO_CGI
-  } else if (match_prefix(conn->ctx->config[SSI_EXTENSIONS],
-                          strlen(conn->ctx->config[SSI_EXTENSIONS]),
-                          path) > 0) {
-    handle_ssi_file_request(conn, path);
-  } else if (is_not_modified(conn, &file)) {
-    send_http_error(conn, 304, "Not Modified", "%s", "");
-  } else {
-    handle_file_request(conn, path, &file);
-  }
-}
-
-static void close_all_listening_sockets(struct mg_context *ctx) {
-  int i;
-  for (i = 0; i < ctx->num_listening_sockets; i++) {
-    closesocket(ctx->listening_sockets[i].sock);
-  }
-  free(ctx->listening_sockets);
-}
-
-// Valid listening port specification is: [ip_address:]port[s]
-// Examples: 80, 443s, 127.0.0.1:3128, 1.2.3.4:8080s
-// TODO(lsm): add parsing of the IPv6 address
-static int parse_port_string(const struct vec *vec, struct socket *so) {
-  int a, b, c, d, port, len;
-
-  // MacOS needs that. If we do not zero it, subsequent bind() will fail.
-  // Also, all-zeroes in the socket address means binding to all addresses
-  // for both IPv4 and IPv6 (INADDR_ANY and IN6ADDR_ANY_INIT).
-  memset(so, 0, sizeof(*so));
-
-  if (sscanf(vec->ptr, "%d.%d.%d.%d:%d%n", &a, &b, &c, &d, &port, &len) == 5) {
-    // Bind to a specific IPv4 address
-    so->lsa.sin.sin_addr.s_addr = htonl((a << 24) | (b << 16) | (c << 8) | d);
-  } else if (sscanf(vec->ptr, "%d%n", &port, &len) != 1 ||
-             len <= 0 ||
-             len > (int) vec->len ||
-             (vec->ptr[len] && vec->ptr[len] != 's' &&
-              vec->ptr[len] != 'r' && vec->ptr[len] != ',')) {
-    return 0;
-  }
-
-  so->is_ssl = vec->ptr[len] == 's';
-  so->ssl_redir = vec->ptr[len] == 'r';
-#if defined(USE_IPV6)
-  so->lsa.sin6.sin6_family = AF_INET6;
-  so->lsa.sin6.sin6_port = htons((uint16_t) port);
-#else
-  so->lsa.sin.sin_family = AF_INET;
-  so->lsa.sin.sin_port = htons((uint16_t) port);
-#endif
-
-  return 1;
-}
-
-static int set_ports_option(struct mg_context *ctx) {
-  const char *list = ctx->config[LISTENING_PORTS];
-  int on = 1, success = 1;
-  struct vec vec;
-  struct socket so;
-
-  while (success && (list = next_option(list, &vec, NULL)) != NULL) {
-    if (!parse_port_string(&vec, &so)) {
-      cry(fc(ctx), "%s: %.*s: invalid port spec. Expecting list of: %s",
-          __func__, (int) vec.len, vec.ptr, "[IP_ADDRESS:]PORT[s|p]");
-      success = 0;
-    } else if (so.is_ssl && ctx->ssl_ctx == NULL) {
-      cry(fc(ctx), "Cannot add SSL socket, is -ssl_certificate option set?");
-      success = 0;
-    } else if ((so.sock = socket(so.lsa.sa.sa_family, SOCK_STREAM, 6)) ==
-               INVALID_SOCKET ||
-               // On Windows, SO_REUSEADDR is recommended only for
-               // broadcast UDP sockets
-               setsockopt(so.sock, SOL_SOCKET, SO_REUSEADDR,
-                          (void *) &on, sizeof(on)) != 0 ||
-               bind(so.sock, &so.lsa.sa, sizeof(so.lsa)) != 0 ||
-               listen(so.sock, SOMAXCONN) != 0) {
-      cry(fc(ctx), "%s: cannot bind to %.*s: %s", __func__,
-          (int) vec.len, vec.ptr, strerror(ERRNO));
-      closesocket(so.sock);
-      success = 0;
-    } else {
-      set_close_on_exec(so.sock);
-      // TODO: handle realloc failure
-      ctx->listening_sockets = realloc(ctx->listening_sockets,
-                                       (ctx->num_listening_sockets + 1) *
-                                       sizeof(ctx->listening_sockets[0]));
-      ctx->listening_sockets[ctx->num_listening_sockets] = so;
-      ctx->num_listening_sockets++;
-    }
-  }
-
-  if (!success) {
-    close_all_listening_sockets(ctx);
-  }
-
-  return success;
-}
-
-static void log_header(const struct mg_connection *conn, const char *header,
-                       FILE *fp) {
-  const char *header_value;
-
-  if ((header_value = mg_get_header(conn, header)) == NULL) {
-    (void) fprintf(fp, "%s", " -");
-  } else {
-    (void) fprintf(fp, " \"%s\"", header_value);
-  }
-}
-
-static void log_access(const struct mg_connection *conn) {
-  const struct mg_request_info *ri;
-  FILE *fp;
-  char date[64], src_addr[20];
-
-  fp = conn->ctx->config[ACCESS_LOG_FILE] == NULL ?  NULL :
-    fopen(conn->ctx->config[ACCESS_LOG_FILE], "a+");
-
-  if (fp == NULL)
-    return;
-
-  strftime(date, sizeof(date), "%d/%b/%Y:%H:%M:%S %z",
-           localtime(&conn->birth_time));
-
-  ri = &conn->request_info;
-  flockfile(fp);
-
-  sockaddr_to_string(src_addr, sizeof(src_addr), &conn->client.rsa);
-  fprintf(fp, "%s - %s [%s] \"%s %s HTTP/%s\" %d %" INT64_FMT,
-          src_addr, ri->remote_user == NULL ? "-" : ri->remote_user, date,
-          ri->request_method ? ri->request_method : "-",
-          ri->uri ? ri->uri : "-", ri->http_version,
-          conn->status_code, conn->num_bytes_sent);
-  log_header(conn, "Referer", fp);
-  log_header(conn, "User-Agent", fp);
-  fputc('\n', fp);
-  fflush(fp);
-
-  funlockfile(fp);
-  fclose(fp);
-}
-
-// Verify given socket address against the ACL.
-// Return -1 if ACL is malformed, 0 if address is disallowed, 1 if allowed.
-static int check_acl(struct mg_context *ctx, uint32_t remote_ip) {
-  int allowed, flag;
-  uint32_t net, mask;
-  struct vec vec;
-  const char *list = ctx->config[ACCESS_CONTROL_LIST];
-
-  // If any ACL is set, deny by default
-  allowed = list == NULL ? '+' : '-';
-
-  while ((list = next_option(list, &vec, NULL)) != NULL) {
-    flag = vec.ptr[0];
-    if ((flag != '+' && flag != '-') ||
-        parse_net(&vec.ptr[1], &net, &mask) == 0) {
-      cry(fc(ctx), "%s: subnet must be [+|-]x.x.x.x[/x]", __func__);
-      return -1;
-    }
-
-    if (net == (remote_ip & mask)) {
-      allowed = flag;
-    }
-  }
-
-  return allowed == '+';
-}
-
-#if !defined(_WIN32)
-static int set_uid_option(struct mg_context *ctx) {
-  struct passwd *pw;
-  const char *uid = ctx->config[RUN_AS_USER];
-  int success = 0;
-
-  if (uid == NULL) {
-    success = 1;
-  } else {
-    if ((pw = getpwnam(uid)) == NULL) {
-      cry(fc(ctx), "%s: unknown user [%s]", __func__, uid);
-    } else if (setgid(pw->pw_gid) == -1) {
-      cry(fc(ctx), "%s: setgid(%s): %s", __func__, uid, strerror(errno));
-    } else if (setuid(pw->pw_uid) == -1) {
-      cry(fc(ctx), "%s: setuid(%s): %s", __func__, uid, strerror(errno));
-    } else {
-      success = 1;
-    }
-  }
-
-  return success;
-}
-#endif // !_WIN32
-
-#if !defined(NO_SSL)
-static pthread_mutex_t *ssl_mutexes;
-
-static int sslize(struct mg_connection *conn, SSL_CTX *s, int (*func)(SSL *)) {
-  return (conn->ssl = SSL_new(s)) != NULL &&
-    SSL_set_fd(conn->ssl, conn->client.sock) == 1 &&
-    func(conn->ssl) == 1;
-}
-
-// Return OpenSSL error message
-static const char *ssl_error(void) {
-  unsigned long err;
-  err = ERR_get_error();
-  return err == 0 ? "" : ERR_error_string(err, NULL);
-}
-
-static void ssl_locking_callback(int mode, int mutex_num, const char *file,
-                                 int line) {
-  (void) line;
-  (void) file;
-
-  if (mode & 1) {  // 1 is CRYPTO_LOCK
-    (void) pthread_mutex_lock(&ssl_mutexes[mutex_num]);
-  } else {
-    (void) pthread_mutex_unlock(&ssl_mutexes[mutex_num]);
-  }
-}
-
-static unsigned long ssl_id_callback(void) {
-  return (unsigned long) pthread_self();
-}
-
-#if !defined(NO_SSL_DL)
-static int load_dll(struct mg_context *ctx, const char *dll_name,
-                    struct ssl_func *sw) {
-  union {void *p; void (*fp)(void);} u;
-  void  *dll_handle;
-  struct ssl_func *fp;
-
-  if ((dll_handle = dlopen(dll_name, RTLD_LAZY)) == NULL) {
-    cry(fc(ctx), "%s: cannot load %s", __func__, dll_name);
-    return 0;
-  }
-
-  for (fp = sw; fp->name != NULL; fp++) {
-#ifdef _WIN32
-    // GetProcAddress() returns pointer to function
-    u.fp = (void (*)(void)) dlsym(dll_handle, fp->name);
-#else
-    // dlsym() on UNIX returns void *. ISO C forbids casts of data pointers to
-    // function pointers. We need to use a union to make a cast.
-    u.p = dlsym(dll_handle, fp->name);
-#endif // _WIN32
-    if (u.fp == NULL) {
-      cry(fc(ctx), "%s: %s: cannot find %s", __func__, dll_name, fp->name);
-      return 0;
-    } else {
-      fp->ptr = u.fp;
-    }
-  }
-
-  return 1;
-}
-#endif // NO_SSL_DL
-
-// Dynamically load SSL library. Set up ctx->ssl_ctx pointer.
-static int set_ssl_option(struct mg_context *ctx) {
-  int i, size;
-  const char *pem;
-
-  // If PEM file is not specified, skip SSL initialization.
-  if ((pem = ctx->config[SSL_CERTIFICATE]) == NULL) {
-    return 1;
-  }
-
-#if !defined(NO_SSL_DL)
-  if (!load_dll(ctx, SSL_LIB, ssl_sw) ||
-      !load_dll(ctx, CRYPTO_LIB, crypto_sw)) {
-    return 0;
-  }
-#endif // NO_SSL_DL
-
-  // Initialize SSL library
-  SSL_library_init();
-  SSL_load_error_strings();
-
-  if ((ctx->ssl_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL) {
-    cry(fc(ctx), "SSL_CTX_new (server) error: %s", ssl_error());
-    return 0;
-  }
-
-  // If user callback returned non-NULL, that means that user callback has
-  // set up certificate itself. In this case, skip sertificate setting.
-  if ((ctx->callbacks.init_ssl == NULL ||
-       !ctx->callbacks.init_ssl(ctx->ssl_ctx)) &&
-      (SSL_CTX_use_certificate_file(ctx->ssl_ctx, pem, 1) == 0 ||
-       SSL_CTX_use_PrivateKey_file(ctx->ssl_ctx, pem, 1) == 0)) {
-    cry(fc(ctx), "%s: cannot open %s: %s", __func__, pem, ssl_error());
-    return 0;
-  }
-
-  if (pem != NULL) {
-    (void) SSL_CTX_use_certificate_chain_file(ctx->ssl_ctx, pem);
-  }
-
-  // Initialize locking callbacks, needed for thread safety.
-  // http://www.openssl.org/support/faq.html#PROG1
-  size = sizeof(pthread_mutex_t) * CRYPTO_num_locks();
-  if ((ssl_mutexes = (pthread_mutex_t *) malloc((size_t)size)) == NULL) {
-    cry(fc(ctx), "%s: cannot allocate mutexes: %s", __func__, ssl_error());
-    return 0;
-  }
-
-  for (i = 0; i < CRYPTO_num_locks(); i++) {
-    pthread_mutex_init(&ssl_mutexes[i], NULL);
-  }
-
-  CRYPTO_set_locking_callback(&ssl_locking_callback);
-  CRYPTO_set_id_callback(&ssl_id_callback);
-
-  return 1;
-}
-
-static void uninitialize_ssl(struct mg_context *ctx) {
-  int i;
-  if (ctx->ssl_ctx != NULL) {
-    CRYPTO_set_locking_callback(NULL);
-    for (i = 0; i < CRYPTO_num_locks(); i++) {
-      pthread_mutex_destroy(&ssl_mutexes[i]);
-    }
-    CRYPTO_set_locking_callback(NULL);
-    CRYPTO_set_id_callback(NULL);
-  }
-}
-#endif // !NO_SSL
-
-static int set_gpass_option(struct mg_context *ctx) {
-  struct file file = STRUCT_FILE_INITIALIZER;
-  const char *path = ctx->config[GLOBAL_PASSWORDS_FILE];
-  if (path != NULL && !mg_stat(fc(ctx), path, &file)) {
-    cry(fc(ctx), "Cannot open %s: %s", path, strerror(ERRNO));
-    return 0;
-  }
-  return 1;
-}
-
-static int set_acl_option(struct mg_context *ctx) {
-  return check_acl(ctx, (uint32_t) 0x7f000001UL) != -1;
-}
-
-static void reset_per_request_attributes(struct mg_connection *conn) {
-  conn->path_info = NULL;
-  conn->num_bytes_sent = conn->consumed_content = 0;
-  conn->status_code = -1;
-  conn->must_close = conn->request_len = conn->throttle = 0;
-}
-
-static void close_socket_gracefully(struct mg_connection *conn) {
-#if defined(_WIN32)
-  char buf[MG_BUF_LEN];
-  int n;
-#endif
-  struct linger linger;
-
-  // Set linger option to avoid socket hanging out after close. This prevent
-  // ephemeral port exhaust problem under high QPS.
-  linger.l_onoff = 1;
-  linger.l_linger = 1;
-  setsockopt(conn->client.sock, SOL_SOCKET, SO_LINGER,
-             (char *) &linger, sizeof(linger));
-
-  // Send FIN to the client
-  shutdown(conn->client.sock, SHUT_WR);
-  set_non_blocking_mode(conn->client.sock);
-
-#if defined(_WIN32)
-  // Read and discard pending incoming data. If we do not do that and close the
-  // socket, the data in the send buffer may be discarded. This
-  // behaviour is seen on Windows, when client keeps sending data
-  // when server decides to close the connection; then when client
-  // does recv() it gets no data back.
-  do {
-    n = pull(NULL, conn, buf, sizeof(buf));
-  } while (n > 0);
-#endif
-
-  // Now we know that our FIN is ACK-ed, safe to close
-  closesocket(conn->client.sock);
-}
-
-static void close_connection(struct mg_connection *conn) {
-  conn->must_close = 1;
-  if (conn->client.sock != INVALID_SOCKET) {
-    close_socket_gracefully(conn);
-  }
-#ifndef NO_SSL
-  // Must be done AFTER socket is closed
-  if (conn->ssl != NULL) {
-    SSL_free(conn->ssl);
-  }
-#endif
-}
-
-void mg_close_connection(struct mg_connection *conn) {
-#ifndef NO_SSL
-  if (conn->client_ssl_ctx != NULL) {
-    SSL_CTX_free((SSL_CTX *) conn->client_ssl_ctx);
-  }
-#endif
-  close_connection(conn);
-  free(conn);
-}
-
-struct mg_connection *mg_connect(const char *host, int port, int use_ssl,
-                                 char *ebuf, size_t ebuf_len) {
-  static struct mg_context fake_ctx;
-  struct mg_connection *conn = NULL;
-  struct sockaddr_in sin;
-  struct hostent *he;
-  int sock;
-
-  if (host == NULL) {
-    snprintf(ebuf, ebuf_len, "%s", "NULL host");
-  } else if (use_ssl && SSLv23_client_method == NULL) {
-    snprintf(ebuf, ebuf_len, "%s", "SSL is not initialized");
-  } else if ((he = gethostbyname(host)) == NULL) {
-    snprintf(ebuf, ebuf_len, "gethostbyname(%s): %s", host, strerror(ERRNO));
-  } else if ((sock = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) {
-    snprintf(ebuf, ebuf_len, "socket(): %s", strerror(ERRNO));
-  } else {
-    sin.sin_family = AF_INET;
-    sin.sin_port = htons((uint16_t) port);
-    sin.sin_addr = * (struct in_addr *) he->h_addr_list[0];
-    if (connect(sock, (struct sockaddr *) &sin, sizeof(sin)) != 0) {
-      snprintf(ebuf, ebuf_len, "connect(%s:%d): %s",
-               host, port, strerror(ERRNO));
-      closesocket(sock);
-    } else if ((conn = (struct mg_connection *)
-                calloc(1, sizeof(*conn) + MAX_REQUEST_SIZE)) == NULL) {
-      snprintf(ebuf, ebuf_len, "calloc(): %s", strerror(ERRNO));
-      closesocket(sock);
-#ifndef NO_SSL
-    } else if (use_ssl && (conn->client_ssl_ctx =
-                           SSL_CTX_new(SSLv23_client_method())) == NULL) {
-      snprintf(ebuf, ebuf_len, "SSL_CTX_new error");
-      closesocket(sock);
-      free(conn);
-      conn = NULL;
-#endif // NO_SSL
-    } else {
-      conn->buf_size = MAX_REQUEST_SIZE;
-      conn->buf = (char *) (conn + 1);
-      conn->ctx = &fake_ctx;
-      conn->client.sock = sock;
-      conn->client.rsa.sin = sin;
-      conn->client.is_ssl = use_ssl;
-#ifndef NO_SSL
-      if (use_ssl) {
-        // SSL_CTX_set_verify call is needed to switch off server certificate
-        // checking, which is off by default in OpenSSL and on in yaSSL.
-        SSL_CTX_set_verify(conn->client_ssl_ctx, 0, 0);
-        sslize(conn, conn->client_ssl_ctx, SSL_connect);
-      }
-#endif
-    }
-  }
-
-  return conn;
-}
-
-static int is_valid_uri(const char *uri) {
-  // Conform to http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5.1.2
-  // URI can be an asterisk (*) or should start with slash.
-  return uri[0] == '/' || (uri[0] == '*' && uri[1] == '\0');
-}
-
-static int getreq(struct mg_connection *conn, char *ebuf, size_t ebuf_len) {
-  const char *cl;
-
-  ebuf[0] = '\0';
-  reset_per_request_attributes(conn);
-  conn->request_len = read_request(NULL, conn, conn->buf, conn->buf_size,
-                                   &conn->data_len);
-  assert(conn->request_len < 0 || conn->data_len >= conn->request_len);
-
-  if (conn->request_len == 0 && conn->data_len == conn->buf_size) {
-    snprintf(ebuf, ebuf_len, "%s", "Request Too Large");
-  } if (conn->request_len <= 0) {
-    snprintf(ebuf, ebuf_len, "%s", "Client closed connection");
-  } else if (parse_http_message(conn->buf, conn->buf_size,
-                                &conn->request_info) <= 0) {
-    snprintf(ebuf, ebuf_len, "Bad request: [%.*s]", conn->data_len, conn->buf);
-  } else {
-    // Request is valid
-    if ((cl = get_header(&conn->request_info, "Content-Length")) != NULL) {
-      conn->content_len = strtoll(cl, NULL, 10);
-    } else if (!mg_strcasecmp(conn->request_info.request_method, "POST") ||
-               !mg_strcasecmp(conn->request_info.request_method, "PUT")) {
-      conn->content_len = -1;
-    } else {
-      conn->content_len = 0;
-    }
-    conn->birth_time = time(NULL);
-  }
-  return ebuf[0] == '\0';
-}
-
-struct mg_connection *mg_download(const char *host, int port, int use_ssl,
-                                  char *ebuf, size_t ebuf_len,
-                                  const char *fmt, ...) {
-  struct mg_connection *conn;
-  va_list ap;
-
-  va_start(ap, fmt);
-  ebuf[0] = '\0';
-  if ((conn = mg_connect(host, port, use_ssl, ebuf, ebuf_len)) == NULL) {
-  } else if (mg_vprintf(conn, fmt, ap) <= 0) {
-    snprintf(ebuf, ebuf_len, "%s", "Error sending request");
-  } else {
-    getreq(conn, ebuf, ebuf_len);
-  }
-  if (ebuf[0] != '\0' && conn != NULL) {
-    mg_close_connection(conn);
-    conn = NULL;
-  }
-
-  return conn;
-}
-
-static void process_new_connection(struct mg_connection *conn) {
-  struct mg_request_info *ri = &conn->request_info;
-  int keep_alive_enabled, keep_alive, discard_len;
-  char ebuf[100];
-
-  keep_alive_enabled = !strcmp(conn->ctx->config[ENABLE_KEEP_ALIVE], "yes");
-  keep_alive = 0;
-
-  // Important: on new connection, reset the receiving buffer. Credit goes
-  // to crule42.
-  conn->data_len = 0;
-  do {
-    if (!getreq(conn, ebuf, sizeof(ebuf))) {
-      send_http_error(conn, 500, "Server Error", "%s", ebuf);
-    } else if (!is_valid_uri(conn->request_info.uri)) {
-      snprintf(ebuf, sizeof(ebuf), "Invalid URI: [%s]", ri->uri);
-      send_http_error(conn, 400, "Bad Request", "%s", ebuf);
-    } else if (strcmp(ri->http_version, "1.0") &&
-               strcmp(ri->http_version, "1.1")) {
-      snprintf(ebuf, sizeof(ebuf), "Bad HTTP version: [%s]", ri->http_version);
-      send_http_error(conn, 505, "Bad HTTP version", "%s", ebuf);
-    }
-
-    if (ebuf[0] == '\0') {
-      handle_request(conn);
-      if (conn->ctx->callbacks.end_request != NULL) {
-        conn->ctx->callbacks.end_request(conn, conn->status_code);
-      }
-      log_access(conn);
-    }
-    if (ri->remote_user != NULL) {
-      free((void *) ri->remote_user);
-    }
-
-    // NOTE(lsm): order is important here. should_keep_alive() call
-    // is using parsed request, which will be invalid after memmove's below.
-    // Therefore, memorize should_keep_alive() result now for later use
-    // in loop exit condition.
-    keep_alive = should_keep_alive(conn);
-
-    // Discard all buffered data for this request
-    discard_len = conn->content_len >= 0 &&
-      conn->request_len + conn->content_len < (int64_t) conn->data_len ?
-      (int) (conn->request_len + conn->content_len) : conn->data_len;
-    memmove(conn->buf, conn->buf + discard_len, conn->data_len - discard_len);
-    conn->data_len -= discard_len;
-    assert(conn->data_len >= 0);
-    assert(conn->data_len <= conn->buf_size);
-
-  } while (conn->ctx->stop_flag == 0 &&
-           keep_alive_enabled &&
-           conn->content_len >= 0 &&
-           keep_alive);
-}
-
-// Worker threads take accepted socket from the queue
-static int consume_socket(struct mg_context *ctx, struct socket *sp) {
-  (void) pthread_mutex_lock(&ctx->mutex);
-  DEBUG_TRACE(("going idle"));
-
-  // If the queue is empty, wait. We're idle at this point.
-  while (ctx->sq_head == ctx->sq_tail && ctx->stop_flag == 0) {
-    pthread_cond_wait(&ctx->sq_full, &ctx->mutex);
-  }
-
-  // If we're stopping, sq_head may be equal to sq_tail.
-  if (ctx->sq_head > ctx->sq_tail) {
-    // Copy socket from the queue and increment tail
-    *sp = ctx->queue[ctx->sq_tail % ARRAY_SIZE(ctx->queue)];
-    ctx->sq_tail++;
-    DEBUG_TRACE(("grabbed socket %d, going busy", sp->sock));
-
-    // Wrap pointers if needed
-    while (ctx->sq_tail > (int) ARRAY_SIZE(ctx->queue)) {
-      ctx->sq_tail -= ARRAY_SIZE(ctx->queue);
-      ctx->sq_head -= ARRAY_SIZE(ctx->queue);
-    }
-  }
-
-  (void) pthread_cond_signal(&ctx->sq_empty);
-  (void) pthread_mutex_unlock(&ctx->mutex);
-
-  return !ctx->stop_flag;
-}
-
-static void *worker_thread(void *thread_func_param) {
-  struct mg_context *ctx = thread_func_param;
-  struct mg_connection *conn;
-
-  conn = (struct mg_connection *) calloc(1, sizeof(*conn) + MAX_REQUEST_SIZE);
-  if (conn == NULL) {
-    cry(fc(ctx), "%s", "Cannot create new connection struct, OOM");
-  } else {
-    conn->buf_size = MAX_REQUEST_SIZE;
-    conn->buf = (char *) (conn + 1);
-    conn->ctx = ctx;
-    conn->request_info.user_data = ctx->user_data;
-
-    // Call consume_socket() even when ctx->stop_flag > 0, to let it signal
-    // sq_empty condvar to wake up the master waiting in produce_socket()
-    while (consume_socket(ctx, &conn->client)) {
-      conn->birth_time = time(NULL);
-
-      // Fill in IP, port info early so even if SSL setup below fails,
-      // error handler would have the corresponding info.
-      // Thanks to Johannes Winkelmann for the patch.
-      // TODO(lsm): Fix IPv6 case
-      conn->request_info.remote_port = ntohs(conn->client.rsa.sin.sin_port);
-      memcpy(&conn->request_info.remote_ip,
-             &conn->client.rsa.sin.sin_addr.s_addr, 4);
-      conn->request_info.remote_ip = ntohl(conn->request_info.remote_ip);
-      conn->request_info.is_ssl = conn->client.is_ssl;
-
-      if (!conn->client.is_ssl
-#ifndef NO_SSL
-          || sslize(conn, conn->ctx->ssl_ctx, SSL_accept)
-#endif
-         ) {
-        process_new_connection(conn);
-      }
-
-      close_connection(conn);
-    }
-    free(conn);
-  }
-
-  // Signal master that we're done with connection and exiting
-  (void) pthread_mutex_lock(&ctx->mutex);
-  ctx->num_threads--;
-  (void) pthread_cond_signal(&ctx->cond);
-  assert(ctx->num_threads >= 0);
-  (void) pthread_mutex_unlock(&ctx->mutex);
-
-  DEBUG_TRACE(("exiting"));
-  return NULL;
-}
-
-// Master thread adds accepted socket to a queue
-static void produce_socket(struct mg_context *ctx, const struct socket *sp) {
-  (void) pthread_mutex_lock(&ctx->mutex);
-
-  // If the queue is full, wait
-  while (ctx->stop_flag == 0 &&
-         ctx->sq_head - ctx->sq_tail >= (int) ARRAY_SIZE(ctx->queue)) {
-    (void) pthread_cond_wait(&ctx->sq_empty, &ctx->mutex);
-  }
-
-  if (ctx->sq_head - ctx->sq_tail < (int) ARRAY_SIZE(ctx->queue)) {
-    // Copy socket to the queue and increment head
-    ctx->queue[ctx->sq_head % ARRAY_SIZE(ctx->queue)] = *sp;
-    ctx->sq_head++;
-    DEBUG_TRACE(("queued socket %d", sp->sock));
-  }
-
-  (void) pthread_cond_signal(&ctx->sq_full);
-  (void) pthread_mutex_unlock(&ctx->mutex);
-}
-
-static int set_sock_timeout(SOCKET sock, int milliseconds) {
-#ifdef _WIN32
-  DWORD t = milliseconds;
-#else
-  struct timeval t;
-  t.tv_sec = milliseconds / 1000;
-  t.tv_usec = (milliseconds * 1000) % 1000000;
-#endif
-  return setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (void *) &t, sizeof(t)) ||
-    setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (void *) &t, sizeof(t));
-}
-
-static void accept_new_connection(const struct socket *listener,
-                                  struct mg_context *ctx) {
-  struct socket so;
-  char src_addr[20];
-  socklen_t len = sizeof(so.rsa);
-  int on = 1;
-
-  if ((so.sock = accept(listener->sock, &so.rsa.sa, &len)) == INVALID_SOCKET) {
-  } else if (!check_acl(ctx, ntohl(* (uint32_t *) &so.rsa.sin.sin_addr))) {
-    sockaddr_to_string(src_addr, sizeof(src_addr), &so.rsa);
-    cry(fc(ctx), "%s: %s is not allowed to connect", __func__, src_addr);
-    closesocket(so.sock);
-  } else {
-    // Put so socket structure into the queue
-    DEBUG_TRACE(("Accepted socket %d", (int) so.sock));
-    so.is_ssl = listener->is_ssl;
-    so.ssl_redir = listener->ssl_redir;
-    getsockname(so.sock, &so.lsa.sa, &len);
-    // Set TCP keep-alive. This is needed because if HTTP-level keep-alive
-    // is enabled, and client resets the connection, server won't get
-    // TCP FIN or RST and will keep the connection open forever. With TCP
-    // keep-alive, next keep-alive handshake will figure out that the client
-    // is down and will close the server end.
-    // Thanks to Igor Klopov who suggested the patch.
-    setsockopt(so.sock, SOL_SOCKET, SO_KEEPALIVE, (void *) &on, sizeof(on));
-    set_sock_timeout(so.sock, atoi(ctx->config[REQUEST_TIMEOUT]));
-    produce_socket(ctx, &so);
-  }
-}
-
-static void *master_thread(void *thread_func_param) {
-  struct mg_context *ctx = thread_func_param;
-  struct pollfd *pfd;
-  int i;
-
-  // Increase priority of the master thread
-#if defined(_WIN32)
-  SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_ABOVE_NORMAL);
-#endif
-
-#if defined(ISSUE_317)
-  struct sched_param sched_param;
-  sched_param.sched_priority = sched_get_priority_max(SCHED_RR);
-  pthread_setschedparam(pthread_self(), SCHED_RR, &sched_param);
-#endif
-
-  pfd = calloc(ctx->num_listening_sockets, sizeof(pfd[0]));
-  while (ctx->stop_flag == 0) {
-    for (i = 0; i < ctx->num_listening_sockets; i++) {
-      pfd[i].fd = ctx->listening_sockets[i].sock;
-      pfd[i].events = POLLIN;
-    }
-
-    if (poll(pfd, ctx->num_listening_sockets, 200) > 0) {
-      for (i = 0; i < ctx->num_listening_sockets; i++) {
-        if (ctx->stop_flag == 0 && pfd[i].revents == POLLIN) {
-          accept_new_connection(&ctx->listening_sockets[i], ctx);
-        }
-      }
-    }
-  }
-  free(pfd);
-  DEBUG_TRACE(("stopping workers"));
-
-  // Stop signal received: somebody called mg_stop. Quit.
-  close_all_listening_sockets(ctx);
-
-  // Wakeup workers that are waiting for connections to handle.
-  pthread_cond_broadcast(&ctx->sq_full);
-
-  // Wait until all threads finish
-  (void) pthread_mutex_lock(&ctx->mutex);
-  while (ctx->num_threads > 0) {
-    (void) pthread_cond_wait(&ctx->cond, &ctx->mutex);
-  }
-  (void) pthread_mutex_unlock(&ctx->mutex);
-
-  // All threads exited, no sync is needed. Destroy mutex and condvars
-  (void) pthread_mutex_destroy(&ctx->mutex);
-  (void) pthread_cond_destroy(&ctx->cond);
-  (void) pthread_cond_destroy(&ctx->sq_empty);
-  (void) pthread_cond_destroy(&ctx->sq_full);
-
-#if !defined(NO_SSL)
-  uninitialize_ssl(ctx);
-#endif
-  DEBUG_TRACE(("exiting"));
-
-  // Signal mg_stop() that we're done.
-  // WARNING: This must be the very last thing this
-  // thread does, as ctx becomes invalid after this line.
-  ctx->stop_flag = 2;
-  return NULL;
-}
-
-static void free_context(struct mg_context *ctx) {
-  int i;
-
-  // Deallocate config parameters
-  for (i = 0; i < NUM_OPTIONS; i++) {
-    if (ctx->config[i] != NULL)
-      free(ctx->config[i]);
-  }
-
-#ifndef NO_SSL
-  // Deallocate SSL context
-  if (ctx->ssl_ctx != NULL) {
-    SSL_CTX_free(ctx->ssl_ctx);
-  }
-  if (ssl_mutexes != NULL) {
-    free(ssl_mutexes);
-    ssl_mutexes = NULL;
-  }
-#endif // !NO_SSL
-
-  // Deallocate context itself
-  free(ctx);
-}
-
-void mg_stop(struct mg_context *ctx) {
-  ctx->stop_flag = 1;
-
-  // Wait until mg_fini() stops
-  while (ctx->stop_flag != 2) {
-    (void) mg_sleep(10);
-  }
-  free_context(ctx);
-
-#if defined(_WIN32) && !defined(__SYMBIAN32__)
-  (void) WSACleanup();
-#endif // _WIN32
-}
-
-struct mg_context *mg_start(const struct mg_callbacks *callbacks,
-                            void *user_data,
-                            const char **options) {
-  struct mg_context *ctx;
-  const char *name, *value, *default_value;
-  int i;
-
-#if defined(_WIN32) && !defined(__SYMBIAN32__)
-  WSADATA data;
-  WSAStartup(MAKEWORD(2,2), &data);
-  InitializeCriticalSection(&global_log_file_lock);
-#endif // _WIN32
-
-  // Allocate context and initialize reasonable general case defaults.
-  // TODO(lsm): do proper error handling here.
-  if ((ctx = (struct mg_context *) calloc(1, sizeof(*ctx))) == NULL) {
-    return NULL;
-  }
-  ctx->callbacks = *callbacks;
-  ctx->user_data = user_data;
-
-  while (options && (name = *options++) != NULL) {
-    if ((i = get_option_index(name)) == -1) {
-      cry(fc(ctx), "Invalid option: %s", name);
-      free_context(ctx);
-      return NULL;
-    } else if ((value = *options++) == NULL) {
-      cry(fc(ctx), "%s: option value cannot be NULL", name);
-      free_context(ctx);
-      return NULL;
-    }
-    if (ctx->config[i] != NULL) {
-      cry(fc(ctx), "warning: %s: duplicate option", name);
-      free(ctx->config[i]);
-    }
-    ctx->config[i] = mg_strdup(value);
-    DEBUG_TRACE(("[%s] -> [%s]", name, value));
-  }
-
-  // Set default value if needed
-  for (i = 0; config_options[i * ENTRIES_PER_CONFIG_OPTION] != NULL; i++) {
-    default_value = config_options[i * ENTRIES_PER_CONFIG_OPTION + 2];
-    if (ctx->config[i] == NULL && default_value != NULL) {
-      ctx->config[i] = mg_strdup(default_value);
-      DEBUG_TRACE(("Setting default: [%s] -> [%s]",
-                   config_options[i * ENTRIES_PER_CONFIG_OPTION + 1],
-                   default_value));
-    }
-  }
-
-  // NOTE(lsm): order is important here. SSL certificates must
-  // be initialized before listening ports. UID must be set last.
-  if (!set_gpass_option(ctx) ||
-#if !defined(NO_SSL)
-      !set_ssl_option(ctx) ||
-#endif
-      !set_ports_option(ctx) ||
-#if !defined(_WIN32)
-      !set_uid_option(ctx) ||
-#endif
-      !set_acl_option(ctx)) {
-    free_context(ctx);
-    return NULL;
-  }
-
-#if !defined(_WIN32) && !defined(__SYMBIAN32__)
-  // Ignore SIGPIPE signal, so if browser cancels the request, it
-  // won't kill the whole process.
-  (void) signal(SIGPIPE, SIG_IGN);
-  // Also ignoring SIGCHLD to let the OS to reap zombies properly.
-  (void) signal(SIGCHLD, SIG_IGN);
-#endif // !_WIN32
-
-  (void) pthread_mutex_init(&ctx->mutex, NULL);
-  (void) pthread_cond_init(&ctx->cond, NULL);
-  (void) pthread_cond_init(&ctx->sq_empty, NULL);
-  (void) pthread_cond_init(&ctx->sq_full, NULL);
-
-  // Start master (listening) thread
-  mg_start_thread(master_thread, ctx);
-
-  // Start worker threads
-  for (i = 0; i < atoi(ctx->config[NUM_THREADS]); i++) {
-    if (mg_start_thread(worker_thread, ctx) != 0) {
-      cry(fc(ctx), "Cannot start worker thread: %d", ERRNO);
-    } else {
-      ctx->num_threads++;
-    }
-  }
-
-  return ctx;
-}
diff --git a/mongoose.h b/mongoose.h
deleted file mode 100644
index 20904f8..0000000
--- a/mongoose.h
+++ /dev/null
@@ -1,292 +0,0 @@
-// Copyright (c) 2004-2012 Sergey Lyubka
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#ifndef MONGOOSE_HEADER_INCLUDED
-#define  MONGOOSE_HEADER_INCLUDED
-
-#include <stdio.h>
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-struct mg_context;     // Handle for the HTTP service itself
-struct mg_connection;  // Handle for the individual connection
-
-
-// This structure contains information about the HTTP request.
-struct mg_request_info {
-  const char *request_method; // "GET", "POST", etc
-  const char *uri;            // URL-decoded URI
-  const char *http_version;   // E.g. "1.0", "1.1"
-  const char *query_string;   // URL part after '?', not including '?', or NULL
-  const char *remote_user;    // Authenticated user, or NULL if no auth used
-  long remote_ip;             // Client's IP address
-  int remote_port;            // Client's port
-  int is_ssl;                 // 1 if SSL-ed, 0 if not
-  void *user_data;            // User data pointer passed to mg_start()
-
-  int num_headers;            // Number of HTTP headers
-  struct mg_header {
-    const char *name;         // HTTP header name
-    const char *value;        // HTTP header value
-  } http_headers[64];         // Maximum 64 headers
-};
-
-
-// This structure needs to be passed to mg_start(), to let mongoose know
-// which callbacks to invoke. For detailed description, see
-// https://github.com/valenok/mongoose/blob/master/UserManual.md
-struct mg_callbacks {
-  int  (*begin_request)(struct mg_connection *);
-  void (*end_request)(const struct mg_connection *, int reply_status_code);
-  int  (*log_message)(const struct mg_connection *, const char *message);
-  int  (*init_ssl)(void *ssl_context);
-  int (*websocket_connect)(const struct mg_connection *);
-  void (*websocket_ready)(struct mg_connection *);
-  int  (*websocket_data)(struct mg_connection *);
-  const char * (*open_file)(const struct mg_connection *,
-                             const char *path, size_t *data_len);
-  void (*init_lua)(struct mg_connection *, void *lua_context);
-  void (*upload)(struct mg_connection *, const char *file_name);
-};
-
-// Start web server.
-//
-// Parameters:
-//   callbacks: mg_callbacks structure with user-defined callbacks.
-//   options: NULL terminated list of option_name, option_value pairs that
-//            specify Mongoose configuration parameters.
-//
-// Side-effects: on UNIX, ignores SIGCHLD and SIGPIPE signals. If custom
-//    processing is required for these, signal handlers must be set up
-//    after calling mg_start().
-//
-//
-// Example:
-//   const char *options[] = {
-//     "document_root", "/var/www",
-//     "listening_ports", "80,443s",
-//     NULL
-//   };
-//   struct mg_context *ctx = mg_start(&my_func, NULL, options);
-//
-// Please refer to http://code.google.com/p/mongoose/wiki/MongooseManual
-// for the list of valid option and their possible values.
-//
-// Return:
-//   web server context, or NULL on error.
-struct mg_context *mg_start(const struct mg_callbacks *callbacks,
-                            void *user_data,
-                            const char **configuration_options);
-
-
-// Stop the web server.
-//
-// Must be called last, when an application wants to stop the web server and
-// release all associated resources. This function blocks until all Mongoose
-// threads are stopped. Context pointer becomes invalid.
-void mg_stop(struct mg_context *);
-
-
-// Get the value of particular configuration parameter.
-// The value returned is read-only. Mongoose does not allow changing
-// configuration at run time.
-// If given parameter name is not valid, NULL is returned. For valid
-// names, return value is guaranteed to be non-NULL. If parameter is not
-// set, zero-length string is returned.
-const char *mg_get_option(const struct mg_context *ctx, const char *name);
-
-
-// Return array of strings that represent valid configuration options.
-// For each option, a short name, long name, and default value is returned.
-// Array is NULL terminated.
-const char **mg_get_valid_option_names(void);
-
-
-// Add, edit or delete the entry in the passwords file.
-//
-// This function allows an application to manipulate .htpasswd files on the
-// fly by adding, deleting and changing user records. This is one of the
-// several ways of implementing authentication on the server side. For another,
-// cookie-based way please refer to the examples/chat.c in the source tree.
-//
-// If password is not NULL, entry is added (or modified if already exists).
-// If password is NULL, entry is deleted.
-//
-// Return:
-//   1 on success, 0 on error.
-int mg_modify_passwords_file(const char *passwords_file_name,
-                             const char *domain,
-                             const char *user,
-                             const char *password);
-
-
-// Return information associated with the request.
-struct mg_request_info *mg_get_request_info(struct mg_connection *);
-
-
-// Send data to the client.
-// Return:
-//  0   when the connection has been closed
-//  -1  on error
-//  number of bytes written on success
-int mg_write(struct mg_connection *, const void *buf, size_t len);
-
-
-#undef PRINTF_FORMAT_STRING
-#if _MSC_VER >= 1400
-#include <sal.h>
-#if _MSC_VER > 1400
-#define PRINTF_FORMAT_STRING(s) _Printf_format_string_ s
-#else
-#define PRINTF_FORMAT_STRING(s) __format_string s
-#endif
-#else
-#define PRINTF_FORMAT_STRING(s) s
-#endif
-
-#ifdef __GNUC__
-#define PRINTF_ARGS(x, y) __attribute__((format(printf, x, y)))
-#else
-#define PRINTF_ARGS(x, y)
-#endif
-
-// Send data to the browser using printf() semantics.
-//
-// Works exactly like mg_write(), but allows to do message formatting.
-// Below are the macros for enabling compiler-specific checks for
-// printf-like arguments.
-int mg_printf(struct mg_connection *,
-              PRINTF_FORMAT_STRING(const char *fmt), ...) PRINTF_ARGS(2, 3);
-
-
-// Send contents of the entire file together with HTTP headers.
-void mg_send_file(struct mg_connection *conn, const char *path);
-
-
-// Read data from the remote end, return number of bytes read.
-int mg_read(struct mg_connection *, void *buf, size_t len);
-
-
-// Get the value of particular HTTP header.
-//
-// This is a helper function. It traverses request_info->http_headers array,
-// and if the header is present in the array, returns its value. If it is
-// not present, NULL is returned.
-const char *mg_get_header(const struct mg_connection *, const char *name);
-
-
-// Get a value of particular form variable.
-//
-// Parameters:
-//   data: pointer to form-uri-encoded buffer. This could be either POST data,
-//         or request_info.query_string.
-//   data_len: length of the encoded data.
-//   var_name: variable name to decode from the buffer
-//   dst: destination buffer for the decoded variable
-//   dst_len: length of the destination buffer
-//
-// Return:
-//   On success, length of the decoded variable.
-//   On error:
-//      -1 (variable not found).
-//      -2 (destination buffer is NULL, zero length or too small to hold the decoded variable).
-//
-// Destination buffer is guaranteed to be '\0' - terminated if it is not
-// NULL or zero length.
-int mg_get_var(const char *data, size_t data_len,
-               const char *var_name, char *dst, size_t dst_len);
-
-// Fetch value of certain cookie variable into the destination buffer.
-//
-// Destination buffer is guaranteed to be '\0' - terminated. In case of
-// failure, dst[0] == '\0'. Note that RFC allows many occurrences of the same
-// parameter. This function returns only first occurrence.
-//
-// Return:
-//   On success, value length.
-//   On error:
-//      -1 (either "Cookie:" header is not present at all or the requested parameter is not found).
-//      -2 (destination buffer is NULL, zero length or too small to hold the value).
-int mg_get_cookie(const struct mg_connection *,
-                  const char *cookie_name, char *buf, size_t buf_len);
-
-
-// Download data from the remote web server.
-//   host: host name to connect to, e.g. "foo.com", or "10.12.40.1".
-//   port: port number, e.g. 80.
-//   use_ssl: wether to use SSL connection.
-//   error_buffer, error_buffer_size: error message placeholder.
-//   request_fmt,...: HTTP request.
-// Return:
-//   On success, valid pointer to the new connection, suitable for mg_read().
-//   On error, NULL. error_buffer contains error message.
-// Example:
-//   char ebuf[100];
-//   struct mg_connection *conn;
-//   conn = mg_download("google.com", 80, 0, ebuf, sizeof(ebuf),
-//                      "%s", "GET / HTTP/1.0\r\nHost: google.com\r\n\r\n");
-struct mg_connection *mg_download(const char *host, int port, int use_ssl,
-                                  char *error_buffer, size_t error_buffer_size,
-                                  PRINTF_FORMAT_STRING(const char *request_fmt),
-                                  ...) PRINTF_ARGS(6, 7);
-
-
-// Close the connection opened by mg_download().
-void mg_close_connection(struct mg_connection *conn);
-
-
-// File upload functionality. Each uploaded file gets saved into a temporary
-// file and MG_UPLOAD event is sent.
-// Return number of uploaded files.
-int mg_upload(struct mg_connection *conn, const char *destination_dir);
-
-
-// Convenience function -- create detached thread.
-// Return: 0 on success, non-0 on error.
-typedef void * (*mg_thread_func_t)(void *);
-int mg_start_thread(mg_thread_func_t f, void *p);
-
-
-// Return builtin mime type for the given file name.
-// For unrecognized extensions, "text/plain" is returned.
-const char *mg_get_builtin_mime_type(const char *file_name);
-
-
-// Return Mongoose version.
-const char *mg_version(void);
-
-
-// MD5 hash given strings.
-// Buffer 'buf' must be 33 bytes long. Varargs is a NULL terminated list of
-// ASCIIz strings. When function returns, buf will contain human-readable
-// MD5 hash. Example:
-//   char buf[33];
-//   mg_md5(buf, "aa", "bb", NULL);
-void mg_md5(char buf[33], ...);
-
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
-#endif // MONGOOSE_HEADER_INCLUDED
diff --git a/vdrclient.c b/vdrclient.c
new file mode 100644
index 0000000..a68b9f8
--- /dev/null
+++ b/vdrclient.c
@@ -0,0 +1,1453 @@
+#include "vdrclient.h"
+
+/*
+trace
+debug
+info
+warn
+error
+critical
+*/
+
+#include <string.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <string>
+
+#include <vdr/videodir.h>
+#include <vdr/recording.h>
+#include <vdr/menu.h>
+#include <vdr/timers.h>
+
+VDRClient::VDRClient()
+{
+  logger = spd::get("jsonserver_spdlog");
+}
+
+bool VDRClient::process(std::string& request, PFMap& postFields, std::string& returnString)
+{
+  Json::Value returnJSON;
+  bool success = false;
+
+  try
+  {
+    if      (request == "gettime")           success = gettime(postFields, returnJSON);
+    else if (request == "diskstats")         success = diskstats(postFields, returnJSON);
+    else if (request == "channellist")       success = channellist(postFields, returnJSON);
+    else if (request == "reclist")           success = reclist(postFields, returnJSON);
+    else if (request == "timerlist")         success = timerlist(postFields, returnJSON);
+    else if (request == "epgdownload")       success = epgdownload(postFields, returnJSON);
+    else if (request == "tunersstatus")      success = tunersstatus(postFields, returnJSON);
+
+    else if (request == "channelschedule")   success = channelschedule(postFields, returnJSON);
+    else if (request == "getscheduleevent")  success = getscheduleevent(postFields, returnJSON);
+    else if (request == "epgsearch")         success = epgsearch(postFields, returnJSON);
+    else if (request == "epgsearchsame")     success = epgsearchsame(postFields, returnJSON);
+    else if (request == "timerset")          success = timerset(postFields, returnJSON);
+    else if (request == "recinfo")           success = recinfo(postFields, returnJSON);
+    else if (request == "recstop")           success = recstop(postFields, returnJSON);
+    else if (request == "recdel")            success = recdel(postFields, returnJSON);
+    else if (request == "recrename")         success = recrename(postFields, returnJSON);
+    else if (request == "recmove")           success = recmove(postFields, returnJSON);
+    else if (request == "timersetactive")    success = timersetactive(postFields, returnJSON);
+    else if (request == "timerdel")          success = timerdel(postFields, returnJSON);
+    else if (request == "timerisrecording")  success = timerisrecording(postFields, returnJSON);
+    else if (request == "recresetresume")    success = recresetresume(postFields, returnJSON);
+    else if (request == "timeredit")         success = timeredit(postFields, returnJSON);
+  }
+  catch (BadParamException e)
+  {
+    logger->error("Bad parameter in call, paramName: {}", e.param);
+    returnJSON["Result"] = false;
+    returnJSON["Error"] = "Bad request parameter";
+    returnJSON["Detail"] = e.param;
+    success = true;
+  }
+
+  if (!success) return false;
+
+  Json::StyledWriter sw;
+  returnString = sw.write(returnJSON);
+  logger->debug("Done sw write");
+  return true;
+}
+
+bool VDRClient::gettime(PFMap& postFields, Json::Value& js)
+{
+  logger->debug("get_time");
+
+  struct timeval tv;
+  gettimeofday(&tv, NULL);
+
+  js["Time"] = (Json::UInt64)tv.tv_sec;
+  js["MTime"] = (Json::UInt)(tv.tv_usec/1000);
+  js["Result"] = true;
+  return true;
+}
+
+bool VDRClient::diskstats(PFMap& postFields, Json::Value& js)
+{
+  logger->debug("diskstats");
+
+  int FreeMB;
+  int UsedMB;
+  int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB);
+
+  js["FreeMiB"] = FreeMB;
+  js["UsedMiB"] = UsedMB;
+  js["Percent"] = Percent;
+  js["Result"] = true;
+  return true;
+}
+
+bool VDRClient::channellist(PFMap& postFields, Json::Value& js)
+{
+  logger->debug("channellist");
+
+  Json::Value jschannels(Json::arrayValue);
+
+  for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel))
+  {
+    if (!channel->GroupSep())
+    {
+      Json::Value oneChannel;
+      oneChannel["ID"] = (const char *)channel->GetChannelID().ToString();
+      oneChannel["Number"] = channel->Number();
+      oneChannel["Name"] = channel->Name();
+      jschannels.append(oneChannel);
+    }
+  }
+  js["Channels"] = jschannels;
+
+  return true;
+}
+
+bool VDRClient::reclist(PFMap& postFields, Json::Value& js)
+{
+  logger->debug("reclist");
+
+  Json::Value jsrecordings(Json::arrayValue);
+  cRecordings Recordings;
+  Recordings.Load();
+  for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording))
+  {
+    Json::Value oneRec;
+    oneRec["StartTime"] = (Json::UInt)recording->Start();
+    oneRec["Length"] = (Json::UInt)recording->LengthInSeconds();
+    oneRec["IsNew"] = recording->IsNew();
+    oneRec["Name"] = recording->Name();
+    oneRec["Filename"] = recording->FileName();
+    oneRec["FileSizeMB"] = recording->FileSizeMB();
+
+    cRecordControl *rc = cRecordControls::GetRecordControl(recording->FileName());
+    if (rc) oneRec["CurrentlyRecording"] = true;
+    else    oneRec["CurrentlyRecording"] = false;
+
+    jsrecordings.append(oneRec);
+  }
+  js["Recordings"] = jsrecordings;
+
+  return true;
+}
+
+bool VDRClient::timerlist(PFMap& postFields, Json::Value& js)
+{
+  logger->debug("timerlist");
+
+  Json::Value jstimers(Json::arrayValue);
+
+  cTimer *timer;
+  int numTimers = Timers.Count();
+
+  for (int i = 0; i < numTimers; i++)
+  {
+    timer = Timers.Get(i);
+    Json::Value oneTimer;
+    oneTimer["Active"] = timer->HasFlags(tfActive);
+    oneTimer["Recording"] = timer->Recording();
+    oneTimer["Pending"] = timer->Pending();
+    oneTimer["Priority"] = timer->Priority();
+    oneTimer["Lifetime"] = timer->Lifetime();
+    oneTimer["ChannelNumber"] = timer->Channel()->Number();
+    oneTimer["ChannelID"] = (const char *)timer->Channel()->GetChannelID().ToString();
+    oneTimer["StartTime"] = (int)timer->StartTime();
+    oneTimer["StopTime"] = (int)timer->StopTime();
+    oneTimer["Day"] = (int)timer->Day();
+    oneTimer["WeekDays"] = timer->WeekDays();
+    oneTimer["Name"] = timer->File();
+
+    const cEvent* event = timer->Event();
+    if (event)
+    {
+      oneTimer["EventID"] = event->EventID();
+    }
+    else
+    {
+      int channelNumber = timer->Channel()->Number();
+      int aroundTime = timer->StartTime() + 1;
+      const cEvent* eventAround = getEvent(js, channelNumber, 0, aroundTime);
+      if (eventAround)
+      {
+        oneTimer["EventID"] = eventAround->EventID();
+      }
+      else
+      {
+        oneTimer["EventID"] = 0;
+      }
+    }
+
+    jstimers.append(oneTimer);
+  }
+
+  js["Timers"] = jstimers;
+  js["Result"] = true;
+  return true;
+}
+
+bool VDRClient::channelschedule(PFMap& postFields, Json::Value& js) // RETHROWS
+{
+  logger->debug("channelschedule");
+  int channelNumber = getVarInt(postFields, "channelnumber");
+  int startTime = getVarInt(postFields, "starttime");
+  int duration = getVarInt(postFields, "duration");
+
+  cChannel* channel = NULL;
+  for (channel = Channels.First(); channel; channel = Channels.Next(channel))
+  {
+    if (channel->GroupSep()) continue;
+    if (channel->Number() == channelNumber) break;
+  }
+
+  if (!channel)
+  {
+    logger->error("channelschedule: Could not find requested channel: {}", channelNumber);
+    js["Result"] = false;
+    js["Error"] = "Could not find channel";
+    return true;
+  }
+
+  cSchedulesLock MutexLock;
+  const cSchedules *Schedules = cSchedules::Schedules(MutexLock);
+  if (!Schedules)
+  {
+    logger->error("channelschedule: Could not find requested channel: {}", channelNumber);
+    js["Result"] = false;
+    js["Error"] = "Internal schedules error (1)";
+    return true;
+  }
+  const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
+  if (!Schedule)
+  {
+    logger->error("channelschedule: Could not find requested channel: {}", channelNumber);
+    js["Result"] = false;
+    js["Error"] = "Internal schedules error (2)";
+    return true;
+  }
+
+  Json::Value jsevents(Json::arrayValue);
+
+  for (const cEvent* event = Schedule->Events()->First(); event; event = Schedule->Events()->Next(event))
+  {
+    if ((event->StartTime() + event->Duration()) < time(NULL)) continue; //in the past filter
+    if ((event->StartTime() + event->Duration()) <= startTime) continue; //start time filter
+    if (event->StartTime() >= (startTime + duration)) continue;          //duration filter
+
+    Json::Value oneEvent;
+    oneEvent["ID"] = event->EventID();
+    oneEvent["Time"] = (Json::UInt)event->StartTime();
+    oneEvent["Duration"] = event->Duration();
+    oneEvent["Title"] = event->Title() ? event->Title() : "";
+    oneEvent["ShortText"] = event->ShortText() ? event->ShortText() : "";
+    oneEvent["HasTimer"] = event->HasTimer();
+    jsevents.append(oneEvent);
+  }
+
+  js["Result"] = true;
+  js["Events"] = jsevents;
+  return true;
+}
+
+bool VDRClient::getscheduleevent(PFMap& postFields, Json::Value& js) // RETHROWS
+{
+  logger->debug("getscheduleevent");
+
+  int channelNumber = getVarInt(postFields, "channelnumber");
+  int eventID = getVarInt(postFields, "eventid");
+
+  const cEvent* event = getEvent(js, channelNumber, eventID, 0);
+  if (!event)
+  {
+    js["Result"] = false;
+    return true;
+  }
+
+  Json::Value oneEvent;
+  oneEvent["ID"] = event->EventID();
+  oneEvent["Time"] = (Json::UInt)event->StartTime();
+  oneEvent["Duration"] = event->Duration();
+  oneEvent["Title"] = event->Title() ? event->Title() : "";
+  oneEvent["ShortText"] = event->ShortText() ? event->ShortText() : "";
+  oneEvent["Description"] = event->Description() ? event->Description() : "";
+  oneEvent["HasTimer"] = event->HasTimer();
+  oneEvent["RunningStatus"] = event->RunningStatus();
+
+  js["Result"] = true;
+  js["Event"] = oneEvent;
+  return true;
+}
+
+bool VDRClient::epgdownload(PFMap& postFields, Json::Value& js)
+{
+  logger->debug("epgdownload");
+
+  cSchedulesLock MutexLock;
+  const cSchedules *Schedules = cSchedules::Schedules(MutexLock);
+
+  if (!Schedules)
+  {
+    logger->error("epgdownload: Could not get Schedules object");
+    js["Result"] = false;
+    js["Error"] = "Internal schedules error (1)";
+    return true;
+  }
+
+  Json::Value jsevents(Json::arrayValue);
+
+  for (cChannel* channel = Channels.First(); channel; channel = Channels.Next(channel))
+  {
+    if (channel->GroupSep()) continue;
+
+    const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
+    if (!Schedule) continue;
+
+
+    for (const cEvent* event = Schedule->Events()->First(); event; event = Schedule->Events()->Next(event))
+    {
+      Json::Value oneEvent;
+      oneEvent["ChannelNumber"] = channel->Number();
+      oneEvent["ChannelID"] = (const char*)event->ChannelID().ToString();
+      oneEvent["ID"] = event->EventID();
+      oneEvent["Time"] = (Json::UInt)event->StartTime();
+      oneEvent["Duration"] = event->Duration();
+      oneEvent["Title"] = event->Title() ? event->Title() : "";
+      oneEvent["ShortText"] = event->ShortText() ? event->ShortText() : "";
+      oneEvent["HasTimer"] = event->HasTimer();
+      oneEvent["Description"] = event->Description() ? event->Description() : "";
+      jsevents.append(oneEvent);
+    }
+  }
+
+  js["Result"] = true;
+  js["Events"] = jsevents;
+  return true;
+}
+
+bool VDRClient::epgsearch(PFMap& postFields, Json::Value& js) // RETHROWS
+{
+  logger->debug("epgsearch");
+
+  std::string searchfor = getVarString(postFields, "searchfor");
+  logger->debug("epgsearch: search for: {}", searchfor);
+
+  cSchedulesLock MutexLock;
+  const cSchedules *Schedules = cSchedules::Schedules(MutexLock);
+
+  if (!Schedules)
+  {
+    logger->error("epgsearch: Could not get Schedules object");
+    js["Result"] = false;
+    js["Error"] = "Internal schedules error (1)";
+    return true;
+  }
+
+  Json::Value jsevents(Json::arrayValue);
+
+  for (cChannel* channel = Channels.First(); channel; channel = Channels.Next(channel))
+  {
+    if (channel->GroupSep()) continue;
+
+    const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
+    if (!Schedule) continue;
+
+    bool foundtitle;
+    bool founddescription;
+    for (const cEvent* event = Schedule->Events()->First(); event; event = Schedule->Events()->Next(event))
+    {
+      foundtitle = false;
+      founddescription = false;
+
+      if (event->Title() && strcasestr(event->Title(), searchfor.c_str())) foundtitle = true;
+
+      if (!foundtitle && event->Description())
+        if (strcasestr(event->Description(), searchfor.c_str())) founddescription = true;
+
+      if (foundtitle || founddescription)
+      {
+        Json::Value oneEvent;
+        oneEvent["ChannelNumber"] = channel->Number();
+        oneEvent["ChannelID"] = (const char*)event->ChannelID().ToString();
+        oneEvent["ID"] = event->EventID();
+        oneEvent["Time"] = (Json::UInt)event->StartTime();
+        oneEvent["Duration"] = event->Duration();
+        oneEvent["Title"] = event->Title() ? event->Title() : "";
+        oneEvent["ShortText"] = event->ShortText() ? event->ShortText() : "";
+        oneEvent["HasTimer"] = event->HasTimer();
+        oneEvent["Description"] = event->Description() ? event->Description() : "";
+        if (founddescription)
+          oneEvent["FoundInDesc"] = true;
+        else
+          oneEvent["FoundInDesc"] = false;
+        jsevents.append(oneEvent);
+      }
+    }
+  }
+
+  js["Result"] = true;
+  js["Events"] = jsevents;
+
+  logger->debug("epgsearch: search for: {} done", searchfor);
+
+  return true;
+}
+
+bool VDRClient::epgsearchsame(PFMap& postFields, Json::Value& js) // RETHROWS
+{
+  logger->debug("epgsearchsame");
+
+  int atTime = getVarInt(postFields, "time");
+  std::string sTitle = getVarString(postFields, "title");
+
+  logger->debug("epgsearchsame: request time: {}, title: {}", atTime, sTitle);
+
+  cSchedulesLock SchedulesLock;
+  const cSchedules *schedules = cSchedules::Schedules(SchedulesLock);
+  if (!schedules)
+  {
+    js["Result"] = false;
+    return true;
+  }
+
+  Json::Value jsevents(Json::arrayValue);
+
+  const cEvent *event;
+  for (cSchedule *schedule = schedules->First(); (schedule != NULL); schedule = schedules->Next(schedule))
+  {
+    event = schedule->GetEventAround(atTime);
+    if (!event) continue; // nothing found on this schedule(channel)
+
+    if (!strcmp(event->Title(), sTitle.c_str()))
+    {
+      Json::Value oneEvent;
+      oneEvent["ChannelID"] = (const char*)event->ChannelID().ToString();
+      oneEvent["ID"] = event->EventID();
+      oneEvent["Time"] = (Json::UInt)event->StartTime();
+      oneEvent["Duration"] = event->Duration();
+      oneEvent["Title"] = event->Title() ? event->Title() : "";
+      oneEvent["ShortText"] = event->ShortText() ? event->ShortText() : "";
+      oneEvent["HasTimer"] = event->HasTimer();
+      //oneEvent["Description"] = event->Description() ? event->Description() : "";
+      jsevents.append(oneEvent);
+    }
+  }
+
+  js["Events"] = jsevents;
+  js["Result"] = true;
+  return true;
+}
+
+bool VDRClient::tunersstatus(PFMap& postFields, Json::Value& js)
+{
+  logger->debug("tunerstatus");
+
+  js["NumDevices"] = cDevice::NumDevices();
+
+  Json::Value jsdevices(Json::arrayValue);
+
+  for (int i = 0; i < cDevice::NumDevices(); i++)
+  {
+    Json::Value oneDevice;
+    cDevice *d = cDevice::GetDevice(i);
+    oneDevice["Number"] = d->DeviceNumber();
+    oneDevice["Type"] = (const char*)d->DeviceType();
+    oneDevice["Name"] = (const char*)d->DeviceName();
+    oneDevice["IsPrimary"] = d->IsPrimaryDevice();
+
+    const cChannel* cchannel = d->GetCurrentlyTunedTransponder();
+    if (cchannel)
+    {
+      oneDevice["Frequency"] = cchannel->Frequency();
+      oneDevice["SignalStrength"] = d->SignalStrength();
+      oneDevice["SignalQuality"] = d->SignalQuality();
+
+    }
+    else
+    {
+      oneDevice["Frequency"] = 0;
+      oneDevice["SignalStrength"] = 0;
+      oneDevice["SignalQuality"] = 0;
+    }
+
+    jsdevices.append(oneDevice);
+  }
+
+  js["Devices"] = jsdevices;
+
+
+  Json::Value jstimers(Json::arrayValue);
+  int numTimers = Timers.Count();
+  cTimer* timer;
+  for (int i = 0; i < numTimers; i++)
+  {
+    timer = Timers.Get(i);
+
+    if (timer->Recording())
+    {
+      Json::Value oneTimer;
+      oneTimer["Recording"] = timer->Recording();
+      oneTimer["StartTime"] = (int)timer->StartTime();
+      oneTimer["StopTime"] = (int)timer->StopTime();
+      oneTimer["File"] = timer->File();
+
+      cRecordControl* crc = cRecordControls::GetRecordControl(timer);
+      if (crc)
+      {
+        cDevice* crcd = crc->Device();
+        oneTimer["DeviceNumber"] = crcd->DeviceNumber();
+      }
+      else
+      {
+        oneTimer["DeviceNumber"] = Json::Value::null;
+      }
+
+      const cChannel* channel = timer->Channel();
+      if (channel)
+      {
+        oneTimer["ChannelName"] = channel->Name();
+      }
+      else
+      {
+        oneTimer["ChannelName"] = Json::Value::null;
+      }
+
+      jstimers.append(oneTimer);
+    }
+
+  }
+  js["CurrentRecordings"] = jstimers;
+
+
+  js["Result"] = true;
+  return true;
+}
+
+bool VDRClient::timerset(PFMap& postFields, Json::Value& js) // RETHROWS
+{
+  logger->debug("timerset");
+
+  std::string sTimerString = getVarString(postFields, "timerstring");
+
+  logger->debug("timerset: '{}'", sTimerString);
+  cTimer *timer = new cTimer;
+  if (!timer->Parse(sTimerString.c_str()))
+  {
+    delete timer;
+    js["Result"] = false;
+    js["Error"] = "Failed to parse timer request details";
+    return true;
+  }
+
+  cTimer *t = Timers.GetTimer(timer);
+  if (t)
+  {
+    delete timer;
+    js["Result"] = false;
+    js["Error"] = "Timer already exists";
+    return true;
+  }
+
+  Timers.Add(timer);
+  Timers.SetModified();
+  js["Result"] = true;
+  return true;
+}
+
+bool VDRClient::recinfo(PFMap& postFields, Json::Value& js) // RETHROWS
+{
+  logger->debug("recinfo");
+
+  std::string reqfilename = getVarString(postFields, "filename");
+  logger->debug("recinfo: {}", reqfilename);
+
+  cRecordings Recordings;
+  Recordings.Load(); // probably have to do this
+  cRecording *recording = Recordings.GetByName(reqfilename.c_str());
+
+  if (!recording)
+  {
+    logger->error("recinfo: recinfo found no recording");
+    js["Result"] = false;
+    return true;
+  }
+
+  js["IsNew"] = recording->IsNew();
+  js["LengthInSeconds"] = recording->LengthInSeconds();
+  js["FileSizeMB"] = recording->FileSizeMB();
+  js["Name"] = recording->Name() ? recording->Name() : Json::Value::null;
+  js["Priority"] = recording->Priority();
+  js["LifeTime"] = recording->Lifetime();
+  js["Start"] = (Json::UInt)recording->Start();
+
+  js["CurrentlyRecordingStart"] = 0;
+  js["CurrentlyRecordingStop"] = 0;
+  cRecordControl *rc = cRecordControls::GetRecordControl(recording->FileName());
+  if (rc)
+  {
+    js["CurrentlyRecordingStart"] = (Json::UInt)rc->Timer()->StartTime();
+    js["CurrentlyRecordingStop"] = (Json::UInt)rc->Timer()->StopTime();
+  }
+
+  js["ResumePoint"] = 0;
+
+  const cRecordingInfo *info = recording->Info();
+  if (info)
+  {
+    js["ChannelName"] = info->ChannelName() ? info->ChannelName() : Json::Value::null;
+    js["Title"] = info->Title() ? info->Title() : Json::Value::null;
+    js["ShortText"] = info->ShortText() ? info->ShortText() : Json::Value::null;
+    js["Description"] = info->Description() ? info->Description() : Json::Value::null;
+
+    const cComponents* components = info->Components();
+    if (!components)
+    {
+      js["Components"] = Json::Value::null;
+    }
+    else
+    {
+      Json::Value jscomponents;
+
+      tComponent* component;
+      for (int i = 0; i < components->NumComponents(); i++)
+      {
+        component = components->Component(i);
+
+        Json::Value oneComponent;
+        oneComponent["Stream"] = component->stream;
+        oneComponent["Type"] = component->type;
+        oneComponent["Language"] = component->language ? component->language : Json::Value::null;
+        oneComponent["Description"] = component->description ? component->description : Json::Value::null;
+        jscomponents.append(oneComponent);
+      }
+
+      js["Components"] = jscomponents;
+    }
+
+    cResumeFile ResumeFile(recording->FileName(), recording->IsPesRecording());
+    if (ResumeFile.Read() >= 0) js["ResumePoint"] = floor(ResumeFile.Read() / info->FramesPerSecond());
+  }
+
+  js["Result"] = true;
+  return true;
+}
+
+bool VDRClient::recstop(PFMap& postFields, Json::Value& js) // RETHROWS
+{
+  logger->debug("recstop");
+
+  std::string reqfilename = getVarString(postFields, "filename");
+  logger->debug("recstop: {}", reqfilename);
+
+  cRecordings Recordings;
+  Recordings.Load(); // probably have to do this
+  cRecording *recording = Recordings.GetByName(reqfilename.c_str());
+
+  if (!recording)
+  {
+    logger->error("recstop: recstop found no recording");
+    js["Result"] = false;
+    return true;
+  }
+
+  cRecordControl *rc = cRecordControls::GetRecordControl(recording->FileName());
+  if (!rc)
+  {
+    logger->error("recstop: not currently recording");
+    js["Result"] = false;
+    return true;
+  }
+
+  if (Timers.BeingEdited())
+  {
+    logger->debug("recstop: timers being edited elsewhere");
+    js["Result"] = false;
+    return true;
+  }
+
+  cTimer* timer = rc->Timer();
+  if (!timer)
+  {
+    logger->error("recstop: timer not found");
+    js["Result"] = false;
+    return true;
+  }
+
+  timer->ClrFlags(tfActive);
+  Timers.SetModified();
+
+  js["Result"] = true;
+  return true;
+}
+
+
+bool VDRClient::recdel(PFMap& postFields, Json::Value& js) // RETHROWS
+{
+  logger->debug("recdel");
+
+  std::string reqfilename = getVarString(postFields, "filename");
+  logger->debug("recdel: {}", reqfilename);
+
+  cRecordings Recordings;
+  Recordings.Load(); // probably have to do this
+  cRecording *recording = Recordings.GetByName(reqfilename.c_str());
+
+  if (!recording)
+  {
+    js["Result"] = false;
+    js["Error"] = "Could not find recording to delete";
+    return true;
+  }
+
+  logger->debug("recdel: Deleting recording: {}", recording->Name());
+  cRecordControl *rc = cRecordControls::GetRecordControl(recording->FileName());
+  if (rc)
+  {
+    js["Result"] = false;
+    js["Error"] = "This recording is still recording.. ho ho";
+    return true;
+  }
+
+  if (recording->Delete())
+  {
+    ::Recordings.DelByName(recording->FileName());
+    js["Result"] = true;
+  }
+  else
+  {
+    js["Result"] = false;
+    js["Error"] = "Failed to delete recording";
+  }
+
+  return true;
+}
+
+void VDRClient::pathsForRecordingName(const std::string& recordingName,
+                           std::string& dirNameSingleDate,
+                           std::string& dirNameSingleTitle,
+                           std::string& dirNameSingleFolder,
+                           std::string& dirNameFullPathTitle,
+                           std::string& dirNameFullPathDate)  // throws int
+{
+  cRecordings Recordings;
+  Recordings.Load();
+  cRecording* recordingObj = Recordings.GetByName(recordingName.c_str());
+  if (!recordingObj) throw 2;
+
+  cRecordControl *rc = cRecordControls::GetRecordControl(recordingObj->FileName());
+  if (rc) throw 3;
+
+  logger->debug("paths: recording: {}", recordingObj->Name());
+  logger->debug("paths: recording: {}", recordingObj->FileName());
+
+  const char* t = recordingObj->FileName();
+  dirNameFullPathDate = t;
+
+  int k, j, m;
+
+  // Find the datedirname
+  for(k = strlen(t) - 1; k >= 0; k--)
+  {
+    if (t[k] == '/')
+    {
+      logger->debug("recmoverename: l1: {}", strlen(&t[k+1]) + 1);
+      dirNameSingleDate.assign(&t[k+1], strlen(t) - k - 1);
+      logger->debug("paths: dirNameSingleDate: '{}'", dirNameSingleDate);
+      break;
+    }
+  }
+
+  // Find the titledirname
+
+  for(j = k-1; j >= 0; j--)
+  {
+    if (t[j] == '/')
+    {
+      logger->debug("recmoverename: l2: {}", k - j);
+      dirNameSingleTitle.assign(&t[j+1], k - j - 1);
+      logger->debug("paths: dirNameSingleTitle: '{}'", dirNameSingleTitle);
+      break;
+    }
+  }
+
+  // Find the foldername
+
+  const char* vidDirStr = cVideoDirectory::Name();
+  int vidDirStrLen = strlen(vidDirStr);
+
+  logger->debug("recmoverename: j = {}, strlenvd = {}", j, vidDirStrLen);
+  if (j > vidDirStrLen) // Rec is in a subfolder now
+  {
+    for(m = j-1; m >= 0; m--)
+    {
+      if (t[m] == '/')
+      {
+        logger->debug("recmoverename: l3: {}", j - m);
+        dirNameSingleFolder.assign(&t[m+1], j - m - 1);
+        logger->debug("paths: dirNameSingleFolder: '{}'", dirNameSingleFolder);
+        break;
+      }
+    }
+  }
+
+  dirNameFullPathTitle.assign(t, k);
+  logger->debug("paths: dirNameFullPathTitle: '{}'", dirNameFullPathTitle);
+}
+
+bool VDRClient::recrename(PFMap& postFields, Json::Value& js) // RETHROWS
+{
+  logger->debug("recrename");
+
+  std::string fileNameToAffect = getVarString(postFields, "filename");
+  std::string requestedNewStr = getVarString(postFields, "newname");
+
+  std::string dirNameSingleDate;
+  std::string dirNameSingleTitle;
+  std::string dirNameSingleFolder;
+  std::string dirNameFullPathTitle;
+  std::string dirNameFullPathDate;
+
+  try
+  {
+    pathsForRecordingName(fileNameToAffect, dirNameSingleDate,
+                          dirNameSingleTitle, dirNameSingleFolder,
+                          dirNameFullPathTitle, dirNameFullPathDate);
+
+    char* requestedNewSingleTitle = (char*)malloc(requestedNewStr.size() + 1);
+    strcpy(requestedNewSingleTitle, requestedNewStr.c_str());
+    logger->debug("recmoverename: to: {}", requestedNewSingleTitle);
+
+    requestedNewSingleTitle = ExchangeChars(requestedNewSingleTitle, true);
+    if (!strlen(requestedNewSingleTitle)) throw 9;
+    logger->debug("recmoverename: EC: {}", requestedNewSingleTitle);
+
+    const char* vidDirStr = cVideoDirectory::Name();
+    logger->debug("recmoverename: viddir: {}", vidDirStr);
+
+    // Could be a new path - construct that first and test
+
+    std::string newDirNameFullPathTitle = vidDirStr;
+    newDirNameFullPathTitle.append("/");
+
+    if (!dirNameSingleFolder.empty())
+    {
+      newDirNameFullPathTitle.append(dirNameSingleFolder);
+      newDirNameFullPathTitle.append("/");
+    }
+
+    newDirNameFullPathTitle.append(requestedNewSingleTitle);
+    free(requestedNewSingleTitle);
+
+    logger->debug("recrename: NPT2: {}", newDirNameFullPathTitle);
+
+    struct stat dstat;
+    int statret = stat(newDirNameFullPathTitle.c_str(), &dstat);
+    if ((statret == -1) && (errno == ENOENT)) // Dir does not exist
+    {
+      logger->debug("recrename: new path does not exist (1)");
+      int mkdirret = mkdir(newDirNameFullPathTitle.c_str(), 0755);
+      if (mkdirret != 0) throw 4;
+    }
+    else if ((statret == 0) && (! (dstat.st_mode && S_IFDIR)))
+    {
+      // Something exists but it's not a dir
+      throw 5;
+    }
+
+    // New path now created or was there already
+
+    std::string newDirNameFullPathDate = newDirNameFullPathTitle + "/";
+    newDirNameFullPathDate.append(dirNameSingleDate);
+
+    logger->debug("recrename: doing rename '{}' '{}'", dirNameFullPathDate, newDirNameFullPathDate);
+    if (rename(dirNameFullPathDate.c_str(), newDirNameFullPathDate.c_str()) != 0) throw 8;
+
+    // Success. Test for remove old dir containter
+    rmdir(dirNameFullPathTitle.c_str()); // can't do anything about a fail result at this point.
+
+    ::Recordings.Update();
+    js["Result"] = true;
+    js["NewRecordingFileName"] = newDirNameFullPathDate;
+  }
+  catch (int e)
+  {
+    js["Result"] = false;
+    if (e == 1)
+    {
+      logger->error("recrename: Bad parameters");
+      js["Error"] = "Bad request parameters";
+    }
+    else if (e == 2)
+    {
+      logger->error("recrename: Could not find recording to move");
+      js["Error"] = "Bad filename";
+    }
+    else if (e == 3)
+    {
+      logger->error("recrename: Could not move recording, it is still recording");
+      js["Error"] = "Cannot move recording in progress";
+    }
+    else if (e == 4)
+    {
+      logger->error("recrename: Failed to make new dir (1)");
+      js["Error"] = "Failed to create new directory (1)";
+    }
+    else if (e == 5)
+    {
+      logger->error("recrename: Something already exists? (1)");
+      js["Error"] = "Something already exists at the new path (1)";
+    }
+    else if (e == 8)
+    {
+      logger->error("recrename: Rename failed");
+      js["Error"] = "Rename failed";
+    }
+    else if (e == 9)
+    {
+      logger->error("recrename: ExchangeChars lost our string");
+      js["Error"] = "Rename failed";
+    }
+  }
+
+  return true;
+}
+
+bool VDRClient::recmove(PFMap& postFields, Json::Value& js) // RETHROWS
+{
+  logger->debug("recmove");
+
+  std::string fileNameToAffect = getVarString(postFields, "filename");
+  std::string requestedNewStr = getVarString(postFields, "newpath");
+
+  std::string dirNameSingleDate;
+  std::string dirNameSingleTitle;
+  std::string dirNameSingleFolder;
+  std::string dirNameFullPathTitle;
+  std::string dirNameFullPathDate;
+
+  try
+  {
+    pathsForRecordingName(fileNameToAffect, dirNameSingleDate,
+                          dirNameSingleTitle, dirNameSingleFolder,
+                          dirNameFullPathTitle, dirNameFullPathDate);
+
+    char* requestedNewSinglePath = (char*)malloc(requestedNewStr.size() + 1);
+    strcpy(requestedNewSinglePath, requestedNewStr.c_str());
+    logger->debug("recmoverename: to: {}", requestedNewSinglePath);
+
+    requestedNewSinglePath = ExchangeChars(requestedNewSinglePath, true);
+    if (!strlen(requestedNewSinglePath)) throw 9;
+    logger->debug("recmoverename: EC: {}", requestedNewSinglePath);
+
+    const char* vidDirStr = cVideoDirectory::Name();
+    logger->debug("recmoverename: viddir: {}", vidDirStr);
+
+    // Could be a new path - construct that first and test
+
+    std::string newDirNameFullPathTitle = vidDirStr;
+    newDirNameFullPathTitle.append(requestedNewSinglePath);
+    free(requestedNewSinglePath);
+
+    logger->debug("recmove: NPT: {}", newDirNameFullPathTitle);
+
+    struct stat dstat;
+    int statret = stat(newDirNameFullPathTitle.c_str(), &dstat);
+    if ((statret == -1) && (errno == ENOENT)) // Dir does not exist
+    {
+      logger->debug("recmove: new path does not exist (1)");
+      int mkdirret = mkdir(newDirNameFullPathTitle.c_str(), 0755);
+      if (mkdirret != 0) throw 4;
+    }
+    else if ((statret == 0) && (! (dstat.st_mode && S_IFDIR)))
+    {
+      // Something exists but it's not a dir
+      throw 5;
+    }
+
+    // New path now created or was there already
+
+    newDirNameFullPathTitle.append(dirNameSingleTitle);
+    logger->debug("recmove: {}", newDirNameFullPathTitle);
+
+    statret = stat(newDirNameFullPathTitle.c_str(), &dstat);
+    if ((statret == -1) && (errno == ENOENT)) // Dir does not exist
+    {
+      logger->debug("recmove: new dir does not exist (2)");
+      int mkdirret = mkdir(newDirNameFullPathTitle.c_str(), 0755);
+      if (mkdirret != 0) throw 6;
+    }
+    else if ((statret == 0) && (! (dstat.st_mode && S_IFDIR)))
+    {
+      // Something exists but it's not a dir
+      throw 7;
+    }
+
+    // Ok, the directory container has been made, or it pre-existed.
+
+    std::string newDirNameFullPathDate = newDirNameFullPathTitle + "/";
+    newDirNameFullPathDate.append(dirNameSingleDate);
+
+    logger->debug("recmove: doing rename '{}' '{}'", dirNameFullPathDate, newDirNameFullPathDate);
+    if (rename(dirNameFullPathDate.c_str(), newDirNameFullPathDate.c_str()) != 0) throw 8;
+
+    // Success. Test for remove old dir containter
+    rmdir(dirNameFullPathTitle.c_str()); // can't do anything about a fail result at this point.
+
+    // Test for remove old foldername
+    if (!dirNameSingleFolder.empty())
+    {
+      std::string dirNameFullPathFolder = vidDirStr;
+      dirNameFullPathFolder.append("/");
+      dirNameFullPathFolder.append(dirNameSingleFolder);
+
+      logger->debug("recmove: oldfoldername: {}", dirNameFullPathFolder);
+      /*
+      DESCRIPTION
+      rmdir() deletes a directory, which must be empty.
+      ENOTEMPTY - pathname  contains  entries  other than . and ..
+      So, should be safe to call rmdir on non-empty dir
+      */
+      rmdir(dirNameFullPathFolder.c_str()); // can't do anything about a fail result at this point.
+    }
+
+    ::Recordings.Update();
+    js["Result"] = true;
+    js["NewRecordingFileName"] = newDirNameFullPathDate;
+  }
+  catch (int e)
+  {
+    js["Result"] = false;
+    if (e == 1)
+    {
+      logger->error("recmove: Bad parameters");
+      js["Error"] = "Bad request parameters";
+    }
+    else if (e == 2)
+    {
+      logger->error("recmove: Could not find recording to move");
+      js["Error"] = "Bad filename";
+    }
+    else if (e == 3)
+    {
+      logger->error("recmove: Could not move recording, it is still recording");
+      js["Error"] = "Cannot move recording in progress";
+    }
+    else if (e == 4)
+    {
+      logger->error("recmove: Failed to make new dir (1)");
+      js["Error"] = "Failed to create new directory (1)";
+    }
+    else if (e == 5)
+    {
+      logger->error("recmove: Something already exists? (1)");
+      js["Error"] = "Something already exists at the new path (1)";
+    }
+    else if (e == 6)
+    {
+      logger->error("recmove: Failed to make new dir (2)");
+      js["Error"] = "Failed to create new directory (2)";
+    }
+    else if (e == 7)
+    {
+      logger->error("recmove: Something already exists?");
+      js["Error"] = "Something already exists at the new path";
+    }
+    else if (e == 8)
+    {
+      logger->error("recmove: Rename failed");
+      js["Error"] = "Move failed";
+    }
+    else if (e == 9)
+    {
+      logger->error("recrename: ExchangeChars lost our string");
+      js["Error"] = "Rename failed";
+    }
+  }
+
+  return true;
+}
+
+bool VDRClient::timersetactive(PFMap& postFields, Json::Value& js) // RETHROWS
+{
+  logger->debug("timersetactive");
+
+  std::string rChannelID = getVarString(postFields, "ChannelID");
+  std::string rName = getVarString(postFields, "Name");
+  std::string rStartTime = getVarString(postFields, "StartTime");
+  std::string rStopTime = getVarString(postFields, "StopTime");
+  std::string rWeekDays = getVarString(postFields, "WeekDays");
+  std::string tNewActive = getVarString(postFields, "SetActive");
+
+  logger->debug("timersetactive: {} {}:{}:{}:{}:{}", tNewActive, rChannelID, rName, rStartTime, rStopTime, rWeekDays);
+
+  cTimer* timer = findTimer(rChannelID.c_str(), rName.c_str(), rStartTime.c_str(), rStopTime.c_str(), rWeekDays.c_str());
+  if (timer)
+  {
+    if      (tNewActive == "true")  timer->SetFlags(tfActive);
+    else if (tNewActive == "false") timer->ClrFlags(tfActive);
+    else
+    {
+      js["Result"] = false;
+      js["Error"] = "Bad request parameters";
+      return true;
+    }
+
+    js["Result"] = true;
+    Timers.SetModified();
+    return true;
+  }
+
+  js["Result"] = false;
+  js["Error"] = "Timer not found";
+  return true;
+}
+
+bool VDRClient::timerdel(PFMap& postFields, Json::Value& js) // RETHROWS
+{
+  logger->debug("timerdel");
+
+  std::string rChannelID = getVarString(postFields, "ChannelID");
+  std::string rName = getVarString(postFields, "Name");
+  std::string rStartTime = getVarString(postFields, "StartTime");
+  std::string rStopTime = getVarString(postFields, "StopTime");
+  std::string rWeekDays = getVarString(postFields, "WeekDays");
+
+  logger->debug("timerdel: {}:{}:{}:{}:{}", rChannelID, rName, rStartTime, rStopTime, rWeekDays);
+
+  if (Timers.BeingEdited())
+  {
+    logger->debug("timerdel: Unable to delete timer - timers being edited at VDR");
+    js["Result"] = false;
+    js["Error"] = "Timers being edited at VDR";
+    return true;
+  }
+
+  cTimer* timer = findTimer(rChannelID.c_str(), rName.c_str(), rStartTime.c_str(), rStopTime.c_str(), rWeekDays.c_str());
+  if (timer)
+  {
+    if (timer->Recording())
+    {
+      logger->debug("timerdel: Unable to delete timer - timer is running");
+      js["Result"] = false;
+      js["Error"] = "Timer is running";
+      return true;
+    }
+
+    Timers.Del(timer);
+    Timers.SetModified();
+    js["Result"] = true;
+    return true;
+  }
+
+  js["Result"] = false;
+  js["Error"] = "Timer not found";
+  return true;
+}
+
+bool VDRClient::timerisrecording(PFMap& postFields, Json::Value& js) // RETHROWS
+{
+  logger->debug("timerisrecording");
+
+  std::string rChannelID = getVarString(postFields, "ChannelID");
+  std::string rName = getVarString(postFields, "Name");
+  std::string rStartTime = getVarString(postFields, "StartTime");
+  std::string rStopTime = getVarString(postFields, "StopTime");
+  std::string rWeekDays = getVarString(postFields, "WeekDays");
+
+  logger->debug("timerisrecording: {}:{}:{}:{}:{}", rChannelID, rName, rStartTime, rStopTime, rWeekDays);
+
+  cTimer* timer = findTimer(rChannelID.c_str(), rName.c_str(), rStartTime.c_str(), rStopTime.c_str(), rWeekDays.c_str());
+  if (timer)
+  {
+    js["Recording"] = timer->Recording();
+    js["Pending"] = timer->Pending();
+    js["Result"] = true;
+    return true;
+  }
+
+  js["Result"] = false;
+  js["Error"] = "Timer not found";
+  return true;
+}
+
+bool VDRClient::recresetresume(PFMap& postFields, Json::Value& js) // RETHROWS
+{
+  logger->debug("recresetresume");
+
+  std::string reqfilename = getVarString(postFields, "filename");
+  logger->debug("recresetresume: {}", reqfilename);
+
+  cRecordings Recordings;
+  Recordings.Load(); // probably have to do this
+  cRecording *recording = Recordings.GetByName(reqfilename.c_str());
+
+  if (!recording)
+  {
+    js["Result"] = false;
+    js["Error"] = "Could not find recording to reset resume";
+    return true;
+  }
+
+  logger->debug("recresetresume: Reset resume for: {}", recording->Name());
+
+  cResumeFile ResumeFile(recording->FileName(), recording->IsPesRecording());
+  if (ResumeFile.Read() >= 0)
+  {
+    ResumeFile.Delete();
+    js["Result"] = true;
+    return true;
+  }
+  else
+  {
+    js["Result"] = false;
+    js["Error"] = "Recording has no resume point";
+    return true;
+  }
+}
+
+bool VDRClient::timeredit(PFMap& postFields, Json::Value& js) // RETHROWS
+{
+  logger->debug("timeredit");
+
+  std::string oldName      = getVarString(postFields, "OldName");
+  std::string oldActive    = getVarString(postFields, "OldActive");
+  std::string oldChannelID = getVarString(postFields, "OldChannelID");
+  std::string oldDay       = getVarString(postFields, "OldDay");
+  std::string oldWeekDays  = getVarString(postFields, "OldWeekDays");
+  std::string oldStartTime = getVarString(postFields, "OldStartTime");
+  std::string oldStopTime  = getVarString(postFields, "OldStopTime");
+  std::string oldPriority  = getVarString(postFields, "OldPriority");
+  std::string oldLifetime  = getVarString(postFields, "OldLifetime");
+
+  logger->debug("timeredit: {} {} {} {} {} {} {} {} {}", oldName, oldActive, oldChannelID, oldDay, oldWeekDays, oldStartTime, oldStopTime, oldPriority, oldLifetime);
+
+  std::string newName      = getVarString(postFields, "NewName");
+  std::string newActive    = getVarString(postFields, "NewActive");
+  std::string newChannelID = getVarString(postFields, "NewChannelID");
+  std::string newDay       = getVarString(postFields, "NewDay");
+  std::string newWeekDays  = getVarString(postFields, "NewWeekDays");
+  std::string newStartTime = getVarString(postFields, "NewStartTime");
+  std::string newStopTime  = getVarString(postFields, "NewStopTime");
+  std::string newPriority  = getVarString(postFields, "NewPriority");
+  std::string newLifetime  = getVarString(postFields, "NewLifetime");
+
+  logger->debug("timeredit: {} {} {} {} {} {} {} {} {}", newName, newActive, newChannelID, newDay, newWeekDays, newStartTime, newStopTime, newPriority, newLifetime);
+
+  cTimer* timer = findTimer2(oldName.c_str(), oldActive.c_str(), oldChannelID.c_str(), oldDay.c_str(), oldWeekDays.c_str(), oldStartTime.c_str(), oldStopTime.c_str(), oldPriority.c_str(), oldLifetime.c_str());
+  if (!timer)
+  {
+    js["Result"] = false;
+    js["Error"] = "Timer not found";
+    return true;
+  }
+
+  // Old version commented below (now removed) used to set each thing individually based on whether it had changed. However, since
+  // the only way to change the timer channel appears to be with the cTimer::Parse function, might as well use that
+  // for everything it supports
+  // Except flags. Get current flags, set using Parse, then add/remove active as needed the other way.
+
+  time_t nstt = std::stoi(newStartTime);
+  struct tm nstm;
+  localtime_r(&nstt, &nstm);
+  int nssf = (nstm.tm_hour * 100) + nstm.tm_min;
+
+  time_t nztt = std::stoi(newStopTime);
+  struct tm nztm;
+  localtime_r(&nztt, &nztm);
+  int nzsf = (nztm.tm_hour * 100) + nztm.tm_min;
+
+  std::replace(newName.begin(), newName.end(), ':', '|');
+
+  // ? Convert to std::string?
+  cString parseBuffer = cString::sprintf("%u:%s:%s:%04d:%04d:%d:%d:%s:%s",
+                          timer->Flags(), newChannelID.c_str(), *(cTimer::PrintDay(std::stoi(newDay), std::stoi(newWeekDays), true)),
+                          nssf, nzsf, std::stoi(newPriority), std::stoi(newLifetime), newName.c_str(), timer->Aux() ? timer->Aux() : "");
+
+  logger->debug("timeredit: new parse: {}", *parseBuffer);
+
+  bool parseResult = timer->Parse(*parseBuffer);
+  if (!parseResult)
+  {
+    js["Result"] = false;
+    js["Error"] = "Timer parsing failed";
+    return true;
+  }
+
+  if (timer->HasFlags(tfActive) != !(strcasecmp(newActive.c_str(), "true")))
+  {
+    logger->debug("timeredit: {} {} set new active: {}", timer->HasFlags(tfActive), !(strcasecmp(newActive.c_str(), "true")), newActive);
+
+    if (strcasecmp(newActive.c_str(), "true") == 0)
+    {
+      timer->SetFlags(tfActive);
+    }
+    else if (strcasecmp(newActive.c_str(), "false") == 0)
+    {
+      timer->ClrFlags(tfActive);
+    }
+    else
+    {
+      js["Result"] = false;
+      js["Error"] = "Bad request parameters";
+      return true;
+    }
+  }
+
+  js["Result"] = true;
+  Timers.SetModified();
+  return true;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+const cEvent* VDRClient::getEvent(Json::Value& js, int channelNumber, int eventID, int aroundTime)
+{
+  cChannel* channel = NULL;
+  for (channel = Channels.First(); channel; channel = Channels.Next(channel))
+  {
+    if (channel->GroupSep()) continue;
+    if (channel->Number() == channelNumber) break;
+  }
+
+  if (!channel)
+  {
+    logger->error("getevent: Could not find requested channel: {}", channelNumber);
+    js["Error"] = "Could not find channel";
+    return NULL;
+  }
+
+  cSchedulesLock MutexLock;
+  const cSchedules *Schedules = cSchedules::Schedules(MutexLock);
+  if (!Schedules)
+  {
+    logger->error("getevent: Could not find requested channel: {}", channelNumber);
+    js["Error"] = "Internal schedules error (1)";
+    return NULL;
+  }
+
+  const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
+  if (!Schedule)
+  {
+    logger->error("getevent: Could not find requested channel: {}", channelNumber);
+    js["Error"] = "Internal schedules error (2)";
+    return NULL;
+  }
+
+  const cEvent* event = NULL;
+  if (eventID)
+    event = Schedule->GetEvent(eventID);
+  else
+    event = Schedule->GetEventAround(aroundTime);
+
+  if (!event)
+  {
+    logger->error("getevent: Could not find requested event: {}", eventID);
+    js["Error"] = "Internal schedules error (3)";
+    return NULL;
+  }
+
+  return event;
+}
+
+cTimer* VDRClient::findTimer(const char* rChannelID, const char* rName, const char* rStartTime, const char* rStopTime, const char* rWeekDays)
+{
+  int numTimers = Timers.Count();
+  cTimer* timer;
+  for (int i = 0; i < numTimers; i++)
+  {
+    timer = Timers.Get(i);
+
+    logger->debug("findtimer: current: {}", (const char*)timer->ToText(true));
+    logger->debug("findtimer: {}", (const char*)timer->Channel()->GetChannelID().ToString());
+    logger->debug("findtimer: {}", rChannelID);
+    logger->debug("findtimer: {}", timer->File());
+    logger->debug("findtimer: {}", rName);
+    logger->debug("findtimer: {}", timer->StartTime());
+    logger->debug("findtimer: {}", rStartTime);
+    logger->debug("findtimer: {}", timer->StopTime());
+    logger->debug("findtimer: {}", rStopTime);
+    logger->debug("findtimer: {}", timer->WeekDays());
+    logger->debug("findtimer: {}", rWeekDays);
+
+    if (
+            (strcmp(timer->Channel()->GetChannelID().ToString(), rChannelID) == 0)
+         && (strcmp(timer->File(), rName) == 0)
+         && (timer->StartTime() == atoi(rStartTime))
+         && (timer->StopTime() == atoi(rStopTime))
+         && (timer->WeekDays() == atoi(rWeekDays))
+       )
+    {
+      logger->debug("findtimer: found");
+      return timer;
+    }
+  }
+  logger->debug("findtimer: no timer found");
+  return NULL;
+}
+
+cTimer* VDRClient::findTimer2(const char* rName, const char* rActive, const char* rChannelID, const char* rDay, const char* rWeekDays, const char* rStartTime, const char* rStopTime, const char* rPriority, const char* rLifetime)
+{
+  int numTimers = Timers.Count();
+  cTimer* timer;
+  logger->debug("findtimer2: {} {} {} {} {} {} {} {} {}", rName, rActive, rChannelID, rDay, rWeekDays, rStartTime, rStopTime, rPriority, rLifetime);
+  for (int i = 0; i < numTimers; i++)
+  {
+    timer = Timers.Get(i);
+
+    logger->debug("findtimer2: search: {} {} {} {} {} {} {} {} {}", timer->File(), timer->HasFlags(tfActive), (const char*)timer->Channel()->GetChannelID().ToString(),
+                                                                                        (int)timer->Day(), timer->WeekDays(), (int)timer->StartTime(), (int)timer->StopTime(),
+                                                                                        timer->Priority(), timer->Lifetime());
+
+    if (    (strcmp(timer->File(), rName) == 0)
+         && (timer->HasFlags(tfActive) == !(strcasecmp(rActive, "true")))
+         && (strcmp(timer->Channel()->GetChannelID().ToString(), rChannelID) == 0)
+         && (timer->Day() == atoi(rDay))
+         && (timer->WeekDays() == atoi(rWeekDays))
+         && (timer->StartTime() == atoi(rStartTime))
+         && (timer->StopTime() == atoi(rStopTime))
+         && (timer->Priority() == atoi(rPriority))
+         && (timer->Lifetime() == atoi(rLifetime))
+       )
+    {
+      logger->debug("findtimer2: found");
+      return timer;
+    }
+  }
+  logger->debug("findtimer2: no timer found");
+  return NULL;
+}
+
+int VDRClient::getVarInt(PFMap& postFields, const char* paramName) // THROWS
+{
+  auto i = postFields.find(paramName);
+  if (i == postFields.end()) throw BadParamException(paramName);
+  int r;
+  try { r = std::stoi(i->second); }
+  catch (std::exception e) { throw BadParamException(paramName); }
+  return r;
+}
+
+std::string VDRClient::getVarString(PFMap& postFields, const char* paramName) // THROWS
+{
+  auto i = postFields.find(paramName);
+  if (i == postFields.end()) throw BadParamException(paramName);
+  if (i->second.empty()) throw BadParamException(paramName);
+  return i->second;
+}
diff --git a/vdrclient.h b/vdrclient.h
new file mode 100644
index 0000000..75ec278
--- /dev/null
+++ b/vdrclient.h
@@ -0,0 +1,76 @@
+#ifndef VDRCLIENT_H
+#define VDRCLIENT_H
+
+#include <jsoncpp/json/json.h>
+
+// Log docs: https://github.com/gabime/spdlog
+#include <spdlog/spdlog.h>
+namespace spd = spdlog;
+
+class cEvent;
+class cTimer;
+
+class VDRClient
+{
+  typedef std::map<std::string, std::string> PFMap;
+
+  public:
+    VDRClient();
+
+    bool process(std::string& request, PFMap& postFields, std::string& returnData);
+
+  private:
+    std::shared_ptr<spd::logger> logger;
+    bool gettime(PFMap& postFields, Json::Value& returnJSON);
+    bool diskstats(PFMap& postFields, Json::Value& returnJSON);
+    bool channellist(PFMap& postFields, Json::Value& returnJSON);
+    bool reclist(PFMap& postFields, Json::Value& returnJSON);
+    bool timerlist(PFMap& postFields, Json::Value& returnJSON);
+    bool epgdownload(PFMap& postFields, Json::Value& returnJSON);
+    bool tunersstatus(PFMap& postFields, Json::Value& returnJSON);
+
+    bool channelschedule(PFMap& postFields, Json::Value& returnJSON); // throws BadParamException
+    bool getscheduleevent(PFMap& postFields, Json::Value& returnJSON); // throws BadParamException
+    bool epgsearch(PFMap& postFields, Json::Value& returnJSON); // throws BadParamException
+    bool epgsearchsame(PFMap& postFields, Json::Value& returnJSON); // throws BadParamException
+    bool timerset(PFMap& postFields, Json::Value& returnJSON); // throws BadParamException
+    bool recinfo(PFMap& postFields, Json::Value& returnJSON); // throws BadParamException
+    bool recstop(PFMap& postFields, Json::Value& returnJSON); // throws BadParamException
+    bool recdel(PFMap& postFields, Json::Value& returnJSON); // throws BadParamException
+    bool recrename(PFMap& postFields, Json::Value& returnJSON); // throws BadParamException
+    bool recmove(PFMap& postFields, Json::Value& returnJSON); // throws BadParamException
+    bool timersetactive(PFMap& postFields, Json::Value& returnJSON); // throws BadParamException
+    bool timerdel(PFMap& postFields, Json::Value& returnJSON); // throws BadParamException
+    bool timerisrecording(PFMap& postFields, Json::Value& returnJSON); // throws BadParamException
+    bool recresetresume(PFMap& postFields, Json::Value& returnJSON); // throws BadParamException
+    bool timeredit(PFMap& postFields, Json::Value& returnJSON);
+
+    cTimer* findTimer(const char* rChannelID, const char* rName, const char* rStartTime, const char* rStopTime, const char* rWeekDays);
+    cTimer* findTimer2(const char* rName, const char* rActive, const char* rChannelID, const char* rDay, const char* rWeekDays, const char* rStartTime, const char* rStopTime, const char* rPriority, const char* rLifetime);
+    const cEvent* getEvent(Json::Value& js, int channelNumber, int eventID, int aroundTime);
+
+    void pathsForRecordingName(const std::string& recordingName,
+                           std::string& dirNameSingleDate,
+                           std::string& dirNameSingleTitle,
+                           std::string& dirNameSingleFolder,
+                           std::string& dirNameFullPathTitle,
+                           std::string& dirNameFullPathDate);  // throws int
+
+    int getVarInt(PFMap& postFields, const char* paramName); // THROWS
+    std::string getVarString(PFMap& postFields, const char* paramName); // THROWS
+
+    class BadParamException : public std::exception
+    {
+    public:
+      const char* param;
+      BadParamException(const char* _param) { param = _param; }
+      /*
+      virtual const char* what() const throw()
+      {
+        return "Mine!!";
+      }
+      */
+    };
+};
+
+#endif
-- 
2.39.2