svn commit: r436705 - in head/mail/dovecot2: . files

[Adam Weinberger]

Author: adamw
Date: Wed Mar 22 15:15:42 2017
New Revision: 436705
URL: https://svnweb.freebsd.org/changeset/ports/436705

Log:
  Add an upstream patch to fix a crash in the tika FTS plugin.
  
  Submitted by:	ler
  Obtained from:	https://github.com/dovecot/core/commit/3751b61dfbc6c141731a740d982fc59918db2482.patch

Added:
  head/mail/dovecot2/files/patch-src_plugins_fts_fts-parser-tika.c   (contents, props changed)
Modified:
  head/mail/dovecot2/Makefile

Modified: head/mail/dovecot2/Makefile
==============================================================================
--- head/mail/dovecot2/Makefile	Wed Mar 22 15:02:19 2017	(r436704)
+++ head/mail/dovecot2/Makefile	Wed Mar 22 15:15:42 2017	(r436705)
@@ -14,7 +14,7 @@
 
 PORTNAME=	dovecot
 PORTVERSION=	2.2.28
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	https://www.dovecot.org/releases/${PORTVERSION:R}/
 PKGNAMESUFFIX=	2

Added: head/mail/dovecot2/files/patch-src_plugins_fts_fts-parser-tika.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/dovecot2/files/patch-src_plugins_fts_fts-parser-tika.c	Wed Mar 22 15:15:42 2017	(r436705)
@@ -0,0 +1,30 @@
+From 3751b61dfbc6c141731a740d982fc59918db2482 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martti=20Rannanj=C3=A4rvi?= <martti.rannanjarvi at dovecot.fi>
+Date: Wed, 1 Mar 2017 12:29:17 +0200
+Subject: [PATCH] fts: Don't add NULL content disposition or type to HTTP
+ header
+
+---
+ src/plugins/fts/fts-parser-tika.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/plugins/fts/fts-parser-tika.c b/src/plugins/fts/fts-parser-tika.c
+index 8457f28..385f1d0 100644
+--- src/plugins/fts/fts-parser-tika.c
++++ src/plugins/fts/fts-parser-tika.c
+@@ -158,9 +158,12 @@ fts_parser_tika_try_init(struct mail_user *user, const char *content_type,
+ 			fts_tika_parser_response, parser);
+ 	http_client_request_set_port(http_req, http_url->port);
+ 	http_client_request_set_ssl(http_req, http_url->have_ssl);
+-	http_client_request_add_header(http_req, "Content-Type", content_type);
+-	http_client_request_add_header(http_req, "Content-Disposition",
+-				       content_disposition);
++	if (content_type != NULL)
++		http_client_request_add_header(http_req, "Content-Type",
++					       content_type);
++	if (content_disposition != NULL)
++		http_client_request_add_header(http_req, "Content-Disposition",
++					       content_disposition);
+ 	http_client_request_add_header(http_req, "Accept", "text/plain");
+ 
+ 	parser->http_req = http_req;