head	1.2;
access;
symbols
	pkgsrc-2014Q4:1.1.0.42
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.40
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.38
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.36
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.34
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.32
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.30
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.28
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.26
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.24
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.22
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.20
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.18
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.16
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.14
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.12
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.10
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.8
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.6
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.4
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.2
	pkgsrc-2009Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2015.03.12.01.00.26;	author hiramatsu;	state dead;
branches;
next	1.1;
commitid	fE39WRTNSxvRLfdy;

1.1
date	2009.12.13.17.42.36;	author asau;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update www/thttpd to 2.26.

Changes from previous:
----------------------
- Ignore ECONNABORTED on accept().
- Correctly implemented the config-file option change from "nosymlink" to
  "nosymlinkcheck", which was supposedly done in version 2.24.
- Removed mailto: link from default index page.
- Allow CGIs to provide both Location and Status headers. (A. Skrobov)
- Better logic for figuring out CGI SERVER_NAME environment variable. (Oleg)
- Updated for clang, and general cleanup.
@
text
@$NetBSD: patch-ah,v 1.1 2009/12/13 17:42:36 asau Exp $

NetBSD provides another "getline".

--- extras/htpasswd.c.orig	2009-12-13 20:24:50.000000000 +0300
+++ extras/htpasswd.c	2009-12-13 20:26:45.000000000 +0300
@@@@ -49,7 +49,7 @@@@
     while((line[y++] = line[x++]));
 }
 
-static int getline(char *s, int n, FILE *f) {
+static int get_line(char *s, int n, FILE *f) {
     register int i=0;
 
     while(1) {
@@@@ -189,7 +189,7 @@@@
     strcpy(user,argv[2]);
 
     found = 0;
-    while(!(getline(line,MAX_STRING_LEN,f))) {
+    while(!(get_line(line,MAX_STRING_LEN,f))) {
         if(found || (line[0] == '#') || (!line[0])) {
             putline(tfp,line);
             continue;
@


1.1
log
@Rename internal "getline" to unbreak build on NetBSD.
Support staged installation.
@
text
@d1 1
a1 1
$NetBSD$
@