From: Vsevolod Stakhov <vsevolod@rambler-co.ru>
Date: Mon, 2 Mar 2009 00:58:37 +0000 (+0300)
Subject: * Fix character policy in dispatcher
X-Git-Tag: 0.2.7~288
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=496249dabef15cb033c0a5a2a74f5a021f6012c1;p=rspamd.git

* Fix character policy in dispatcher
---

diff --git a/src/buffer.c b/src/buffer.c
index 268b6cbb1..6cffbea9e 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -286,8 +286,14 @@ rspamd_create_dispatcher (int fd, enum io_policy policy,
 	bzero (new, sizeof (rspamd_io_dispatcher_t));
 
 	new->pool = memory_pool_new (memory_pool_get_size ());
-	new->tv = memory_pool_alloc (new->pool, sizeof (struct timeval));
-	memcpy (new->tv, tv, sizeof (struct timeval));
+	if (tv != NULL) {
+		new->tv = memory_pool_alloc (new->pool, sizeof (struct timeval));
+		memcpy (new->tv, tv, sizeof (struct timeval));
+	}
+	else {
+		new->tv = NULL;
+	}
+	new->nchars = 0;
 	new->policy = policy;
 	new->read_callback = read_cb;
 	new->write_callback = write_cb;
@@ -320,7 +326,7 @@ rspamd_set_dispatcher_policy (rspamd_io_dispatcher_t *d,
 {
 	f_str_t *tmp;
 
-	if (d->policy != policy || d->nchars != nchars) {
+	if (d->policy != policy) {
 		d->policy = policy;
 		d->nchars = nchars ? nchars : BUFSIZ;
 		/* Resize input buffer if needed */
diff --git a/src/message.c b/src/message.c
index 98c710fe8..8978ea827 100644
--- a/src/message.c
+++ b/src/message.c
@@ -318,6 +318,7 @@ process_message (struct worker_task *task)
 	GMimeStream *stream;
 
 	stream = g_mime_stream_mem_new_with_buffer (task->msg->begin, task->msg->len);
+	msg_debug ("process_message: construct mime parser from string length %ld", (long int)task->msg->len);
 	/* create a new parser object to parse the stream */
 	parser = g_mime_parser_new_with_stream (stream);