Index: head/www/thttpd/Makefile =================================================================== --- head/www/thttpd/Makefile (revision 417913) +++ head/www/thttpd/Makefile (revision 417914) @@ -1,57 +1,64 @@ # Created by: Anders Nordby # $FreeBSD$ PORTNAME= thttpd PORTVERSION= 2.27 CATEGORIES= www ipv6 MASTER_SITES= http://www.acme.com/software/thttpd/ MAINTAINER= danfe@FreeBSD.org COMMENT= Tiny/turbo/throttling HTTP server with CGI support LICENSE= BSD2CLAUSE USES= cpe GNU_CONFIGURE= yes MAKE_ARGS= WEBDIR=${WWWDIR} USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message thttpd.conf.sample SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} CPE_VENDOR= acme -OPTIONS_DEFINE= SENDFILE IPREAL INDEXES HTACCESS STATS -OPTIONS_DEFAULT= SENDFILE IPREAL STATS +OPTIONS_DEFINE= SENDFILE IPREAL INDEXES HTACCESS STATS LOG_UNKNOWN FLUSH_LOG +OPTIONS_DEFAULT= SENDFILE IPREAL STATS FLUSH_LOG SENDFILE_DESC= Use sendfile(2) to serve files IPREAL_DESC= Respect (pass on) "X-Forwarded-For" header INDEXES_DESC= Generate index pages for directories HTACCESS_DESC= IP-based authorization (.htaccess) support STATS_DESC= Collect internal stats and print to system log +LOG_UNKNOWN_DESC= Log unknown request headers +FLUSH_LOG_DESC= fflush() the log file after each request SENDFILE_EXTRA_PATCHES= ${FILESDIR}/extra-patch-config.h IPREAL_EXTRA_PATCHES= ${FILESDIR}/extra-patch-ip_real HTACCESS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-htaccess +LOG_UNKNOWN_EXTRA_PATCHES= ${FILESDIR}/extra-patch-log_unknown_headers post-patch: # To avoid conflict with other ports that also install htpasswd(1) .for f in extras/htpasswd.1 extras/htpasswd.c thttpd.8 @${REINPLACE_CMD} -e '/\.htpasswd/!s|htpasswd|t&|g' ${WRKSRC}/${f} .endfor @${REINPLACE_CMD} -e 's|/var/www|${WWWDIR}|' \ ${WRKSRC}/extras/makeweb.1 post-patch-INDEXES-off: @${REINPLACE_CMD} -e '/GENERATE_INDEXES/s|.*|/* & */|' \ ${WRKSRC}/config.h post-patch-STATS-off: @${REINPLACE_CMD} -e '/STATS_TIME/s|.*|/* & */|' \ + ${WRKSRC}/config.h + +post-patch-FLUSH_LOG-off: + @${REINPLACE_CMD} -e '/FLUSH_LOG_EVERY_TIME/s|.*|/* & */|' \ ${WRKSRC}/config.h post-install: ${INSTALL_DATA} ${WRKDIR}/thttpd.conf.sample ${STAGEDIR}${PREFIX}/etc ${PRINTF} "/var/log/thttpd.log\t ${WWWOWN}:${WWWGRP}\t640 7 * @T00\ J\t/var/run/thttpd.pid\n" > \ ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/${PORTNAME}.conf .include Index: head/www/thttpd/files/extra-patch-log_unknown_headers =================================================================== --- head/www/thttpd/files/extra-patch-log_unknown_headers (nonexistent) +++ head/www/thttpd/files/extra-patch-log_unknown_headers (revision 417914) @@ -0,0 +1,12 @@ +--- config.h.orig 2011-09-11 16:41:37 UTC ++++ config.h +@@ -341,9 +342,7 @@ + /* CONFIGURE: Whether to log unknown request headers. Most sites will not + ** want to log them, which will save them a bit of CPU time. + */ +-#ifdef notdef + #define LOG_UNKNOWN_HEADERS +-#endif + + /* CONFIGURE: Whether to fflush() the log file after each request. If + ** this is turned off there's a slight savings in CPU cycles. Property changes on: head/www/thttpd/files/extra-patch-log_unknown_headers ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property