commit 9dd0e5e95bed2a093939d798e0080c1451217050
from: Omar Polo <op@omarpolo.com>
date: Thu Jul 28 14:24:50 2022 UTC

implement fcgi_gen_response on top of fcgi_gen_binary_response

ok tracey@

commit - d27161034833cc359a3fec898d6ddd388ad2622e
commit + 9dd0e5e95bed2a093939d798e0080c1451217050
blob - 1581cf938674fc59b27476119bfcc54b5b4417b5
blob + 6037bbba2a23ca1e59d0c1a0109c442fbe0595a5
--- gotwebd/fcgi.c
+++ gotwebd/fcgi.c
@@ -311,7 +311,7 @@ fcgi_gen_binary_response(struct request *c, const uint
 	if (c->sock->client_status == CLIENT_DISCONNECT)
 		return -1;
 
-	if (data == NULL)
+	if (data == NULL || len == 0)
 		return 0;
 
 	if ((resp = calloc(1, sizeof(struct fcgi_response))) == NULL) {
@@ -342,43 +342,9 @@ fcgi_gen_binary_response(struct request *c, const uint
 int
 fcgi_gen_response(struct request *c, const char *data)
 {
-	struct fcgi_response *resp;
-	struct fcgi_record_header *header;
-	ssize_t n = 0;
-	int i;
-
-	if (c->sock->client_status == CLIENT_DISCONNECT)
-		return -1;
-
-	if (data == NULL)
+	if (data == NULL || *data == '\0')
 		return 0;
-
-	if (strlen(data) == 0)
-		return 0;
-
-	if ((resp = calloc(1, sizeof(struct fcgi_response))) == NULL) {
-		log_warn("%s: cannot calloc fcgi_response", __func__);
-		return -1;
-	}
-
-	header = (struct fcgi_record_header*) resp->data;
-	header->version = 1;
-	header->type = FCGI_STDOUT;
-	header->id = htons(c->id);
-	header->padding_len = 0;
-	header->reserved = 0;
-
-	for (i = 0; i < strlen(data); i++) {
-		resp->data[i+8] = data[i];
-		n++;
-	}
-
-	header->content_len = htons(n);
-	resp->data_pos = 0;
-	resp->data_len = n + sizeof(struct fcgi_record_header);
-	fcgi_send_response(c, resp);
-
-	return 0;
+	return fcgi_gen_binary_response(c, data, strlen(data));
 }
 
 void