From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Sun, 9 Apr 2017 12:48:59 +0000 (+0300)
Subject: fts-solr: Don't double-escape headers.
X-Git-Tag: 2.3.0.rc1~1768
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44d597bb389e6410cbc5f5cff14f752f06f176c2;p=thirdparty%2Fdovecot%2Fcore.git

fts-solr: Don't double-escape headers.
---

diff --git a/src/plugins/fts-solr/fts-backend-solr.c b/src/plugins/fts-solr/fts-backend-solr.c
index 228705672e..46d1974dd0 100644
--- a/src/plugins/fts-solr/fts-backend-solr.c
+++ b/src/plugins/fts-solr/fts-backend-solr.c
@@ -349,7 +349,8 @@ fts_backend_solr_doc_close(struct solr_fts_backend_update_context *ctx)
 	}
 	array_foreach_modifiable(&ctx->fields, field) {
 		str_printfa(ctx->cmd, "<field name=\"%s\">", field->key);
-		xml_encode_data(ctx->cmd, str_data(field->value), str_len(field->value));
+		/* the values are already xml-escaped */
+		str_append_str(ctx->cmd, field->value);
 		str_append(ctx->cmd, "</field>");
 		str_truncate(field->value, 0);
 	}