Fix server.tag and version output

src/angel/angel_main.c

@@ -3,6 +3,8 @@
 #include <lighttpd/angel_config_parser.h>
 #include <lighttpd/angel_plugin_core.h>
 
+#include <lighttpd/version.h>
+
 # ifndef HAVE_ISSETUGID
 
 static int l_issetugid() {
@@ -50,7 +52,7 @@ int main(int argc, char *argv[]) {
 	}
 
 	if (show_version) {
-		g_print("%s %s - a fast and lightweight webserver\n", PACKAGE_NAME "-angel", PACKAGE_VERSION);
+		g_print(PACKAGE_NAME "-angel" "/" PACKAGE_VERSION REPO_VERSION " - a fast and lightweight webserver\n");
 		g_print("Build date: %s\n", PACKAGE_BUILD_DATE);
 		goto cleanup;
 	}

src/main/lighttpd.c

@@ -3,6 +3,8 @@
 #include <lighttpd/config_parser.h>
 #include <lighttpd/profiler.h>
 
+#include <lighttpd/version.h>
+
 #ifdef HAVE_LUA_H
 # include <lighttpd/config_lua.h>
 #endif
@@ -66,7 +68,7 @@ int main(int argc, char *argv[]) {
 
 	/* -v, show version and exit */
 	if (show_version) {
-		g_print("%s-%s - a fast and lightweight webserver\n", PACKAGE_NAME, PACKAGE_VERSION);
+		g_print(PACKAGE_DESC " - a fast and lightweight webserver\n");
 		g_print("Build date: %s\n", PACKAGE_BUILD_DATE);
 #ifdef LIGHTTPD_REVISION
 		g_print("Revision: %s\n", LIGHTTPD_REVISION);

src/main/plugin_core.c

@@ -3,6 +3,8 @@
 #include <lighttpd/plugin_core.h>
 #include <lighttpd/profiler.h>
 
+#include <lighttpd/version.h>
+
 #include <sys/stat.h>
 #include <fcntl.h>
 
@@ -1159,7 +1161,7 @@ static const liPluginOption options[] = {
 	{ "static-file.exclude", LI_VALUE_LIST, NULL, NULL, NULL }, /* TODO: not used right now */
 
 	{ "server.name", LI_VALUE_STRING, NULL, NULL, NULL },
-	{ "server.tag", LI_VALUE_STRING, "lighttpd-2.0~sandbox", NULL, NULL },
+	{ "server.tag", LI_VALUE_STRING, PACKAGE_DESC, NULL, NULL },
 	{ "server.max_keep_alive_idle", LI_VALUE_NUMBER, GINT_TO_POINTER(5), NULL, NULL },
 	{ "server.max_keep_alive_requests", LI_VALUE_NUMBER, GINT_TO_POINTER(15), NULL, NULL },