diff options
author | mrg <mrg@pkgsrc.org> | 2002-08-05 16:37:50 +0000 |
---|---|---|
committer | mrg <mrg@pkgsrc.org> | 2002-08-05 16:37:50 +0000 |
commit | 47fd4c016e2f1c57c1d1eec14f9ee3bfb8f40f05 (patch) | |
tree | ebed1cc4d30133908711bcc6483080b030967ef8 /www/bozohttpd | |
parent | 3cd9237d307a7999f45a5696ad1fe24353d5fa99 (diff) | |
download | pkgsrc-47fd4c016e2f1c57c1d1eec14f9ee3bfb8f40f05.tar.gz |
pull in a patch from development sources that fixes a bug in directory
index generation of the root of the web tree. bump to bozohttpd 5.13nb1.
Diffstat (limited to 'www/bozohttpd')
-rw-r--r-- | www/bozohttpd/distinfo | 3 | ||||
-rw-r--r-- | www/bozohttpd/patches/patch-ac | 51 |
2 files changed, 53 insertions, 1 deletions
diff --git a/www/bozohttpd/distinfo b/www/bozohttpd/distinfo index 693d4dee04e..4a198ab54d3 100644 --- a/www/bozohttpd/distinfo +++ b/www/bozohttpd/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.14 2002/08/04 23:19:58 wiz Exp $ +$NetBSD: distinfo,v 1.15 2002/08/05 16:37:50 mrg Exp $ SHA1 (bozohttpd-5.13.tar.bz2) = 8ee68a14b9e1a3071a531df6885c9d303dd2f4c6 Size (bozohttpd-5.13.tar.bz2) = 20444 bytes SHA1 (patch-ab) = 24cc57867ecf94617a78025baf31c2f050d42470 +SHA1 (patch-ac) = 45bdc4e86be09424a9d0b93cad5acb69226a021e diff --git a/www/bozohttpd/patches/patch-ac b/www/bozohttpd/patches/patch-ac new file mode 100644 index 00000000000..20ead1b551e --- /dev/null +++ b/www/bozohttpd/patches/patch-ac @@ -0,0 +1,51 @@ +$NetBSD: patch-ac,v 1.7 2002/08/05 16:37:50 mrg Exp $ + +Index: bozohttpd.c +=================================================================== +RCS file: /home/towers/mrg/cvsroot/eterna/bozohttpd/bozohttpd.c,v +retrieving revision 1.45 +retrieving revision 1.46 +diff -p -c -r1.45 -r1.46 +*** bozohttpd.c 2002/08/04 15:21:25 1.45 +--- bozohttpd.c 2002/08/05 16:28:26 1.46 +*************** +*** 1,4 **** +! /* $eterna: bozohttpd.c,v 1.45 2002/08/04 15:21:25 mrg Exp $ */ + + /* + * Copyright (c) 1997, 1998, 1999, 2000, 2001 Matthew R. Green +--- 1,4 ---- +! /* $eterna: bozohttpd.c,v 1.46 2002/08/05 16:28:26 mrg Exp $ */ + + /* + * Copyright (c) 1997, 1998, 1999, 2000, 2001 Matthew R. Green +*************** process_request(request) +*** 900,906 **** + else if (errno == ENOENT) { + #ifndef NO_DIRINDEX_SUPPORT + if (isindex && Xflag) { +! file[strlen(file) - strlen(index_html)] = '\0'; + debug((DEBUG_FAT, "trying dir index (%s)", + file)); + directory_index(request, file); +--- 900,909 ---- + else if (errno == ENOENT) { + #ifndef NO_DIRINDEX_SUPPORT + if (isindex && Xflag) { +! if (strlen(file) <= strlen(index_html)) +! (const char *)file = "."; +! else +! file[strlen(file) - strlen(index_html)] = '\0'; + debug((DEBUG_FAT, "trying dir index (%s)", + file)); + directory_index(request, file); +*************** directory_index(request, dirname) +*** 972,977 **** +--- 975,981 ---- + char buf[MAXPATHLEN]; + int l; + ++ debug((DEBUG_FAT, "directory_index: dirname ``%s''", dirname)); + if (stat(dirname, &sb) < 0 || + (dp = opendir(dirname)) == NULL) { + if (errno == EPERM) |