diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-08-09 07:35:46 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-08-09 07:35:46 +0000 |
| commit | 41402c29d8886a63638d614f58ec0d5fcd411c37 (patch) | |
| tree | c675a543041fe53fb466616b09ecb96b7e53052e /usr.sbin/httpd | |
| parent | 2a690aeeeae86d0391fc29f808d2da258814d162 (diff) | |
Allow to inclue the types section anywhere in the configuration file.
Found by chris@
OK doug@
Diffstat (limited to 'usr.sbin/httpd')
| -rw-r--r-- | usr.sbin/httpd/parse.y | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y index 9a1e1221df5..d66f2077874 100644 --- a/usr.sbin/httpd/parse.y +++ b/usr.sbin/httpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.34 2014/08/06 20:29:54 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.35 2014/08/09 07:35:45 reyk Exp $ */ /* * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -694,6 +694,9 @@ medianamesl : STRING { } free($1); + if (!loadcfg) + break; + if (media_add(conf->sc_mediatypes, &media) == NULL) { yyerror("failed to add media type"); YYERROR; |