diff options
| author |   Stuart Herbert <stuart@gentoo.org> | 2004-04-23 11:10:21 +0000 |
|---|---|---|
| committer | Stuart Herbert <stuart@gentoo.org> | 2004-04-23 11:10:21 +0000 |
| commit | 90f8d6bf5c31451e8bb97787308d61a45b7d92f2 (patch) | |
| tree | 1eec03c0c6588eff4715878e7e74931f191089c0 | |
| parent | Initial import (Manifest recommit) (diff) | |
| download | gentoo-2-90f8d6bf5c31451e8bb97787308d61a45b7d92f2.tar.gz gentoo-2-90f8d6bf5c31451e8bb97787308d61a45b7d92f2.tar.bz2 gentoo-2-90f8d6bf5c31451e8bb97787308d61a45b7d92f2.zip | |
Fix for bug #40228
| -rw-r--r-- | net-www/mini_httpd/ChangeLog | 8 | ||||
| -rw-r--r-- | net-www/mini_httpd/Manifest | 14 | ||||
| -rw-r--r-- | net-www/mini_httpd/files/mini_httpd.conf.sample-1.19 | 75 |
3 files changed, 60 insertions, 37 deletions
diff --git a/net-www/mini_httpd/ChangeLog b/net-www/mini_httpd/ChangeLog index 892d90078662..9d9d4cefce43 100644 --- a/net-www/mini_httpd/ChangeLog +++ b/net-www/mini_httpd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-www/mini_httpd -# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mini_httpd/ChangeLog,v 1.3 2003/12/29 13:33:56 mholzer Exp $ +# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-www/mini_httpd/ChangeLog,v 1.4 2004/04/23 11:10:21 stuart Exp $ + + 23 Apr 2004; Stuart Herbert <stuart@gentoo.org> + files/mini_httpd.conf.sample-1.19: + Replaced overwritten config sample file with correct version. Fixes bug #40228 *mini_httpd-1.19 (29 Dec 2003) diff --git a/net-www/mini_httpd/Manifest b/net-www/mini_httpd/Manifest index da2fb399b214..9a65bcd6caed 100644 --- a/net-www/mini_httpd/Manifest +++ b/net-www/mini_httpd/Manifest @@ -1,11 +1,11 @@ -MD5 0a7617c2c08ec920ece4d2b412af270c files/digest-mini_httpd-1.17_beta1 71 -MD5 c000548ba0f55ece3df464f3512f7baa files/digest-mini_httpd-1.19 66 +MD5 390437b89439128ffbf7e136bec73d6f mini_httpd-1.17_beta1.ebuild 2005 +MD5 54f38e019756fc8fe2110f03e1e0aefa ChangeLog 774 +MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161 +MD5 ff715c036342d6604d1df5eb94cb7bbd mini_httpd-1.19.ebuild 1887 MD5 4999dd0e1f1fef19fee9d91e030157e7 files/mini_httpd.conf.sample 860 -MD5 98672f13e634b1fdd0059bc6cd187ed8 files/mini_httpd.conf.sample-1.19 1289 +MD5 4999dd0e1f1fef19fee9d91e030157e7 files/mini_httpd.conf.sample-1.19 860 +MD5 c000548ba0f55ece3df464f3512f7baa files/digest-mini_httpd-1.19 66 MD5 1bba9027afa8f8932f3a6dfd32a9ba85 files/mini_httpd.confd 1136 +MD5 0a7617c2c08ec920ece4d2b412af270c files/digest-mini_httpd-1.17_beta1 71 MD5 69c6610120b96311912d8c47e7ecd21e files/mini_httpd.confd-1.19 1283 MD5 47b6673a28ee04c447e690932d62b0ac files/mini_httpd.init 867 -MD5 54f38e019756fc8fe2110f03e1e0aefa ChangeLog 774 -MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161 -MD5 390437b89439128ffbf7e136bec73d6f mini_httpd-1.17_beta1.ebuild 2005 -MD5 ff715c036342d6604d1df5eb94cb7bbd mini_httpd-1.19.ebuild 1887 diff --git a/net-www/mini_httpd/files/mini_httpd.conf.sample-1.19 b/net-www/mini_httpd/files/mini_httpd.conf.sample-1.19 index f0ed82b3d15a..092f7a546b48 100644 --- a/net-www/mini_httpd/files/mini_httpd.conf.sample-1.19 +++ b/net-www/mini_httpd/files/mini_httpd.conf.sample-1.19 @@ -1,28 +1,47 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mini_httpd/files/mini_httpd.conf.sample-1.19,v 1.2 2004/03/06 03:59:34 vapier Exp $ - -## Config file for /etc/init.d/mini_httpd - -## the startup-dir of mini_httpd is the docroot, so we specify it here -## and the init-script does a "cd" prior to startup: -#MINI_HTTPD_DOCROOT="/var/www/localhost" - -## There are 2 ways to configure mini_httpd: -## 1) specify all params on the cmd-line -## 2) use a config-file (and start with "-C <conf-file>") -## Note: 1) and 2) can be mixed. -## -## We choose 1) here -- if you have a more complicated setup read -## mini_httpd(8) for details on 2). - -MINI_HTTPD_OPTS="-p 8080 -u nobody -r -i /var/run/mini_httpd.pid -l /var/log/mini_httpd.log" - -## to add cgi-support you should switch over to a config-file, a sample can -## be found in your DOCDESTTREE (/usr/share/doc/mini_httpd-xxxx) named -## mini_httpd.conf.sample.gz -## copy the sample to /etc/mini_httpd.conf and replace the MINI_HTTPD_OPTS-line -## above by: -##MINI_HTTPD_OPTS="-C /etc/mini_httpd.conf" -## poor-mans cgi-pattern (only use if you know what you are doing -- you have been warned) -#MINI_HTTPD_OPTS="$MINI_HTTPD_OPS -c **.cgi|**.sh" +## /etc/mini_httpd.conf +## +## do not leave empty lines in here! +## format is: key=value +## +## run in debug-mode? +#debug +## +## what interface to bind to? +## (default is binding to any interface) +#host=www.example.org +port=8080 +user=nobody +## +## CGI: +## ? match a single char +## * matches any string excluding "/" +## ** matches any string including "/" +## separate multiple patterns with "|" +#cgipat=**.sh|**.cgi +## +## chroot: +chroot +#nochroot +## +logfile=/var/log/mini_httpd.log +pidfile=/var/run/mini_httpd.pid +## +charset=iso-8859-1 +## +## control the caching: (in secs) +#maxage 60 +## +## useless setting (just modifies the http-header) +## (see mini_httpd(8) and http://www.w3.org/P3P/ for more info) +#p3p +## +## virtual hosting: +#vhost +## +## cache-control: send this "max-age" in all HTTP-responses: +#max-age=0 +## +## ssl: +#nossl +#ssl +#certfile=/tmp/mini_httpd.pem |