Attachment #100890 for bug #140260

View | Details | Raw Unified | Return to bug 140260
Collapse All | Expand All




#

PORTNAME=	tinytinyhttpd
PORTVERSION=	0.0.9
CATEGORIES=	www
MASTER_SITES=	http://cloud.github.com/downloads/mattn/tinytinyhttpd/ \
		${MASTER_SITE_LOCAL}

HAS_CONFIGURE=	yes

PLIST_FILES=	bin/tthttpd
SUB_FILES=	example.conf
PORTDOCS=	README example.conf ChangeLog

do-install:


.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKDIR}/example.conf ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
.endif

Lines 1-3 Link Here

(-)/usr/ports/www/tinytinyhttpd/distinfo (-3 / +3 lines)
1	MD5 (tinytinyhttpd-0.0.8.tar.gz) = 2a7b2bdcd5618c8f89915284f5f4203b	1	MD5 (tinytinyhttpd-0.0.9.tar.gz) = 9b0420c36c890b3dc442ce7dc20d4d3b
2	SHA256 (tinytinyhttpd-0.0.8.tar.gz) = d1b6b814e86d7357707c5fc2d8f63af42bb0a15a0197180d11c027a373c01f76	2	SHA256 (tinytinyhttpd-0.0.9.tar.gz) = 374041df75722920a355b3284d242a9fcdf009cc7c67078fd527c2682462792f
3	SIZE (tinytinyhttpd-0.0.8.tar.gz) = 110678	3	SIZE (tinytinyhttpd-0.0.9.tar.gz) = 147412

Lines 1-10 Link Here

(-)/usr/ports/www/tinytinyhttpd/files/example.conf (-10 lines)
1	[global]
2	port=8080
3	root=/path/to/contents
4	indexpages=index.html,index.php
5	charset=utf-8
6	spawnexec=on
7
8	[mime/types]
9	cgi=@/usr/local/bin/perl
10	php=@/usr/local/bin/php

Line 0 Link Here

(-)/usr/ports/www/tinytinyhttpd/files/example.conf.in (+10 lines)
	1	[global]
	2	port=8080
	3	root=/path/to/contents
	4	indexpages=index.html,index.php
	5	charset=utf-8
	6	spawnexec=on
	7
	8	[mime/types]
	9	cgi=@%%LOCALBASE%%/bin/perl
	10	php=@%%LOCALBASE%%/bin/php




diff --git httpd.cxx httpd.cxx
index 98cec3c..958200a 100644
--- httpd.cxx
+++ httpd.cxx
@@ -1734,7 +1734,7 @@ request_done:
 #if defined LINUX_SENDFILE_API
 			sent = sendfile(msgsock, fileno(res_info->read), NULL, total);
 #elif defined FREEBSD_SENDFILE_API
-			sendfile(msgsock, fileno(res_info->read), total, &sent, NULL, 0);
+			if (sendfile(msgsock, fileno(res_info->read), NULL, total, NULL, NULL, 0) == 0) sent = total;
 #elif defined _WIN32
 			if (!res_info->process && lpfnTransmitFile && lpfnTransmitFile(
 				msgsock,

Return to bug 140260

Lines 6-12 Link Here

(-)/usr/ports/www/tinytinyhttpd/Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= tinytinyhttpd	8	PORTNAME= tinytinyhttpd
9	PORTVERSION= 0.0.8	9	PORTVERSION= 0.0.9
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= http://cloud.github.com/downloads/mattn/tinytinyhttpd/ \	11	MASTER_SITES= http://cloud.github.com/downloads/mattn/tinytinyhttpd/ \
12	${MASTER_SITE_LOCAL}	12	${MASTER_SITE_LOCAL}
Lines 17-22 Link Here
17	HAS_CONFIGURE= yes	17	HAS_CONFIGURE= yes
18		18
19	PLIST_FILES= bin/tthttpd	19	PLIST_FILES= bin/tthttpd
		20	SUB_FILES= example.conf
20	PORTDOCS= README example.conf ChangeLog	21	PORTDOCS= README example.conf ChangeLog
21		22
22	do-install:	23	do-install:
Lines 24-30 Link Here
24		25
25	.if !defined(NOPORTDOCS)	26	.if !defined(NOPORTDOCS)
26	@${MKDIR} ${DOCSDIR}	27	@${MKDIR} ${DOCSDIR}
27	${INSTALL_DATA} ${FILESDIR}/example.conf ${DOCSDIR}	28	${INSTALL_DATA} ${WRKDIR}/example.conf ${DOCSDIR}
28	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}	29	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
29	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}	30	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
30	.endif	31	.endif

Line 0 Link Here

(-)/usr/ports/www/tinytinyhttpd/files/patch-httpd.cxx (+13 lines)
	1	diff --git httpd.cxx httpd.cxx
	2	index 98cec3c..958200a 100644
	3	--- httpd.cxx
	4	+++ httpd.cxx
	5	@@ -1734,7 +1734,7 @@ request_done:
	6	#if defined LINUX_SENDFILE_API
	7	sent = sendfile(msgsock, fileno(res_info->read), NULL, total);
	8	#elif defined FREEBSD_SENDFILE_API
	9	- sendfile(msgsock, fileno(res_info->read), total, &sent, NULL, 0);
	10	+ if (sendfile(msgsock, fileno(res_info->read), NULL, total, NULL, NULL, 0) == 0) sent = total;
	11	#elif defined _WIN32
	12	if (!res_info->process && lpfnTransmitFile && lpfnTransmitFile(
	13	msgsock,