summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--TODO1
-rw-r--r--debian/changelog6
-rw-r--r--plugins/statistics/statistics.cpp8
-rw-r--r--plugins/webbox/TODO1
5 files changed, 16 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 11a1f02..b2c02cf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DISTROS=debian10 ubuntu1910
+DISTROS=debian10 ubuntu1910 ubuntu2004
VERSION=$(shell dpkg-parsechangelog --show-field Version)
PROJECTNAME=webserver
PLUGINS=static-files webbox cgi weblog statistics fcgi
@@ -200,6 +200,10 @@ DISTFILES= \
plugins/cgi/cgi.h \
plugins/cgi/Makefile \
plugins/cgi/cgi.cpp \
+ plugins/fcgi/Makefile \
+ plugins/fcgi/fastcgi.h \
+ plugins/fcgi/fcgi.h \
+ plugins/fcgi/fcgi.cpp \
plugins/webbox/file.h \
plugins/webbox/file.cpp \
plugins/webbox/stringutil.cpp \
diff --git a/TODO b/TODO
index d275583..3d12e54 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,6 @@
Speed up config.GetPath
weblog: link consistency check (cron?)
+Debian: keyring package
Integrate into Debian: WNPP
read: The socket was closed due to a timeout
webbox: Info if not selected: all
diff --git a/debian/changelog b/debian/changelog
index 9c6130d..7cd1539 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+webserver (1.4) UNRELEASED; urgency=medium
+
+ * Minor corrections
+
+ -- Roland Reichwein <rr@antcom.de> Sun, 03 May 2020 09:49:32 +0200
+
webserver (1.3) unstable; urgency=medium
* Added FCGI
diff --git a/plugins/statistics/statistics.cpp b/plugins/statistics/statistics.cpp
index 5eef858..35ea241 100644
--- a/plugins/statistics/statistics.cpp
+++ b/plugins/statistics/statistics.cpp
@@ -114,10 +114,10 @@ std::string statistics_plugin::generate_page(
result += "<h1>Webserver Statistics</h1>";
result += "<p>Host uptime: "s + GetServerParam("uptime_host") + "</p>";
result += "<p>Host webserver: "s + GetServerParam("uptime_webserver") + "</p>";
- result += "<p>IPv6 fraction by requests: "s + std::to_string(ipv6_fraction_by_requests * 100) + "</p>";
- result += "<p>IPv6 fraction by bytes: "s + std::to_string(ipv6_fraction_by_bytes * 100) + "</p>";
- result += "<p>HTTPS fraction by requests: "s + std::to_string(https_fraction_by_requests * 100) + "</p>";
- result += "<p>HTTPS fraction by bytes: "s + std::to_string(https_fraction_by_bytes * 100) + "</p>";
+ result += "<p>IPv6 fraction by requests: "s + std::to_string(ipv6_fraction_by_requests * 100) + "%</p>";
+ result += "<p>IPv6 fraction by bytes: "s + std::to_string(ipv6_fraction_by_bytes * 100) + "%</p>";
+ result += "<p>HTTPS fraction by requests: "s + std::to_string(https_fraction_by_requests * 100) + "%</p>";
+ result += "<p>HTTPS fraction by bytes: "s + std::to_string(https_fraction_by_bytes * 100) + "%</p>";
result += "<pre>"s + statistics + "</pre>"s;
result += footer;
diff --git a/plugins/webbox/TODO b/plugins/webbox/TODO
index 307dfe4..c61d179 100644
--- a/plugins/webbox/TODO
+++ b/plugins/webbox/TODO
@@ -3,7 +3,6 @@ Prio 1 (for next version)
generate download link for selected file
selection button for files/dirs
-fix minification on stable debian
gallery
Prio 2 (for future versions)