Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- bump man page date

Browse Source 
- strip :80 off virtual host names as they're the default
This commit is contained in:
mrg 2014-02-09 12:32:32 +00:00
parent 3541adf977
commit 7db440fedd
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libexec/httpd/bozohttpd.8
View File

@ -1,4 +1,4 @@
.\" $NetBSD: bozohttpd.8,v 1.45 2014/02/09 01:46:10 mrg Exp $ .\" $NetBSD: bozohttpd.8,v 1.46 2014/02/09 12:32:32 mrg Exp $
.\" .\"
.\" $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $ .\" $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
.\" .\"
@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE. .\" SUCH DAMAGE.
.\" .\"
.Dd January 2, 2014 .Dd February 9, 2014
.Dt HTTPD 8 .Dt HTTPD 8
.Os .Os
.Sh NAME .Sh NAME

14
libexec/httpd/bozohttpd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bozohttpd.c,v 1.48 2014/02/09 01:46:10 mrg Exp $ */ /* $NetBSD: bozohttpd.c,v 1.49 2014/02/09 12:32:32 mrg Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */ /* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@ -1058,12 +1058,20 @@ check_virtual(bozo_httpreq_t *request)
goto use_slashdir; goto use_slashdir;
/* /*
* ok, we have a virtual host, use scandir(3) to find a case * canonicalise hr_host - that is, remove any :80.
*/
len = strlen(request->hr_host);
if (len > 3 && strcmp(request->hr_host + len - 3, ":80") == 0) {
request->hr_host[len - 3] = '\0';
len = strlen(request->hr_host);
}
/*
* ok, we have a virtual host, use opendir(3) to find a case
* insensitive match for the virtual host we are asked for. * insensitive match for the virtual host we are asked for.
* note that if the virtual host is the same as the master, * note that if the virtual host is the same as the master,
* we don't need to do anything special. * we don't need to do anything special.
*/ */
len = strlen(request->hr_host);
debug((httpd, DEBUG_OBESE, debug((httpd, DEBUG_OBESE,
"check_virtual: checking host `%s' under httpd->virtbase `%s' " "check_virtual: checking host `%s' under httpd->virtbase `%s' "
"for file `%s'", "for file `%s'",