- Update to 1.15

PR:		ports/80191
Submitted by:	maintainer

3 files changed, 24 insertions, 7 deletions

diff --git a/www/shttpd/Makefile b/www/shttpd/Makefile
index 3d304fb70121..71cea932dd0e 100644
--- a/www/shttpd/Makefile
+++ b/www/shttpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	shttpd
-PORTVERSION=	1.14
+PORTVERSION=	1.15
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	shttpd
diff --git a/www/shttpd/distinfo b/www/shttpd/distinfo
index 231873827cc3..75f41793cf8a 100644
--- a/www/shttpd/distinfo
+++ b/www/shttpd/distinfo
@@ -1,2 +1,2 @@
-MD5 (shttpd/shttpd_1.14.c) = af764aafb8789c703c6688e355388081
-SIZE (shttpd/shttpd_1.14.c) = 78643
+MD5 (shttpd/shttpd_1.15.c) = 5d50e8c6b0c6458ee336ed41fe1154bb
+SIZE (shttpd/shttpd_1.15.c) = 79135
diff --git a/www/shttpd/files/shttpd.1 b/www/shttpd/files/shttpd.1
index fcb97237628d..7f5e6e0ac01a 100644
--- a/www/shttpd/files/shttpd.1
+++ b/www/shttpd/files/shttpd.1
@@ -2,20 +2,30 @@
 .SH NAME
 shttpd \- Simple HTTP Daemon
 .SH SYNOPSIS
+.PP
 .B shttpd
 .I [OPTIONS]
-.br
+.PP
+.B http    stream  tcp     nowait  nobody  /usr/local/bin/shttpd shttpd -I -d /var/www
 .SH "DESCRIPTION"
 .B shttpd
 is a simple web server. It supports: CGI, Digest authentication, cookies,
 GET, POST, PUT, DELETE methods, SSL. It does not detach from terminal. 
 It stores logs in a standard format. If -d option is not given, the document
-root is assumed to be current directory.
+root is assumed to be the current directory.
+.P
 .B shttpd
 can be embedded into existing application, in order to provide a Web GUI.
 To do that, a header file with interface definition is needed, and application
 should be compiled with shttpd.c, with -DEMBEDDED compilation flag set.
 Refer to http://shttpd.sf.net to get the header file.
+.P
+.B shttpd
+can be run as stand-alone server, or it may be managed by the
+.I inetd(8)
+superdaemon. In latter case,
+.I \-I
+option should be specified in inetd configuration line.
 .SH OPTIONS
 .TP 13
 .I \-d directory
@@ -28,7 +38,7 @@ listening port (default 80 for non-SSL, 443 for SSL mode)
 display help
 .TP 13
 .I \-S
-use SSL (default NO)
+use SSL
 .TP 13
 .I \-s certfile
 use SSL certificate file (default shttpd.pem)
@@ -39,6 +49,9 @@ error log file (default none)
 .I \-l logfile
 log file  (default shttpd.log)
 .TP 13
+.I \-I
+inetd mode
+.TP 13
 .I \-i file1[,file2..]
 index file (default index.html,index.cgi)
 .TP 13
@@ -58,7 +71,11 @@ mime types file (default none)
 authentication realm (default mydomain.com)
 .TP 13
 .I \-D
-forbid directory listing (default yes)
+forbid directory listing
+.SH FILES
+.I /etc/inetd.conf
+.SH SEE ALSO
+.I inetd(8)
 .SH COPYRIGHT
 .B shttpd
 is licensed under the terms of MIT license.