extinfo.cgi does not set content-type (most cgi's don't)

Fix for issue http://tracker.nagios.org/view.php?id=628 The issue was written specifically for extinfo.cgi, but most of the cgi programs did not include the 'charset' parameter. So I added 'charset=utf-8' to all 'content-type' headers.
hedenface · Sep 7, 2016 · b2c1ae0 · b2c1ae0
1 parent d803256
commit b2c1ae0
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 15 deletions.
diff --git a/Changelog b/Changelog
@@ -10,7 +10,8 @@ FIXES
 * Service Parents does not appear to be functioning as intended (lev)
 * Availability report mixes up scheduled and unscheduled warning percentages (Helmut Mikulcik)
 * Remove deprecated "framespacing" (John Frickson)
-# The nagios tarball contains two identical jquery copies (John Frickson)
+* The nagios tarball contains two identical jquery copies (John Frickson)
+* extinfo.cgi does not set content-type (most cgi's don't) (John Frickson)
 
 
 4.2.1 - 2016-09-06

diff --git a/cgi/avail.c b/cgi/avail.c
@@ -1033,7 +1033,7 @@ void document_header(int use_stylesheet) {
 	printf("Expires: %s\r\n", date_time);
 
 	if(output_format == HTML_OUTPUT)
-		printf("Content-type: text/html\r\n\r\n");
+		printf("Content-type: text/html; charset=utf-8\r\n\r\n");
 	else {
 		printf("Content-type: text/csv\r\n\r\n");
 		return;

diff --git a/cgi/cmd.c b/cgi/cmd.c
@@ -273,7 +273,7 @@ void document_header(int use_stylesheet) {
 
 	else {
 
-		printf("Content-type: text/html\r\n\r\n");
+		printf("Content-type: text/html; charset=utf-8\r\n\r\n");
 
 		printf("<html>\n");
 		printf("<head>\n");

diff --git a/cgi/config.c b/cgi/config.c
@@ -291,7 +291,7 @@ void document_header(int use_stylesheet) {
 	printf("Pragma: no-cache\r\n");
 	printf("Last-Modified: %s\r\n", date_time);
 	printf("Expires: %s\r\n", date_time);
-	printf("Content-type: text/html\r\n\r\n");
+	printf("Content-type: text/html; charset=utf-8\r\n\r\n");
 
 	printf("<html>\n");
 	printf("<head>\n");

diff --git a/cgi/extinfo.c b/cgi/extinfo.c
@@ -537,7 +537,7 @@ void document_header(int use_stylesheet) {
 	get_time_string(&expire_time, date_time, (int)sizeof(date_time), HTTP_DATE_TIME);
 	printf("Expires: %s\r\n", date_time);
 
-	printf("Content-type: text/html\r\n\r\n");
+	printf("Content-type: text/html; charset=utf-8\r\n\r\n");
 
 	if(embedded == TRUE)
 		return;

diff --git a/cgi/histogram.c b/cgi/histogram.c
@@ -1011,7 +1011,7 @@ void document_header(int use_stylesheet) {
 		get_time_string(&expire_time, date_time, sizeof(date_time), HTTP_DATE_TIME);
 		printf("Expires: %s\r\n", date_time);
 
-		printf("Content-type: text/html\r\n\r\n");
+		printf("Content-type: text/html; charset=utf-8\r\n\r\n");
 
 		if(embedded == TRUE)
 			return;

diff --git a/cgi/history.c b/cgi/history.c
@@ -285,7 +285,7 @@ void document_header(int use_stylesheet) {
 	get_time_string(&expire_time, date_time, sizeof(date_time), HTTP_DATE_TIME);
 	printf("Expires: %s\r\n", date_time);
 
-	printf("Content-type: text/html\r\n\r\n");
+	printf("Content-type: text/html; charset=utf-8\r\n\r\n");
 
 	if(embedded == TRUE)
 		return;

diff --git a/cgi/notifications.c b/cgi/notifications.c
@@ -274,7 +274,7 @@ void document_header(int use_stylesheet) {
 	get_time_string(&expire_time, date_time, (int)sizeof(date_time), HTTP_DATE_TIME);
 	printf("Expires: %s\r\n", date_time);
 
-	printf("Content-type: text/html\r\n\r\n");
+	printf("Content-type: text/html; charset=utf-8\r\n\r\n");
 
 	if(embedded == TRUE)
 		return;

diff --git a/cgi/outages.c b/cgi/outages.c
@@ -171,7 +171,7 @@ void document_header(int use_stylesheet) {
 	get_time_string(&expire_time, date_time, (int)sizeof(date_time), HTTP_DATE_TIME);
 	printf("Expires: %s\r\n", date_time);
 
-	printf("Content-type: text/html\r\n\r\n");
+	printf("Content-type: text/html; charset=utf-8\r\n\r\n");
 
 	if(embedded == TRUE)
 		return;

diff --git a/cgi/showlog.c b/cgi/showlog.c
@@ -157,7 +157,7 @@ void document_header(int use_stylesheet) {
 	get_time_string(&expire_time, date_time, (int)sizeof(date_time), HTTP_DATE_TIME);
 	printf("Expires: %s\r\n", date_time);
 
-	printf("Content-type: text/html\r\n\r\n");
+	printf("Content-type: text/html; charset=utf-8\r\n\r\n");
 
 	if(embedded == TRUE)
 		return;

diff --git a/cgi/status.c b/cgi/status.c
@@ -505,7 +505,7 @@ void document_header(int use_stylesheet) {
 	get_time_string(&expire_time, date_time, (int)sizeof(date_time), HTTP_DATE_TIME);
 	printf("Expires: %s\r\n", date_time);
 
-	printf("Content-type: text/html\r\n\r\n");
+	printf("Content-type: text/html; charset=utf-8\r\n\r\n");
 
 	if(embedded == TRUE)
 		return;

diff --git a/cgi/statusmap.c b/cgi/statusmap.c
@@ -325,7 +325,7 @@ void document_header(int use_stylesheet) {
 		get_time_string(&expire_time, date_time, sizeof(date_time), HTTP_DATE_TIME);
 		printf("Expires: %s\r\n", date_time);
 
-		printf("Content-Type: text/html\r\n\r\n");
+		printf("Content-Type: text/html; charset=utf-8\r\n\r\n");
 
 		if(embedded == TRUE)
 			return;

diff --git a/cgi/summary.c b/cgi/summary.c
@@ -662,7 +662,7 @@ void document_header(int use_stylesheet) {
 	printf("Expires: %s\r\n", date_time);
 
 	if(output_format == HTML_OUTPUT)
-		printf("Content-type: text/html\r\n\r\n");
+		printf("Content-type: text/html; charset=utf-8\r\n\r\n");
 	else {
 		printf("Content-type: text/plain\r\n\r\n");
 		return;

diff --git a/cgi/tac.c b/cgi/tac.c
@@ -281,7 +281,7 @@ void document_header(int use_stylesheet) {
 	get_time_string(&expire_time, date_time, (int)sizeof(date_time), HTTP_DATE_TIME);
 	printf("Expires: %s\r\n", date_time);
 
-	printf("Content-type: text/html\r\n\r\n");
+	printf("Content-type: text/html; charset=utf-8\r\n\r\n");
 
 	if(embedded == TRUE)
 		return;

diff --git a/cgi/trends.c b/cgi/trends.c
@@ -1214,7 +1214,7 @@ void document_header(int use_stylesheet) {
 		get_time_string(&expire_time, date_time, sizeof(date_time), HTTP_DATE_TIME);
 		printf("Expires: %s\r\n", date_time);
 
-		printf("Content-type: text/html\r\n\r\n");
+		printf("Content-type: text/html; charset=utf-8\r\n\r\n");
 
 		if(embedded == TRUE)
 			return;