dovecot-2.2: fts-tika: Removed lib-http kludgy workaround, which...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/5054f75630c7
changeset: 17349:5054f75630c7
user:      Timo Sirainen <tss at iki.fi>
date:      Thu May 08 13:27:43 2014 +0300
description:
fts-tika: Removed lib-http kludgy workaround, which is no longer needed.

diffstat:

 src/plugins/fts/fts-parser-tika.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r c6c44f136100 -r 5054f75630c7 src/plugins/fts/fts-parser-tika.c
--- a/src/plugins/fts/fts-parser-tika.c	Thu May 08 12:39:10 2014 +0300
+++ b/src/plugins/fts/fts-parser-tika.c	Thu May 08 13:27:43 2014 +0300
@@ -27,7 +27,6 @@
 	struct io *io;
 	struct istream *payload;
 
-	bool http_req_finished;
 	bool failed;
 };
 
@@ -104,7 +103,7 @@
 		parser->failed = TRUE;
 		break;
 	}
-	parser->http_req_finished = TRUE;
+	parser->http_req = NULL;
 	io_loop_stop(current_ioloop);
 }
 
@@ -205,7 +204,7 @@
 		i_stream_unref(&parser->payload);
 	/* FIXME: kludgy, http_req should be NULL here if we don't want to
 	   free it. requires lib-http changes. */
-	if (parser->http_req != NULL && !parser->http_req_finished)
+	if (parser->http_req != NULL)
 		http_client_request_abort(&parser->http_req);
 	i_free(parser);
 }