diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-11-18 14:55:50 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-11-18 14:55:50 +0000 |
| commit | eb976e4166e51854f056fd84be68b77d6c616fcd (patch) | |
| tree | e4c7bfca2ca0e8ed7e2a7221a2e59bd1423e235d | |
| parent | c784852f1c153650343c1feebe6d2a1bda3c5c39 (diff) | |
| download | rspamd-eb976e4166e51854f056fd84be68b77d6c616fcd.tar.gz rspamd-eb976e4166e51854f056fd84be68b77d6c616fcd.zip | |
Fix ping command.
| -rw-r--r-- | src/libserver/protocol.c | 3 | ||||
| -rw-r--r-- | src/worker.c | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c index 726da9118..f4e8da09d 100644 --- a/src/libserver/protocol.c +++ b/src/libserver/protocol.c @@ -906,7 +906,8 @@ rspamd_protocol_write_reply (struct rspamd_task *task) rspamd_protocol_http_reply (msg, task); break; case CMD_PING: - msg->body = g_string_new ("pong"); + msg->body = g_string_new ("pong" CRLF); + ctype = "text/plain"; break; case CMD_OTHER: msg_err ("BROKEN"); diff --git a/src/worker.c b/src/worker.c index 4bca03f2d..aff9c1b00 100644 --- a/src/worker.c +++ b/src/worker.c @@ -109,6 +109,11 @@ rspamd_worker_body_handler (struct rspamd_http_connection *conn, ctx = task->worker->ctx; + if (!rspamd_protocol_handle_request (task, msg)) { + task->state = WRITE_REPLY; + return 0; + } + if (task->cmd == CMD_PING) { task->state = WRITE_REPLY; return 0; @@ -122,11 +127,6 @@ rspamd_worker_body_handler (struct rspamd_http_connection *conn, return 0; } - if (!rspamd_protocol_handle_request (task, msg)) { - task->state = WRITE_REPLY; - return 0; - } - if (!rspamd_task_process (task, msg, ctx->classify_pool, TRUE)) { task->state = WRITE_REPLY; } |