commit - 4096c2540f2371868e0001dc52113cdb89639c28
commit + 265417ecb5a6f3f5290b36df22f5d7a296d7140e
blob - 600ae4ab3ee85bedda503b83acca5478add18573
blob + 34c6fe4ccf68064758366c3f94f55acc77291bb2
--- gotwebd/gotwebd.c
+++ gotwebd/gotwebd.c
@@ -357,7 +357,7 @@ spawn_process(struct gotwebd *env, const char *argv0, 
 	close(p[1]);
 
 	argv[argc++] = argv0;
-	if (proc_type == GOTWEBD_PROC_SERVER) {
+	if (proc_type == GOTWEBD_PROC_SOCKETS) {
 		char *s;
 
 		argv[argc++] = "-S";
@@ -456,7 +456,7 @@ main(int argc, char **argv)
 			no_action = 1;
 			break;
 		case 'S':
-			proc_type = GOTWEBD_PROC_SERVER;
+			proc_type = GOTWEBD_PROC_SOCKETS;
 			i = strtonum(optarg, 1, INT_MAX, &errstr);
 			if (errstr)
 				gotwebd_username = optarg;
@@ -494,7 +494,7 @@ main(int argc, char **argv)
 			www_username = env->www_user;
 	}
 
-	if (proc_type == GOTWEBD_PROC_SERVER) {
+	if (proc_type == GOTWEBD_PROC_SOCKETS) {
 		env->worker_load = calloc(env->prefork,
 		    sizeof(env->worker_load[0]));
 		if (env->worker_load == NULL)
@@ -521,7 +521,7 @@ main(int argc, char **argv)
 	log_setverbose(env->gotwebd_verbose);
 
 	switch (proc_type) {
-	case GOTWEBD_PROC_SERVER:
+	case GOTWEBD_PROC_SOCKETS:
 		setproctitle("sockets");
 		log_procinit("sockets");
 
@@ -586,7 +586,7 @@ main(int argc, char **argv)
 		fatal("calloc");
 
 	spawn_process(env, argv0, env->iev_sockets,
-	    GOTWEBD_PROC_SERVER, gotwebd_username,
+	    GOTWEBD_PROC_SOCKETS, gotwebd_username,
 	    gotwebd_dispatch_server);
 
 	spawn_process(env, argv0, env->iev_fcgi,
blob - 6489b482539e9ef0150b04e9a512b49639c16e3d
blob + 59a8243c5498b30c67add568a59fe67398b68762
--- gotwebd/gotwebd.h
+++ gotwebd/gotwebd.h
@@ -123,7 +123,7 @@ struct got_reflist_head;
 
 enum gotwebd_proc_type {
 	GOTWEBD_PROC_PARENT,
-	GOTWEBD_PROC_SERVER,
+	GOTWEBD_PROC_SOCKETS,
 	GOTWEBD_PROC_FCGI,
 	GOTWEBD_PROC_GOTWEB,
 };
blob - 6db5137d674bd515ef2951d841c7b22120c71b7e
blob + ec79b8fe15aadc727c066fe735678db30742d58a
--- gotwebd/sockets.c
+++ gotwebd/sockets.c
@@ -540,7 +540,7 @@ process_request(struct request *c)
 
 	iev_gotweb = select_worker(c);
 	ret = imsg_compose_event(iev_gotweb, GOTWEBD_IMSG_REQ_PROCESS,
-	    GOTWEBD_PROC_SERVER, -1, c->fd, &ic, sizeof(ic));
+	    GOTWEBD_PROC_SOCKETS, -1, c->fd, &ic, sizeof(ic));
 	if (ret == -1) {
 		log_warn("imsg_compose_event");
 		c->worker_idx = -1;
@@ -1025,7 +1025,7 @@ parse_params(struct request *c, uint8_t *record, size_
 
 	ret = imsg_compose_event(env->iev_fcgi,
 	    GOTWEBD_IMSG_FCGI_PARSE_PARAMS,
-	    GOTWEBD_PROC_SERVER, -1, -1, &rec, sizeof(rec));
+	    GOTWEBD_PROC_SOCKETS, -1, -1, &rec, sizeof(rec));
 	if (ret == -1)
 		log_warn("imsg_compose_event");