From 6191504cbcefd0bf73cef7855ccee4553d9f761f Mon Sep 17 00:00:00 2001
From: Roland Reichwein <mail@reichwein.it>
Date: Mon, 11 May 2020 08:48:10 +0200
Subject: webbox: Use version of webserver

---
 TODO                      | 1 -
 debian/changelog          | 1 +
 plugins/webbox/webbox.cpp | 3 +--
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/TODO b/TODO
index 91b3b3c..3142cf9 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,4 @@
 Speed up config.GetPath
 weblog: link consistency check (cron?)
 Integrate into Debian: WNPP
-read: The socket was closed due to a timeout
 support alternative SSL libs: mbedtls, gnutls, wolfssl, botan, (matrixssl, libressl, cryptlib: not in debian)
diff --git a/debian/changelog b/debian/changelog
index aea89e7..2c671ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 webserver (1.5) unstable; urgency=medium
 
+  * Improved webbox integration
   * Bugfix: Path matching
   * Minor fixes
 
diff --git a/plugins/webbox/webbox.cpp b/plugins/webbox/webbox.cpp
index 53322b5..7de431a 100644
--- a/plugins/webbox/webbox.cpp
+++ b/plugins/webbox/webbox.cpp
@@ -29,7 +29,6 @@ namespace pt = boost::property_tree;
 
 namespace {
 
- static const std::string PROGRAMVERSION{"Webbox 2.0"};
  static const std::string DOWNLOAD_FILENAME{"webbox-download.zip"};
 
  // STATIC_HTML_TARGET: no leading slash because comparision is done with relative path;
@@ -391,7 +390,7 @@ protected:
  virtual std::string start(CommandParameters& p)
  {
   p.m_SetResponseHeader("content_type", "text/plain");
-  return PROGRAMVERSION + "<br/>(C) 2020 <a href=\"https://www.reichwein.it/\">Reichwein.IT</a>";
+  return p.m_GetServerParam("version") + "<br/>(C) 2020 <a href=\"https://www.reichwein.it/\">Reichwein.IT</a>";
  }
 };
 
-- 
cgit v1.2.3