rdelaage
/
gmid
mirror of https://github.com/omar-polo/gmid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

retire the deprecated `mime' and `map' config options

This commit is contained in:
Omar Polo 2022-09-10 09:43:57 +00:00
parent aa9543b9fd
commit cd5826b8ba
4 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gmid.c
View File

@ -186,7 +186,7 @@ static int
listener_main(struct imsgbuf *ibuf)
{
drop_priv();
if (!conf.mime.skip_defaults && load_default_mime(&conf.mime) == -1)
if (load_default_mime(&conf.mime) == -1)
fatal("load_default_mime: %s", strerror(errno));
sort_mime(&conf.mime);
load_vhosts();

7
gmid.h
View File

@ -186,13 +186,6 @@ struct mime {
struct etm *t;
size_t len;
size_t cap;
/*
* Backward compatibility: types override the built-in list,
* but the deprecated `mime' and `map' don't. It's still too
* early to remove `mime' and `map' from the config parser.
*/
int skip_defaults;
};
struct conf {

4
mime.c
View File

@ -82,6 +82,10 @@ load_default_mime(struct mime *mime)
{NULL, NULL}
}, *i;
/* don't load the default if `types' was used. */
if (mime->len != 0)
return 0;
for (i = m; i->mime != NULL; ++i) {
if (add_mime(mime, i->mime, i->ext) == -1)
return -1;

26
parse.y
View File

@ -123,7 +123,6 @@ typedef struct {
%token INCLUDE INDEX IPV6
%token KEY
%token LANG LOCATION LOG
%token MAP MIME
%token OCSP OFF ON
%token PARAM PORT PREFORK PROTO PROTOCOLS PROXY
%token RELAY_TO REQUIRE RETURN ROOT
@ -219,24 +218,6 @@ option : CHROOT string {
free($2);
}
| IPV6 bool { conf.ipv6 = $2; }
| MIME STRING string {
yywarn("`mime MIME EXT' is deprecated and will be "
"removed in a future version, please use the new "
"`types' block.");
if (add_mime(&conf.mime, $2, $3) == -1)
err(1, "add_mime");
free($2);
free($3);
}
| MAP string TOEXT string {
yywarn("`map mime to-ext' is deprecated and will be "
"removed in a future version, please use the new "
"`types' block.");
if (add_mime(&conf.mime, $2, $4) == -1)
err(1, "add_mime");
free($2);
free($4);
}
| PORT NUM { conf.port = check_port_num($2); }
| PREFORK NUM { conf.prefork = check_prefork_num($2); }
| PROTOCOLS string {
@ -472,10 +453,7 @@ fastcgi : SPAWN string {
}
;
types : TYPES '{' optnl mediaopts_l '}' {
conf.mime.skip_defaults = 1;
}
;
types : TYPES '{' optnl mediaopts_l '}' ;
mediaopts_l : mediaopts_l mediaoptsl nl
| mediaoptsl nl
@ -535,8 +513,6 @@ static const struct keyword {
{"lang", LANG},
{"location", LOCATION},
{"log", LOG},
{"map", MAP},
{"mime", MIME},
{"ocsp", OCSP},
{"off", OFF},
{"on", ON},