Attachment 100890 Details for Bug 140260 – tinytinyhttpd-0.0.9.patch

[patch] tinytinyhttpd-0.0.9.patch

tinytinyhttpd-0.0.9.patch (text/plain), 3.42 KB, created by Shinsuke Matsui on 2009-11-04 03:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shinsuke Matsui

Created: 2009-11-04 03:50:01 UTC

Size: 3.42 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/www/tinytinyhttpd.orig/Makefile /usr/ports/www/tinytinyhttpd/Makefile
>--- /usr/ports/www/tinytinyhttpd.orig/Makefile	2009-09-30 22:06:53.000000000 +0900
>+++ /usr/ports/www/tinytinyhttpd/Makefile	2009-11-04 12:19:25.000000000 +0900
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	tinytinyhttpd
>-PORTVERSION=	0.0.8
>+PORTVERSION=	0.0.9
> CATEGORIES=	www
> MASTER_SITES=	http://cloud.github.com/downloads/mattn/tinytinyhttpd/ \
> 		${MASTER_SITE_LOCAL}
>@@ -17,6 +17,7 @@
> HAS_CONFIGURE=	yes
> 
> PLIST_FILES=	bin/tthttpd
>+SUB_FILES=	example.conf
> PORTDOCS=	README example.conf ChangeLog
> 
> do-install:
>@@ -24,7 +25,7 @@
> 
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${FILESDIR}/example.conf ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKDIR}/example.conf ${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
> .endif
>diff -ruN --exclude=CVS /usr/ports/www/tinytinyhttpd.orig/distinfo /usr/ports/www/tinytinyhttpd/distinfo
>--- /usr/ports/www/tinytinyhttpd.orig/distinfo	2009-09-30 22:06:53.000000000 +0900
>+++ /usr/ports/www/tinytinyhttpd/distinfo	2009-10-14 18:43:59.000000000 +0900
>@@ -1,3 +1,3 @@
>-MD5 (tinytinyhttpd-0.0.8.tar.gz) = 2a7b2bdcd5618c8f89915284f5f4203b
>-SHA256 (tinytinyhttpd-0.0.8.tar.gz) = d1b6b814e86d7357707c5fc2d8f63af42bb0a15a0197180d11c027a373c01f76
>-SIZE (tinytinyhttpd-0.0.8.tar.gz) = 110678
>+MD5 (tinytinyhttpd-0.0.9.tar.gz) = 9b0420c36c890b3dc442ce7dc20d4d3b
>+SHA256 (tinytinyhttpd-0.0.9.tar.gz) = 374041df75722920a355b3284d242a9fcdf009cc7c67078fd527c2682462792f
>+SIZE (tinytinyhttpd-0.0.9.tar.gz) = 147412
>diff -ruN --exclude=CVS /usr/ports/www/tinytinyhttpd.orig/files/example.conf /usr/ports/www/tinytinyhttpd/files/example.conf
>--- /usr/ports/www/tinytinyhttpd.orig/files/example.conf	2009-08-05 21:23:57.000000000 +0900
>+++ /usr/ports/www/tinytinyhttpd/files/example.conf	1970-01-01 09:00:00.000000000 +0900
>@@ -1,10 +0,0 @@
>-[global]
>-port=8080
>-root=/path/to/contents
>-indexpages=index.html,index.php
>-charset=utf-8
>-spawnexec=on
>-
>-[mime/types]
>-cgi=@/usr/local/bin/perl
>-php=@/usr/local/bin/php
>diff -ruN --exclude=CVS /usr/ports/www/tinytinyhttpd.orig/files/example.conf.in /usr/ports/www/tinytinyhttpd/files/example.conf.in
>--- /usr/ports/www/tinytinyhttpd.orig/files/example.conf.in	1970-01-01 09:00:00.000000000 +0900
>+++ /usr/ports/www/tinytinyhttpd/files/example.conf.in	2009-10-14 18:43:43.000000000 +0900
>@@ -0,0 +1,10 @@
>+[global]
>+port=8080
>+root=/path/to/contents
>+indexpages=index.html,index.php
>+charset=utf-8
>+spawnexec=on
>+
>+[mime/types]
>+cgi=@%%LOCALBASE%%/bin/perl
>+php=@%%LOCALBASE%%/bin/php
>diff -ruN --exclude=CVS /usr/ports/www/tinytinyhttpd.orig/files/patch-httpd.cxx /usr/ports/www/tinytinyhttpd/files/patch-httpd.cxx
>--- /usr/ports/www/tinytinyhttpd.orig/files/patch-httpd.cxx	1970-01-01 09:00:00.000000000 +0900
>+++ /usr/ports/www/tinytinyhttpd/files/patch-httpd.cxx	2009-11-04 11:48:05.000000000 +0900
>@@ -0,0 +1,13 @@
>+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,

Actions: View | Diff

Attachments on bug 140260: 100890