From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 12 Oct 2015 12:02:40 +0000 (+0100)
Subject: Fix HTTP reply status.
X-Git-Tag: 1.0.5~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db1f808884e11639306010ec629abb2c9c370393;p=thirdparty%2Frspamd.git

Fix HTTP reply status.
---

diff --git a/src/libserver/rspamd_control.c b/src/libserver/rspamd_control.c
index e8c24ff12e..12a307625b 100644
--- a/src/libserver/rspamd_control.c
+++ b/src/libserver/rspamd_control.c
@@ -92,13 +92,13 @@ rspamd_control_send_error (struct rspamd_control_session *session,
 	msg = rspamd_http_new_message (HTTP_RESPONSE);
 
 	va_start (args, error_msg);
-	msg->status = rspamd_fstring_sized_new (128);
+	msg->status = rspamd_fstring_new ();
 	rspamd_vprintf_fstring (&msg->status, error_msg, args);
 	va_end (args);
 
 	msg->date = time (NULL);
 	msg->code = code;
-	msg->body = rspamd_fstring_sized_new (128);
+	msg->body = rspamd_fstring_new ();
 	rspamd_printf_fstring (&msg->body, "{\"error\":\"%V\"}", msg->status);
 	rspamd_http_connection_reset (session->conn);
 	rspamd_http_connection_write_message (session->conn,
@@ -120,6 +120,7 @@ rspamd_control_send_ucl (struct rspamd_control_session *session,
 	msg = rspamd_http_new_message (HTTP_RESPONSE);
 	msg->date = time (NULL);
 	msg->code = 200;
+	msg->status = rspamd_fstring_new_init ("OK", 2);
 	msg->body = rspamd_fstring_sized_new (BUFSIZ);
 	rspamd_ucl_emit_fstring (obj, UCL_EMIT_JSON_COMPACT, &msg->body);
 	rspamd_http_connection_reset (session->conn);
diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c
index 02be93d8ff..47d85d6bce 100644
--- a/src/libserver/worker_util.c
+++ b/src/libserver/worker_util.c
@@ -312,13 +312,13 @@ rspamd_controller_send_error (struct rspamd_http_connection_entry *entry,
 	msg = rspamd_http_new_message (HTTP_RESPONSE);
 
 	va_start (args, error_msg);
-	msg->status = rspamd_fstring_sized_new (128);
+	msg->status = rspamd_fstring_new ();
 	rspamd_vprintf_fstring (&msg->status, error_msg, args);
 	va_end (args);
 
 	msg->date = time (NULL);
 	msg->code = code;
-	msg->body = rspamd_fstring_sized_new (128);
+	msg->body = rspamd_fstring_new ();
 	rspamd_printf_fstring (&msg->body, "{\"error\":\"%V\"}", msg->status);
 	rspamd_http_connection_reset (entry->conn);
 	rspamd_http_connection_write_message (entry->conn,
@@ -341,6 +341,7 @@ rspamd_controller_send_string (struct rspamd_http_connection_entry *entry,
 	msg = rspamd_http_new_message (HTTP_RESPONSE);
 	msg->date = time (NULL);
 	msg->code = 200;
+	msg->status = rspamd_fstring_new_init ("OK", 2);
 	msg->body = rspamd_fstring_new_init (str, strlen (str));
 	rspamd_http_connection_reset (entry->conn);
 	rspamd_http_connection_write_message (entry->conn,
@@ -363,6 +364,7 @@ rspamd_controller_send_ucl (struct rspamd_http_connection_entry *entry,
 	msg = rspamd_http_new_message (HTTP_RESPONSE);
 	msg->date = time (NULL);
 	msg->code = 200;
+	msg->status = rspamd_fstring_new_init ("OK", 2);
 	msg->body = rspamd_fstring_sized_new (BUFSIZ);
 	rspamd_ucl_emit_fstring (obj, UCL_EMIT_JSON_COMPACT, &msg->body);
 	rspamd_http_connection_reset (entry->conn);