commit e43172795b41a94ae5c2a0d67ef988801776d7f3
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas@xteddy.org>
date: Tue Aug 30 15:03:45 2022 UTC

remove fcgi_socket keyword from gotwebd.conf; "listen on" now implies it

ok op@

commit - 4ad4d490cb44a8933d2cd76e15289ed47be82920
commit + e43172795b41a94ae5c2a0d67ef988801776d7f3
blob - 5c88297ebe76ed933413a7394782c0530dc5b0f0
blob + 655d5a4af391c379320aa818045226c9f6757c02
--- gotwebd/gotwebd.conf.5
+++ gotwebd/gotwebd.conf.5
@@ -51,8 +51,6 @@ If not specified then
 will be used.
 .It Ic prefork Ar number
 Run the specified number of server processes.
-.It Ic fgci_socket Ar on | off
-Controls whether the server will listen on FCGI TCP sockets by default.
 .It Ic unix_socket Ar on | off
 Controls whether the servers will listen on unix sockets by default.
 .It Ic unix_socket_name Ar path
@@ -86,8 +84,6 @@ The available server configuration directives are as f
 .It Ic custom_css Ar path
 Set the path to a custom Cascading Style Sheet (CSS) to be used.
 If this option is not specified then a default style sheet will be used.
-.It Ic fgci_socket Ar on | off
-Enable or disable listening on FCGI TCP sockets.
 .It Ic listen on Ar address Ic port Ar number
 Configure an address and port for incoming FCGI TCP connections.
 Valid
@@ -193,7 +189,6 @@ server "localhost-unix" {
 #server "localhost-tcp" {
 #	repos_path "/got/public"
 #	unix_socket		off
-#	fcgi_socket		on
 #	listen on 127.0.0.1 port 9000
 #	listen on ::1 port 9000
 #}
blob - 5d7373f2b4dc57c21636901682103257c86d3646
blob + 0e4e5d563e08acd3a08ee2114c3cb043cb55d2bd
--- gotwebd/gotwebd.h
+++ gotwebd/gotwebd.h
@@ -334,8 +334,6 @@ struct gotwebd {
 
 	int		 unix_socket;
 	char		 unix_socket_name[PATH_MAX];
-
-	int		 fcgi_socket;
 };
 
 struct querystring {
blob - 991bde2eeb8447e2f9f37e9b7e880b5420ee1c44
blob + 44d5f934083a941caf96d9650dd58b8dcb8d999a
--- gotwebd/parse.y
+++ gotwebd/parse.y
@@ -190,9 +190,6 @@ main		: PREFORK NUMBER {
 			}
 			free($2);
 		}
-		| FCGI_SOCKET boolean {
-			gotwebd->fcgi_socket = $2;
-		}
 		| UNIX_SOCKET boolean {
 			gotwebd->unix_socket = $2;
 		}
@@ -319,6 +316,7 @@ serveropts1	: REPOS_PATH STRING {
 				yyerror("could not get addrs");
 				YYERROR;
 			}
+			new_srv->fcgi_socket = 1;
 		}
 		| MAX_REPOS NUMBER {
 			if ($2 > 0)
@@ -345,9 +343,6 @@ serveropts1	: REPOS_PATH STRING {
 		| MAX_COMMITS_DISPLAY NUMBER {
 			if ($2 > 0)
 				new_srv->max_commits_display = $2;
-		}
-		| FCGI_SOCKET boolean {
-			new_srv->fcgi_socket = $2;
 		}
 		| UNIX_SOCKET boolean {
 			new_srv->unix_socket = $2;
@@ -415,7 +410,6 @@ lookup(char *s)
 	static const struct keywords keywords[] = {
 		{ "chroot",			CHROOT },
 		{ "custom_css",			CUSTOM_CSS },
-		{ "fcgi_socket",		FCGI_SOCKET },
 		{ "listen",			LISTEN },
 		{ "logo",			LOGO },
 		{ "logo_url"	,		LOGO_URL },
@@ -868,7 +862,7 @@ conf_new_server(const char *name)
 	srv->max_repos = D_MAXREPO;
 
 	srv->unix_socket = 1;
-	srv->fcgi_socket = gotwebd->fcgi_socket ? gotwebd->fcgi_socket : 0;
+	srv->fcgi_socket = 0;
 
 	TAILQ_INIT(&srv->al);
 	TAILQ_INSERT_TAIL(&gotwebd->servers, srv, entry);