summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9>2016-04-01 17:38:32 +0000
committerstbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9>2016-04-01 17:38:32 +0000
commitfd876a356f6850c3623bd4c3bcd63474eb658bfc (patch)
tree5eef4e1fe24b3a5baf74920d7a837d35537c2a59
parent988077a679f78883965f5a5c014d2c4d5e28f304 (diff)
downloadlighttpd-1.4.x.tar.gz
[core] clean up srv before exiting for lighttpd -[vVh]lighttpd-1.4.x
From: Glenn Strauss <gstrauss@gluelogic.com> git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@3138 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r--NEWS1
-rw-r--r--src/server.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 8b394859..4be0678c 100644
--- a/NEWS
+++ b/NEWS
@@ -61,6 +61,7 @@ NEWS
* pass buf size to li_tohex()
* use li_[iu]tostrn() instead of li_[iu]tostr()
* [stream] fstat() after open() to obtain file size
+ * [core] clean up srv before exiting for lighttpd -[vVh]
- 1.4.39 - 2016-01-02
* [core] fix memset_s call (fixes #2698)
diff --git a/src/server.c b/src/server.c
index 9cd29cf5..61d850c3 100644
--- a/src/server.c
+++ b/src/server.c
@@ -674,9 +674,9 @@ int main (int argc, char **argv) {
case 'p': print_config = 1; break;
case 't': ++test_config; break;
case 'D': srv->srvconf.dont_daemonize = 1; break;
- case 'v': show_version(); return 0;
- case 'V': show_features(); return 0;
- case 'h': show_help(); return 0;
+ case 'v': show_version(); server_free(srv); return 0;
+ case 'V': show_features(); server_free(srv); return 0;
+ case 'h': show_help(); server_free(srv); return 0;
default:
show_help();
server_free(srv);