Commit Diff
Diff:
d2da235ad9bce3488955a1a2621ea641e71ba00d
7b00c8900b91302abe0695f495aa3baff90e9896
Commit:
7b00c8900b91302abe0695f495aa3baff90e9896
Tree:
c7b64c5c3014d8ae6ff0bf32cdd3d981be917a40
Author:
Omar Polo <op@omarpolo.com>
Date:
Wed Oct 5 15:30:22 2022 UTC
Message:
remove the last tentacles of the hidden `span' fcgi feature
commit - d2da235ad9bce3488955a1a2621ea641e71ba00d
commit + 7b00c8900b91302abe0695f495aa3baff90e9896
blob - c49b5819ea0d7c82674f3dde8a61e30ad3bf17a6
blob + 12bb4add4a99cff822129d8159c71ecd6a7180dd
--- parse.y
+++ parse.y
@@ -92,7 +92,7 @@ int fastcgi_conf(const char *, const char *, char *)
void advance_loc(void);
void advance_proxy(void);
void parsehp(char *, char **, const char **, const char *);
-int fastcgi_conf(const char *, const char *, char *);
+int fastcgi_conf(const char *, const char *);
void add_param(char *, char *);
int getservice(const char *);
@@ -126,7 +126,7 @@ typedef struct {
%token OCSP OFF ON
%token PARAM PORT PREFORK PROTO PROTOCOLS PROXY
%token RELAY_TO REQUIRE RETURN ROOT
-%token SERVER SNI SPAWN STRIP
+%token SERVER SNI STRIP
%token TCP TOEXT TYPE TYPES
%token USE_TLS USER
%token VERIFYNAME
@@ -440,27 +440,23 @@ fastcgi : SPAWN string {
| STRIP NUM { loc->strip = check_strip_no($2); }
;
-fastcgi : SPAWN string {
- loc->fcgi = fastcgi_conf(NULL, NULL, $2);
- free($2);
- }
- | string {
- loc->fcgi = fastcgi_conf($1, NULL, NULL);
+fastcgi : string {
+ loc->fcgi = fastcgi_conf($1, NULL);
free($1);
}
| TCP string PORT NUM {
char *c;
if (asprintf(&c, "%d", $4) == -1)
err(1, "asprintf");
- loc->fcgi = fastcgi_conf($2, c, NULL);
+ loc->fcgi = fastcgi_conf($2, c);
free($2);
}
| TCP string {
- loc->fcgi = fastcgi_conf($2, "9000", NULL);
+ loc->fcgi = fastcgi_conf($2, "9000");
free($2);
}
| TCP string PORT string {
- loc->fcgi = fastcgi_conf($2, $4, NULL);
+ loc->fcgi = fastcgi_conf($2, $4);
free($2);
free($4);
}
@@ -541,7 +537,6 @@ static const struct keyword {
{"root", ROOT},
{"server", SERVER},
{"sni", SNI},
- {"spawn", SPAWN},
{"strip", STRIP},
{"tcp", TCP},
{"to-ext", TOEXT},
@@ -1170,7 +1165,7 @@ fastcgi_conf(const char *path, const char *port, char
}
int
-fastcgi_conf(const char *path, const char *port, char *prog)
+fastcgi_conf(const char *path, const char *port)
{
struct fcgi *f;
int i;
Omar Polo