Adding upstream version 1:2.3.21+dfsg1.upstream/1%2.3.21+dfsg1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

11 files changed, 4101 insertions, 0 deletions

diff --git a/src/plugins/fts-solr/Makefile.am b/src/plugins/fts-solr/Makefile.am
new file mode 100644
index 0000000..cd1e17b
--- /dev/null
+++ b/src/plugins/fts-solr/Makefile.am
@@ -0,0 +1,64 @@
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	-I$(top_srcdir)/src/lib-ssl-iostream \
+	-I$(top_srcdir)/src/lib-http \
+	-I$(top_srcdir)/src/lib-mail \
+	-I$(top_srcdir)/src/lib-imap \
+	-I$(top_srcdir)/src/lib-index \
+	-I$(top_srcdir)/src/lib-storage \
+	-I$(top_srcdir)/src/plugins/fts
+
+NOPLUGIN_LDFLAGS =
+lib21_fts_solr_plugin_la_LDFLAGS = -module -avoid-version
+
+module_LTLIBRARIES = \
+	lib21_fts_solr_plugin.la
+
+if DOVECOT_PLUGIN_DEPS
+fts_plugin_dep = ../fts/lib20_fts_plugin.la
+endif
+
+lib21_fts_solr_plugin_la_LIBADD = \
+	$(fts_plugin_dep) \
+	-lexpat
+
+lib21_fts_solr_plugin_la_SOURCES = \
+	fts-backend-solr.c \
+	fts-backend-solr-old.c \
+	fts-solr-plugin.c \
+	solr-response.c \
+	solr-connection.c
+
+noinst_HEADERS = \
+	fts-solr-plugin.h \
+	solr-response.h \
+	solr-connection.h
+
+test_programs = \
+	test-solr-response
+
+test_libs = \
+	../../lib-test/libtest.la \
+	../../lib-charset/libcharset.la \
+	../../lib/liblib.la \
+	$(MODULE_LIBS)
+
+noinst_PROGRAMS = test-solr-response
+
+test_solr_response_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir)/src/lib-test
+test_solr_response_SOURCES = \
+	solr-response.c \
+	test-solr-response.c
+test_solr_response_LDADD = \
+	$(test_libs) -lexpat
+
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)
+
+check: check-am check-test
+check-test: all-am
+	for bin in $(test_programs); do \
+	  if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
+	done
diff --git a/src/plugins/fts-solr/Makefile.in b/src/plugins/fts-solr/Makefile.in
new file mode 100644
index 0000000..42857e1
--- /dev/null
+++ b/src/plugins/fts-solr/Makefile.in
@@ -0,0 +1,965 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+noinst_PROGRAMS = test-solr-response$(EXEEXT)
+subdir = src/plugins/fts-solr
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_checktype2.m4 \
+	$(top_srcdir)/m4/ac_typeof.m4 $(top_srcdir)/m4/arc4random.m4 \
+	$(top_srcdir)/m4/blockdev.m4 $(top_srcdir)/m4/c99_vsnprintf.m4 \
+	$(top_srcdir)/m4/clock_gettime.m4 $(top_srcdir)/m4/crypt.m4 \
+	$(top_srcdir)/m4/crypt_xpg6.m4 $(top_srcdir)/m4/dbqlk.m4 \
+	$(top_srcdir)/m4/dirent_dtype.m4 $(top_srcdir)/m4/dovecot.m4 \
+	$(top_srcdir)/m4/fd_passing.m4 $(top_srcdir)/m4/fdatasync.m4 \
+	$(top_srcdir)/m4/flexible_array_member.m4 \
+	$(top_srcdir)/m4/glibc.m4 $(top_srcdir)/m4/gmtime_max.m4 \
+	$(top_srcdir)/m4/gmtime_tm_gmtoff.m4 \
+	$(top_srcdir)/m4/ioloop.m4 $(top_srcdir)/m4/iovec.m4 \
+	$(top_srcdir)/m4/ipv6.m4 $(top_srcdir)/m4/libcap.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libwrap.m4 \
+	$(top_srcdir)/m4/linux_mremap.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/mmap_write.m4 \
+	$(top_srcdir)/m4/mntctl.m4 $(top_srcdir)/m4/modules.m4 \
+	$(top_srcdir)/m4/notify.m4 $(top_srcdir)/m4/nsl.m4 \
+	$(top_srcdir)/m4/off_t_max.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/m4/pr_set_dumpable.m4 \
+	$(top_srcdir)/m4/q_quotactl.m4 $(top_srcdir)/m4/quota.m4 \
+	$(top_srcdir)/m4/random.m4 $(top_srcdir)/m4/rlimit.m4 \
+	$(top_srcdir)/m4/sendfile.m4 $(top_srcdir)/m4/size_t_signed.m4 \
+	$(top_srcdir)/m4/sockpeercred.m4 $(top_srcdir)/m4/sql.m4 \
+	$(top_srcdir)/m4/ssl.m4 $(top_srcdir)/m4/st_tim.m4 \
+	$(top_srcdir)/m4/static_array.m4 $(top_srcdir)/m4/test_with.m4 \
+	$(top_srcdir)/m4/time_t.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/typeof_dev_t.m4 \
+	$(top_srcdir)/m4/uoff_t_max.m4 $(top_srcdir)/m4/vararg.m4 \
+	$(top_srcdir)/m4/want_apparmor.m4 \
+	$(top_srcdir)/m4/want_bsdauth.m4 \
+	$(top_srcdir)/m4/want_bzlib.m4 \
+	$(top_srcdir)/m4/want_cassandra.m4 \
+	$(top_srcdir)/m4/want_cdb.m4 \
+	$(top_srcdir)/m4/want_checkpassword.m4 \
+	$(top_srcdir)/m4/want_clucene.m4 $(top_srcdir)/m4/want_db.m4 \
+	$(top_srcdir)/m4/want_gssapi.m4 $(top_srcdir)/m4/want_icu.m4 \
+	$(top_srcdir)/m4/want_ldap.m4 $(top_srcdir)/m4/want_lua.m4 \
+	$(top_srcdir)/m4/want_lz4.m4 $(top_srcdir)/m4/want_lzma.m4 \
+	$(top_srcdir)/m4/want_mysql.m4 $(top_srcdir)/m4/want_pam.m4 \
+	$(top_srcdir)/m4/want_passwd.m4 $(top_srcdir)/m4/want_pgsql.m4 \
+	$(top_srcdir)/m4/want_prefetch.m4 \
+	$(top_srcdir)/m4/want_shadow.m4 \
+	$(top_srcdir)/m4/want_sodium.m4 $(top_srcdir)/m4/want_solr.m4 \
+	$(top_srcdir)/m4/want_sqlite.m4 \
+	$(top_srcdir)/m4/want_stemmer.m4 \
+	$(top_srcdir)/m4/want_systemd.m4 \
+	$(top_srcdir)/m4/want_textcat.m4 \
+	$(top_srcdir)/m4/want_unwind.m4 $(top_srcdir)/m4/want_zlib.m4 \
+	$(top_srcdir)/m4/want_zstd.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(pkginc_lib_HEADERS) $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(moduledir)" \
+	"$(DESTDIR)$(pkginc_libdir)"
+LTLIBRARIES = $(module_LTLIBRARIES)
+lib21_fts_solr_plugin_la_DEPENDENCIES = $(fts_plugin_dep)
+am_lib21_fts_solr_plugin_la_OBJECTS = fts-backend-solr.lo \
+	fts-backend-solr-old.lo fts-solr-plugin.lo solr-response.lo \
+	solr-connection.lo
+lib21_fts_solr_plugin_la_OBJECTS =  \
+	$(am_lib21_fts_solr_plugin_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+lib21_fts_solr_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(lib21_fts_solr_plugin_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_test_solr_response_OBJECTS =  \
+	test_solr_response-solr-response.$(OBJEXT) \
+	test_solr_response-test-solr-response.$(OBJEXT)
+test_solr_response_OBJECTS = $(am_test_solr_response_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = ../../lib-test/libtest.la \
+	../../lib-charset/libcharset.la ../../lib/liblib.la \
+	$(am__DEPENDENCIES_1)
+test_solr_response_DEPENDENCIES = $(am__DEPENDENCIES_2)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fts-backend-solr-old.Plo \
+	./$(DEPDIR)/fts-backend-solr.Plo \
+	./$(DEPDIR)/fts-solr-plugin.Plo \
+	./$(DEPDIR)/solr-connection.Plo ./$(DEPDIR)/solr-response.Plo \
+	./$(DEPDIR)/test_solr_response-solr-response.Po \
+	./$(DEPDIR)/test_solr_response-test-solr-response.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(lib21_fts_solr_plugin_la_SOURCES) \
+	$(test_solr_response_SOURCES)
+DIST_SOURCES = $(lib21_fts_solr_plugin_la_SOURCES) \
+	$(test_solr_response_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(noinst_HEADERS) $(pkginc_lib_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPARMOR_LIBS = @APPARMOR_LIBS@
+AR = @AR@
+AUTH_CFLAGS = @AUTH_CFLAGS@
+AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BINARY_CFLAGS = @BINARY_CFLAGS@
+BINARY_LDFLAGS = @BINARY_LDFLAGS@
+BISON = @BISON@
+CASSANDRA_CFLAGS = @CASSANDRA_CFLAGS@
+CASSANDRA_LIBS = @CASSANDRA_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CDB_LIBS = @CDB_LIBS@
+CFLAGS = @CFLAGS@
+CLUCENE_CFLAGS = @CLUCENE_CFLAGS@
+CLUCENE_LIBS = @CLUCENE_LIBS@
+COMPRESS_LIBS = @COMPRESS_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CRYPT_LIBS = @CRYPT_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DICT_LIBS = @DICT_LIBS@
+DLLIB = @DLLIB@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FLEX = @FLEX@
+FUZZER_CPPFLAGS = @FUZZER_CPPFLAGS@
+FUZZER_LDFLAGS = @FUZZER_LDFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KRB5CONFIG = @KRB5CONFIG@
+KRB5_CFLAGS = @KRB5_CFLAGS@
+KRB5_LIBS = @KRB5_LIBS@
+LD = @LD@
+LDAP_LIBS = @LDAP_LIBS@
+LDFLAGS = @LDFLAGS@
+LD_NO_WHOLE_ARCHIVE = @LD_NO_WHOLE_ARCHIVE@
+LD_WHOLE_ARCHIVE = @LD_WHOLE_ARCHIVE@
+LIBCAP = @LIBCAP@
+LIBDOVECOT = @LIBDOVECOT@
+LIBDOVECOT_COMPRESS = @LIBDOVECOT_COMPRESS@
+LIBDOVECOT_DEPS = @LIBDOVECOT_DEPS@
+LIBDOVECOT_DSYNC = @LIBDOVECOT_DSYNC@
+LIBDOVECOT_LA_LIBS = @LIBDOVECOT_LA_LIBS@
+LIBDOVECOT_LDA = @LIBDOVECOT_LDA@
+LIBDOVECOT_LDAP = @LIBDOVECOT_LDAP@
+LIBDOVECOT_LIBFTS = @LIBDOVECOT_LIBFTS@
+LIBDOVECOT_LIBFTS_DEPS = @LIBDOVECOT_LIBFTS_DEPS@
+LIBDOVECOT_LOGIN = @LIBDOVECOT_LOGIN@
+LIBDOVECOT_LUA = @LIBDOVECOT_LUA@
+LIBDOVECOT_LUA_DEPS = @LIBDOVECOT_LUA_DEPS@
+LIBDOVECOT_SQL = @LIBDOVECOT_SQL@
+LIBDOVECOT_STORAGE = @LIBDOVECOT_STORAGE@
+LIBDOVECOT_STORAGE_DEPS = @LIBDOVECOT_STORAGE_DEPS@
+LIBEXTTEXTCAT_CFLAGS = @LIBEXTTEXTCAT_CFLAGS@
+LIBEXTTEXTCAT_LIBS = @LIBEXTTEXTCAT_LIBS@
+LIBICONV = @LIBICONV@
+LIBICU_CFLAGS = @LIBICU_CFLAGS@
+LIBICU_LIBS = @LIBICU_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBSODIUM_CFLAGS = @LIBSODIUM_CFLAGS@
+LIBSODIUM_LIBS = @LIBSODIUM_LIBS@
+LIBTIRPC_CFLAGS = @LIBTIRPC_CFLAGS@
+LIBTIRPC_LIBS = @LIBTIRPC_LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
+LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
+LIBWRAP_LIBS = @LIBWRAP_LIBS@
+LINKED_STORAGE_LDADD = @LINKED_STORAGE_LDADD@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_LIBS = @LUA_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MODULE_LIBS = @MODULE_LIBS@
+MODULE_SUFFIX = @MODULE_SUFFIX@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
+MYSQL_CONFIG = @MYSQL_CONFIG@
+MYSQL_LIBS = @MYSQL_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOPLUGIN_LDFLAGS = 
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANDOC = @PANDOC@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PGSQL_CFLAGS = @PGSQL_CFLAGS@
+PGSQL_LIBS = @PGSQL_LIBS@
+PG_CONFIG = @PG_CONFIG@
+PIE_CFLAGS = @PIE_CFLAGS@
+PIE_LDFLAGS = @PIE_LDFLAGS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+QUOTA_LIBS = @QUOTA_LIBS@
+RANLIB = @RANLIB@
+RELRO_LDFLAGS = @RELRO_LDFLAGS@
+RPCGEN = @RPCGEN@
+RUN_TEST = @RUN_TEST@
+SED = @SED@
+SETTING_FILES = @SETTING_FILES@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
+SQL_CFLAGS = @SQL_CFLAGS@
+SQL_LIBS = @SQL_LIBS@
+SSL_CFLAGS = @SSL_CFLAGS@
+SSL_LIBS = @SSL_LIBS@
+STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+ZSTD_CFLAGS = @ZSTD_CFLAGS@
+ZSTD_LIBS = @ZSTD_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+dict_drivers = @dict_drivers@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+rundir = @rundir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sql_drivers = @sql_drivers@
+srcdir = @srcdir@
+ssldir = @ssldir@
+statedir = @statedir@
+sysconfdir = @sysconfdir@
+systemdservicetype = @systemdservicetype@
+systemdsystemunitdir = @systemdsystemunitdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/lib \
+	-I$(top_srcdir)/src/lib-ssl-iostream \
+	-I$(top_srcdir)/src/lib-http \
+	-I$(top_srcdir)/src/lib-mail \
+	-I$(top_srcdir)/src/lib-imap \
+	-I$(top_srcdir)/src/lib-index \
+	-I$(top_srcdir)/src/lib-storage \
+	-I$(top_srcdir)/src/plugins/fts
+
+lib21_fts_solr_plugin_la_LDFLAGS = -module -avoid-version
+module_LTLIBRARIES = \
+	lib21_fts_solr_plugin.la
+
+@DOVECOT_PLUGIN_DEPS_TRUE@fts_plugin_dep = ../fts/lib20_fts_plugin.la
+lib21_fts_solr_plugin_la_LIBADD = \
+	$(fts_plugin_dep) \
+	-lexpat
+
+lib21_fts_solr_plugin_la_SOURCES = \
+	fts-backend-solr.c \
+	fts-backend-solr-old.c \
+	fts-solr-plugin.c \
+	solr-response.c \
+	solr-connection.c
+
+noinst_HEADERS = \
+	fts-solr-plugin.h \
+	solr-response.h \
+	solr-connection.h
+
+test_programs = \
+	test-solr-response
+
+test_libs = \
+	../../lib-test/libtest.la \
+	../../lib-charset/libcharset.la \
+	../../lib/liblib.la \
+	$(MODULE_LIBS)
+
+test_solr_response_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir)/src/lib-test
+
+test_solr_response_SOURCES = \
+	solr-response.c \
+	test-solr-response.c
+
+test_solr_response_LDADD = \
+	$(test_libs) -lexpat
+
+pkginc_libdir = $(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/fts-solr/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/plugins/fts-solr/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(moduledir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(moduledir)"; \
+	}
+
+uninstall-moduleLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$f"; \
+	done
+
+clean-moduleLTLIBRARIES:
+	-test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES)
+	@list='$(module_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+lib21_fts_solr_plugin.la: $(lib21_fts_solr_plugin_la_OBJECTS) $(lib21_fts_solr_plugin_la_DEPENDENCIES) $(EXTRA_lib21_fts_solr_plugin_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(lib21_fts_solr_plugin_la_LINK) -rpath $(moduledir) $(lib21_fts_solr_plugin_la_OBJECTS) $(lib21_fts_solr_plugin_la_LIBADD) $(LIBS)
+
+test-solr-response$(EXEEXT): $(test_solr_response_OBJECTS) $(test_solr_response_DEPENDENCIES) $(EXTRA_test_solr_response_DEPENDENCIES) 
+	@rm -f test-solr-response$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_solr_response_OBJECTS) $(test_solr_response_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fts-backend-solr-old.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fts-backend-solr.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fts-solr-plugin.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solr-connection.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solr-response.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_solr_response-solr-response.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_solr_response-test-solr-response.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+test_solr_response-solr-response.o: solr-response.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_solr_response_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_solr_response-solr-response.o -MD -MP -MF $(DEPDIR)/test_solr_response-solr-response.Tpo -c -o test_solr_response-solr-response.o `test -f 'solr-response.c' || echo '$(srcdir)/'`solr-response.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_solr_response-solr-response.Tpo $(DEPDIR)/test_solr_response-solr-response.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='solr-response.c' object='test_solr_response-solr-response.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_solr_response_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_solr_response-solr-response.o `test -f 'solr-response.c' || echo '$(srcdir)/'`solr-response.c
+
+test_solr_response-solr-response.obj: solr-response.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_solr_response_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_solr_response-solr-response.obj -MD -MP -MF $(DEPDIR)/test_solr_response-solr-response.Tpo -c -o test_solr_response-solr-response.obj `if test -f 'solr-response.c'; then $(CYGPATH_W) 'solr-response.c'; else $(CYGPATH_W) '$(srcdir)/solr-response.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_solr_response-solr-response.Tpo $(DEPDIR)/test_solr_response-solr-response.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='solr-response.c' object='test_solr_response-solr-response.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_solr_response_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_solr_response-solr-response.obj `if test -f 'solr-response.c'; then $(CYGPATH_W) 'solr-response.c'; else $(CYGPATH_W) '$(srcdir)/solr-response.c'; fi`
+
+test_solr_response-test-solr-response.o: test-solr-response.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_solr_response_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_solr_response-test-solr-response.o -MD -MP -MF $(DEPDIR)/test_solr_response-test-solr-response.Tpo -c -o test_solr_response-test-solr-response.o `test -f 'test-solr-response.c' || echo '$(srcdir)/'`test-solr-response.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_solr_response-test-solr-response.Tpo $(DEPDIR)/test_solr_response-test-solr-response.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-solr-response.c' object='test_solr_response-test-solr-response.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_solr_response_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_solr_response-test-solr-response.o `test -f 'test-solr-response.c' || echo '$(srcdir)/'`test-solr-response.c
+
+test_solr_response-test-solr-response.obj: test-solr-response.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_solr_response_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_solr_response-test-solr-response.obj -MD -MP -MF $(DEPDIR)/test_solr_response-test-solr-response.Tpo -c -o test_solr_response-test-solr-response.obj `if test -f 'test-solr-response.c'; then $(CYGPATH_W) 'test-solr-response.c'; else $(CYGPATH_W) '$(srcdir)/test-solr-response.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_solr_response-test-solr-response.Tpo $(DEPDIR)/test_solr_response-test-solr-response.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-solr-response.c' object='test_solr_response-test-solr-response.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_solr_response_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_solr_response-test-solr-response.obj `if test -f 'test-solr-response.c'; then $(CYGPATH_W) 'test-solr-response.c'; else $(CYGPATH_W) '$(srcdir)/test-solr-response.c'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkginc_libHEADERS: $(pkginc_lib_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(pkginc_lib_HEADERS)'; test -n "$(pkginc_libdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkginc_libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkginc_libdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkginc_libdir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkginc_libdir)" || exit $$?; \
+	done
+
+uninstall-pkginc_libHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkginc_lib_HEADERS)'; test -n "$(pkginc_libdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkginc_libdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(pkginc_libdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-moduleLTLIBRARIES \
+	clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/fts-backend-solr-old.Plo
+	-rm -f ./$(DEPDIR)/fts-backend-solr.Plo
+	-rm -f ./$(DEPDIR)/fts-solr-plugin.Plo
+	-rm -f ./$(DEPDIR)/solr-connection.Plo
+	-rm -f ./$(DEPDIR)/solr-response.Plo
+	-rm -f ./$(DEPDIR)/test_solr_response-solr-response.Po
+	-rm -f ./$(DEPDIR)/test_solr_response-test-solr-response.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-moduleLTLIBRARIES install-pkginc_libHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/fts-backend-solr-old.Plo
+	-rm -f ./$(DEPDIR)/fts-backend-solr.Plo
+	-rm -f ./$(DEPDIR)/fts-solr-plugin.Plo
+	-rm -f ./$(DEPDIR)/solr-connection.Plo
+	-rm -f ./$(DEPDIR)/solr-response.Plo
+	-rm -f ./$(DEPDIR)/test_solr_response-solr-response.Po
+	-rm -f ./$(DEPDIR)/test_solr_response-test-solr-response.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-moduleLTLIBRARIES uninstall-pkginc_libHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-moduleLTLIBRARIES \
+	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-moduleLTLIBRARIES install-pdf install-pdf-am \
+	install-pkginc_libHEADERS install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-moduleLTLIBRARIES uninstall-pkginc_libHEADERS
+
+.PRECIOUS: Makefile
+
+
+check: check-am check-test
+check-test: all-am
+	for bin in $(test_programs); do \
+	  if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
+	done
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/fts-solr/fts-backend-solr-old.c b/src/plugins/fts-solr/fts-backend-solr-old.c
new file mode 100644
index 0000000..20b891b
--- /dev/null
+++ b/src/plugins/fts-solr/fts-backend-solr-old.c
@@ -0,0 +1,879 @@
+/* Copyright (c) 2006-2018 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "array.h"
+#include "str.h"
+#include "hash.h"
+#include "strescape.h"
+#include "unichar.h"
+#include "iostream-ssl.h"
+#include "http-url.h"
+#include "imap-utf7.h"
+#include "mail-storage-private.h"
+#include "mailbox-list-private.h"
+#include "mail-search.h"
+#include "fts-api.h"
+#include "solr-connection.h"
+#include "fts-solr-plugin.h"
+
+#include <ctype.h>
+
+#define SOLR_CMDBUF_SIZE (1024*64)
+#define SOLR_MAX_MULTI_ROWS 100000
+
+struct solr_fts_backend {
+	struct fts_backend backend;
+	struct solr_connection *solr_conn;
+	char *id_username, *id_namespace;
+	struct mail_namespace *default_ns;
+};
+
+struct solr_fts_backend_update_context {
+	struct fts_backend_update_context ctx;
+
+	struct mailbox *cur_box;
+	char *id_box_name;
+
+	struct solr_connection_post *post;
+	uint32_t prev_uid, uid_validity;
+	string_t *cmd, *hdr;
+
+	bool headers_open;
+	bool body_open;
+	bool documents_added;
+};
+
+static const char *solr_escape_chars = "+-&|!(){}[]^\"~*?:\\/ ";
+
+static bool is_valid_xml_char(unichar_t chr)
+{
+	/* Valid characters in XML:
+
+	   #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] |
+	   [#x10000-#x10FFFF]
+
+	   This function gets called only for #x80 and higher */
+	if (chr > 0xd7ff && chr < 0xe000)
+		return FALSE;
+	if (chr > 0xfffd && chr < 0x10000)
+		return FALSE;
+	return chr < 0x10ffff;
+}
+
+static void
+xml_encode_data(string_t *dest, const unsigned char *data, size_t len)
+{
+	unichar_t chr;
+	size_t i;
+
+	for (i = 0; i < len; i++) {
+		switch (data[i]) {
+		case '&':
+			str_append(dest, "&amp;");
+			break;
+		case '<':
+			str_append(dest, "&lt;");
+			break;
+		case '>':
+			str_append(dest, "&gt;");
+			break;
+		case '\t':
+		case '\n':
+		case '\r':
+			/* exceptions to the following control char check */
+			str_append_c(dest, data[i]);
+			break;
+		default:
+			if (data[i] < 32) {
+				/* SOLR doesn't like control characters.
+				   replace them with spaces. */
+				str_append_c(dest, ' ');
+			} else if (data[i] >= 0x80) {
+				/* make sure the character is valid for XML
+				   so we don't get XML parser errors */
+				int char_len =
+					uni_utf8_get_char_n(data + i, len - i, &chr);
+				i_assert(char_len > 0); /* input is valid UTF8 */
+				if (is_valid_xml_char(chr))
+					str_append_data(dest, data + i, char_len);
+				else {
+					str_append_data(dest, utf8_replacement_char,
+							UTF8_REPLACEMENT_CHAR_LEN);
+				}
+				i += char_len - 1;
+			} else {
+				str_append_c(dest, data[i]);
+			}
+			break;
+		}
+	}
+}
+
+static void xml_encode(string_t *dest, const char *str)
+{
+	xml_encode_data(dest, (const unsigned char *)str, strlen(str));
+}
+
+static const char *solr_escape_id_str(const char *str)
+{
+	string_t *tmp;
+	const char *p;
+
+	for (p = str; *p != '\0'; p++) {
+		if (*p == '/' || *p == '!')
+			break;
+	}
+	if (*p == '\0')
+		return str;
+
+	tmp = t_str_new(64);
+	for (p = str; *p != '\0'; p++) {
+		switch (*p) {
+		case '/':
+			str_append(tmp, "!\\");
+			break;
+		case '!':
+			str_append(tmp, "!!");
+			break;
+		default:
+			str_append_c(tmp, *p);
+			break;
+		}
+	}
+	return str_c(tmp);
+}
+
+static const char *solr_escape(const char *str)
+{
+	string_t *ret;
+	unsigned int i;
+
+	if (str[0] == '\0')
+		return "\"\"";
+
+	ret = t_str_new(strlen(str) + 16);
+	for (i = 0; str[i] != '\0'; i++) {
+		if (strchr(solr_escape_chars, str[i]) != NULL)
+			str_append_c(ret, '\\');
+		str_append_c(ret, str[i]);
+	}
+	return str_c(ret);
+}
+
+static void solr_quote(string_t *dest, const char *str)
+{
+	str_append(dest, solr_escape(str));
+}
+
+static void solr_quote_http(string_t *dest, const char *str)
+{
+	http_url_escape_param(dest, solr_escape(str));
+}
+
+static void fts_solr_set_default_ns(struct solr_fts_backend *backend)
+{
+	struct mail_namespace *ns = backend->backend.ns;
+	struct fts_solr_user *fuser = FTS_SOLR_USER_CONTEXT_REQUIRE(ns->user);
+	const struct fts_solr_settings *set = &fuser->set;
+	const char *str;
+
+	if (backend->default_ns != NULL)
+		return;
+
+	if (set->default_ns_prefix != NULL) {
+		backend->default_ns =
+			mail_namespace_find_prefix(ns->user->namespaces,
+						   set->default_ns_prefix);
+		if (backend->default_ns == NULL) {
+			i_error("fts_solr: default_ns setting points to "
+				"nonexistent namespace");
+		}
+	}
+	if (backend->default_ns == NULL) {
+		backend->default_ns =
+			mail_namespace_find_inbox(ns->user->namespaces);
+	}
+	while (backend->default_ns->alias_for != NULL)
+		backend->default_ns = backend->default_ns->alias_for;
+
+	if (ns != backend->default_ns) {
+		str = solr_escape_id_str(ns->prefix);
+		backend->id_namespace = i_strdup(str);
+	}
+}
+
+static void fts_box_name_get_root(struct mail_namespace **ns, const char **name)
+{
+	struct mail_namespace *orig_ns = *ns;
+
+	while ((*ns)->alias_for != NULL)
+		*ns = (*ns)->alias_for;
+
+	if (**name == '\0' && *ns != orig_ns &&
+	    ((*ns)->flags & NAMESPACE_FLAG_INBOX_USER) != 0) {
+		/* ugly workaround to allow selecting INBOX from a Maildir/
+		   when it's not in the inbox=yes namespace. */
+		*name = "INBOX";
+	}
+}
+
+static const char *
+fts_box_get_root(struct mailbox *box, struct mail_namespace **ns_r)
+{
+	struct mail_namespace *ns = mailbox_get_namespace(box);
+	const char *name;
+
+	if (t_imap_utf8_to_utf7(box->name, &name) < 0)
+		i_unreached();
+
+	fts_box_name_get_root(&ns, &name);
+	*ns_r = ns;
+	return name;
+}
+
+static struct fts_backend *fts_backend_solr_alloc(void)
+{
+	struct solr_fts_backend *backend;
+
+	backend = i_new(struct solr_fts_backend, 1);
+	backend->backend = fts_backend_solr_old;
+	return &backend->backend;
+}
+
+static int
+fts_backend_solr_init(struct fts_backend *_backend, const char **error_r)
+{
+	struct solr_fts_backend *backend = (struct solr_fts_backend *)_backend;
+	struct fts_solr_user *fuser = FTS_SOLR_USER_CONTEXT(_backend->ns->user);
+	struct ssl_iostream_settings ssl_set;
+	const char *str;
+
+	if (fuser == NULL) {
+		*error_r = "Invalid fts_solr setting";
+		return -1;
+	}
+
+	mail_user_init_ssl_client_settings(_backend->ns->user, &ssl_set);
+	if (solr_connection_init(&fuser->set, &ssl_set,
+				 _backend->ns->user->event,
+				 &backend->solr_conn, error_r) < 0)
+		return -1;
+
+	str = solr_escape_id_str(_backend->ns->user->username);
+	backend->id_username = i_strdup(str);
+	return 0;
+}
+
+static void fts_backend_solr_deinit(struct fts_backend *_backend)
+{
+	struct solr_fts_backend *backend = (struct solr_fts_backend *)_backend;
+
+	solr_connection_deinit(&backend->solr_conn);
+	i_free(backend->id_namespace);
+	i_free(backend->id_username);
+	i_free(backend);
+}
+
+static void
+solr_add_ns_query(string_t *str, struct solr_fts_backend *backend,
+		  struct mail_namespace *ns, bool neg)
+{
+	while (ns->alias_for != NULL)
+		ns = ns->alias_for;
+
+	if (ns == backend->default_ns || *ns->prefix == '\0') {
+		if (!neg)
+			str_append(str, " -ns:[* TO *]");
+		else
+			str_append(str, " +ns:[* TO *]");
+	} else {
+		if (!neg)
+			str_append(str, " +ns:");
+		else
+			str_append(str, " -ns:");
+		solr_quote(str, ns->prefix);
+	}
+}
+
+static void
+solr_add_ns_query_http(string_t *str, struct solr_fts_backend *backend,
+		       struct mail_namespace *ns)
+{
+	string_t *tmp;
+
+	tmp = t_str_new(64);
+	solr_add_ns_query(tmp, backend, ns, FALSE);
+	http_url_escape_param(str, str_c(tmp));
+}
+
+static int
+fts_backend_solr_get_last_uid_fallback(struct solr_fts_backend *backend,
+				       struct mailbox *box,
+				       uint32_t *last_uid_r)
+{
+	struct mail_namespace *ns;
+	struct mailbox_status status;
+	struct solr_result **results;
+	const struct seq_range *uidvals;
+	const char *box_name;
+	unsigned int count;
+	string_t *str;
+	pool_t pool;
+	int ret = 0;
+
+	str = t_str_new(256);
+	str_append(str, "fl=uid&rows=1&sort=uid+desc&q=");
+
+	box_name = fts_box_get_root(box, &ns);
+
+	mailbox_get_open_status(box, STATUS_UIDVALIDITY, &status);
+	str_printfa(str, "uidv:%u+AND+box:", status.uidvalidity);
+	solr_quote_http(str, box_name);
+	solr_add_ns_query_http(str, backend, ns);
+	str_append(str, "+AND+user:");
+	solr_quote_http(str, ns->user->username);
+
+	pool = pool_alloconly_create("solr last uid lookup", 1024);
+	if (solr_connection_select(backend->solr_conn, str_c(str),
+				   pool, &results) < 0)
+		ret = -1;
+	else if (results[0] == NULL) {
+		/* no UIDs */
+		*last_uid_r = 0;
+	} else {
+		uidvals = array_get(&results[0]->uids, &count);
+		i_assert(count > 0);
+		if (count == 1 && uidvals[0].seq1 == uidvals[0].seq2) {
+			*last_uid_r = uidvals[0].seq1;
+		} else {
+			i_error("fts_solr: Last UID lookup returned multiple rows");
+			ret = -1;
+		}
+	}
+	pool_unref(&pool);
+	return ret;
+}
+
+static int
+fts_backend_solr_get_last_uid(struct fts_backend *_backend,
+			      struct mailbox *box, uint32_t *last_uid_r)
+{
+	struct solr_fts_backend *backend =
+		(struct solr_fts_backend *)_backend;
+	struct fts_index_header hdr;
+
+	if (fts_index_get_header(box, &hdr)) {
+		*last_uid_r = hdr.last_indexed_uid;
+		return 0;
+	}
+
+	/* either nothing has been indexed, or the index was corrupted.
+	   do it the slow way. */
+	if (fts_backend_solr_get_last_uid_fallback(backend, box, last_uid_r) < 0)
+		return -1;
+
+	fts_index_set_last_uid(box, *last_uid_r);
+	return 0;
+}
+
+static struct fts_backend_update_context *
+fts_backend_solr_update_init(struct fts_backend *_backend)
+{
+	struct solr_fts_backend *backend =
+		(struct solr_fts_backend *)_backend;
+	struct solr_fts_backend_update_context *ctx;
+
+	ctx = i_new(struct solr_fts_backend_update_context, 1);
+	ctx->ctx.backend = _backend;
+	ctx->cmd = str_new(default_pool, SOLR_CMDBUF_SIZE);
+	ctx->hdr = str_new(default_pool, 4096);
+	fts_solr_set_default_ns(backend);
+	return &ctx->ctx;
+}
+
+static void xml_encode_id(struct solr_fts_backend_update_context *ctx,
+			  string_t *str, uint32_t uid)
+{
+	struct solr_fts_backend *backend =
+		(struct solr_fts_backend *)ctx->ctx.backend;
+
+	if (uid != 0)
+		str_printfa(str, "%u/", uid);
+	else
+		str_append(str, "L/");
+
+	if (backend->id_namespace != NULL) {
+		xml_encode(str, backend->id_namespace);
+		str_append_c(str, '/');
+	}
+	str_printfa(str, "%u/", ctx->uid_validity);
+	xml_encode(str, backend->id_username);
+	str_append_c(str, '/');
+	xml_encode(str, ctx->id_box_name);
+}
+
+static void
+fts_backend_solr_add_doc_prefix(struct solr_fts_backend_update_context *ctx,
+				uint32_t uid)
+{
+	struct solr_fts_backend *backend =
+		(struct solr_fts_backend *)ctx->ctx.backend;
+	struct mailbox *box = ctx->cur_box;
+	struct mail_namespace *ns;
+	const char *box_name;
+
+	ctx->documents_added = TRUE;
+
+	str_printfa(ctx->cmd, "<doc>"
+		    "<field name=\"uid\">%u</field>"
+		    "<field name=\"uidv\">%u</field>",
+		    uid, ctx->uid_validity);
+
+	box_name = fts_box_get_root(box, &ns);
+
+	if (ns != backend->default_ns) {
+		str_append(ctx->cmd, "<field name=\"ns\">");
+		xml_encode(ctx->cmd, ns->prefix);
+		str_append(ctx->cmd, "</field>");
+	}
+	str_append(ctx->cmd, "<field name=\"box\">");
+	xml_encode(ctx->cmd, box_name);
+	str_append(ctx->cmd, "</field><field name=\"user\">");
+	xml_encode(ctx->cmd, ns->user->username);
+	str_append(ctx->cmd, "</field>");
+}
+
+static int
+fts_backed_solr_build_commit(struct solr_fts_backend_update_context *ctx)
+{
+	if (ctx->post == NULL)
+		return 0;
+
+	str_append(ctx->cmd, "</doc></add>");
+
+	solr_connection_post_more(ctx->post, str_data(ctx->cmd),
+				  str_len(ctx->cmd));
+	return solr_connection_post_end(&ctx->post);
+}
+
+static int
+fts_backend_solr_update_deinit(struct fts_backend_update_context *_ctx)
+{
+	struct solr_fts_backend_update_context *ctx =
+		(struct solr_fts_backend_update_context *)_ctx;
+	struct solr_fts_backend *backend =
+		(struct solr_fts_backend *)_ctx->backend;
+	const char *str;
+	int ret;
+
+	ret = fts_backed_solr_build_commit(ctx);
+
+	/* commit and wait until the documents we just indexed are
+	   visible to the following search */
+	str = t_strdup_printf("<commit waitFlush=\"false\" "
+			      "waitSearcher=\"%s\"/>",
+			      ctx->documents_added ? "true" : "false");
+	if (solr_connection_post(backend->solr_conn, str) < 0)
+		ret = -1;
+
+	str_free(&ctx->cmd);
+	str_free(&ctx->hdr);
+	i_free(ctx->id_box_name);
+	i_free(ctx);
+	return ret;
+}
+
+static void
+fts_backend_solr_update_set_mailbox(struct fts_backend_update_context *_ctx,
+				    struct mailbox *box)
+{
+	struct solr_fts_backend_update_context *ctx =
+		(struct solr_fts_backend_update_context *)_ctx;
+	struct mailbox_status status;
+	struct mail_namespace *ns;
+
+	if (ctx->prev_uid != 0) {
+		fts_index_set_last_uid(ctx->cur_box, ctx->prev_uid);
+		ctx->prev_uid = 0;
+	}
+
+	ctx->cur_box = box;
+	ctx->uid_validity = 0;
+	i_free_and_null(ctx->id_box_name);
+
+	if (box != NULL) {
+		ctx->id_box_name = i_strdup(fts_box_get_root(box, &ns));
+
+		mailbox_get_open_status(box, STATUS_UIDVALIDITY, &status);
+		ctx->uid_validity = status.uidvalidity;
+	}
+}
+
+static void
+fts_backend_solr_update_expunge(struct fts_backend_update_context *_ctx,
+				uint32_t uid)
+{
+	struct solr_fts_backend_update_context *ctx =
+		(struct solr_fts_backend_update_context *)_ctx;
+	struct solr_fts_backend *backend =
+		(struct solr_fts_backend *)_ctx->backend;
+
+	T_BEGIN {
+		string_t *cmd;
+
+		cmd = t_str_new(256);
+		str_append(cmd, "<delete><id>");
+		xml_encode_id(ctx, cmd, uid);
+		str_append(cmd, "</id></delete>");
+
+		(void)solr_connection_post(backend->solr_conn, str_c(cmd));
+	} T_END;
+}
+
+static void
+fts_backend_solr_uid_changed(struct solr_fts_backend_update_context *ctx,
+			     uint32_t uid)
+{
+	struct solr_fts_backend *backend =
+		(struct solr_fts_backend *)ctx->ctx.backend;
+
+	if (ctx->post == NULL) {
+		i_assert(ctx->prev_uid == 0);
+
+		ctx->post = solr_connection_post_begin(backend->solr_conn);
+		str_append(ctx->cmd, "<add>");
+	} else {
+		ctx->headers_open = FALSE;
+		if (ctx->body_open) {
+			ctx->body_open = FALSE;
+			str_append(ctx->cmd, "</field>");
+		}
+		str_append(ctx->cmd, "<field name=\"hdr\">");
+		str_append_str(ctx->cmd, ctx->hdr);
+		str_append(ctx->cmd, "</field>");
+		str_truncate(ctx->hdr, 0);
+
+		str_append(ctx->cmd, "</doc>");
+	}
+	ctx->prev_uid = uid;
+
+	fts_backend_solr_add_doc_prefix(ctx, uid);
+	str_printfa(ctx->cmd, "<field name=\"id\">");
+	xml_encode_id(ctx, ctx->cmd, uid);
+	str_append(ctx->cmd, "</field>");
+}
+
+static bool
+fts_backend_solr_update_set_build_key(struct fts_backend_update_context *_ctx,
+				      const struct fts_backend_build_key *key)
+{
+	struct solr_fts_backend_update_context *ctx =
+		(struct solr_fts_backend_update_context *)_ctx;
+
+	if (key->uid != ctx->prev_uid)
+		fts_backend_solr_uid_changed(ctx, key->uid);
+
+	switch (key->type) {
+	case FTS_BACKEND_BUILD_KEY_HDR:
+	case FTS_BACKEND_BUILD_KEY_MIME_HDR:
+		xml_encode(ctx->hdr, key->hdr_name);
+		str_append(ctx->hdr, ": ");
+		ctx->headers_open = TRUE;
+		break;
+	case FTS_BACKEND_BUILD_KEY_BODY_PART:
+		ctx->headers_open = FALSE;
+		if (!ctx->body_open) {
+			ctx->body_open = TRUE;
+			str_append(ctx->cmd, "<field name=\"body\">");
+		}
+		break;
+	case FTS_BACKEND_BUILD_KEY_BODY_PART_BINARY:
+		i_unreached();
+	}
+	return TRUE;
+}
+
+static void
+fts_backend_solr_update_unset_build_key(struct fts_backend_update_context *_ctx)
+{
+	struct solr_fts_backend_update_context *ctx =
+		(struct solr_fts_backend_update_context *)_ctx;
+
+	if (ctx->headers_open)
+		str_append_c(ctx->hdr, '\n');
+	else {
+		i_assert(ctx->body_open);
+		str_append_c(ctx->cmd, '\n');
+	}
+}
+
+static int
+fts_backend_solr_update_build_more(struct fts_backend_update_context *_ctx,
+				   const unsigned char *data, size_t size)
+{
+	struct solr_fts_backend_update_context *ctx =
+		(struct solr_fts_backend_update_context *)_ctx;
+
+	xml_encode_data(ctx->cmd, data, size);
+	if (str_len(ctx->cmd) > SOLR_CMDBUF_SIZE-128) {
+		solr_connection_post_more(ctx->post, str_data(ctx->cmd),
+					  str_len(ctx->cmd));
+		str_truncate(ctx->cmd, 0);
+	}
+	return 0;
+}
+
+static int fts_backend_solr_refresh(struct fts_backend *backend ATTR_UNUSED)
+{
+	return 0;
+}
+
+static int fts_backend_solr_optimize(struct fts_backend *backend ATTR_UNUSED)
+{
+	return 0;
+}
+
+static bool
+solr_add_definite_query(string_t *str, struct mail_search_arg *arg)
+{
+	if (arg->no_fts)
+		return FALSE;
+	switch (arg->type) {
+	case SEARCH_TEXT: {
+		if (arg->match_not)
+			str_append_c(str, '-');
+		str_append(str, "(hdr:");
+		solr_quote_http(str, arg->value.str);
+		str_append(str, "+OR+body:");
+		solr_quote_http(str, arg->value.str);
+		str_append(str, ")");
+		break;
+	}
+	case SEARCH_BODY:
+		if (arg->match_not)
+			str_append_c(str, '-');
+		str_append(str, "body:");
+		solr_quote_http(str, arg->value.str);
+		break;
+	default:
+		return FALSE;
+	}
+	return TRUE;
+}
+
+static bool
+solr_add_definite_query_args(string_t *str, struct mail_search_arg *arg,
+			     bool and_args)
+{
+	size_t last_len;
+
+	last_len = str_len(str);
+	for (; arg != NULL; arg = arg->next) {
+		if (solr_add_definite_query(str, arg)) {
+			arg->match_always = TRUE;
+			last_len = str_len(str);
+			if (and_args)
+				str_append(str, "+AND+");
+			else
+				str_append(str, "+OR+");
+		}
+	}
+	if (str_len(str) == last_len)
+		return FALSE;
+
+	str_truncate(str, last_len);
+	return TRUE;
+}
+
+static int
+fts_backend_solr_lookup(struct fts_backend *_backend, struct mailbox *box,
+			struct mail_search_arg *args,
+			enum fts_lookup_flags flags,
+			struct fts_result *result)
+{
+	struct solr_fts_backend *backend =
+		(struct solr_fts_backend *)_backend;
+	bool and_args = (flags & FTS_LOOKUP_FLAG_AND_ARGS) != 0;
+	struct mail_namespace *ns;
+	struct mailbox_status status;
+	string_t *str;
+	const char *box_name;
+	pool_t pool;
+	struct solr_result **results;
+	int ret;
+
+	fts_solr_set_default_ns(backend);
+	mailbox_get_open_status(box, STATUS_UIDVALIDITY | STATUS_UIDNEXT,
+				&status);
+
+	str = t_str_new(256);
+	str_printfa(str, "fl=uid,score&rows=%u&sort=uid+asc&q=%%7b!lucene+q.op%%3dAND%%7d",
+		    status.uidnext);
+
+	if (!solr_add_definite_query_args(str, args, and_args)) {
+		/* can't search this query */
+		return 0;
+	}
+
+	/* use a separate filter query for selecting the mailbox. it shouldn't
+	   affect the score and there could be some caching benefits too. */
+	str_append(str, "&fq=%2Buser:");
+	solr_quote_http(str, box->storage->user->username);
+	box_name = fts_box_get_root(box, &ns);
+	str_printfa(str, "+%%2Buidv:%u+%%2Bbox:", status.uidvalidity);
+	solr_quote_http(str, box_name);
+	solr_add_ns_query_http(str, backend, ns);
+
+	pool = pool_alloconly_create("fts solr search", 1024);
+	ret = solr_connection_select(backend->solr_conn, str_c(str),
+				     pool, &results);
+	if (ret == 0 && results[0] != NULL) {
+		if ((flags & FTS_LOOKUP_FLAG_NO_AUTO_FUZZY) == 0)
+			array_append_array(&result->definite_uids, &results[0]->uids);
+		else
+			array_append_array(&result->maybe_uids, &results[0]->uids);
+		array_append_array(&result->scores, &results[0]->scores);
+	}
+	result->scores_sorted = TRUE;
+	pool_unref(&pool);
+	return ret;
+}
+
+static char *
+mailbox_get_id(struct solr_fts_backend *backend, struct mail_namespace *ns,
+	       const char *mailbox, uint32_t uidvalidity)
+{
+	string_t *str = t_str_new(64);
+
+	str_printfa(str, "%u\001", uidvalidity);
+	str_append(str, mailbox);
+	if (ns != backend->default_ns)
+		str_printfa(str, "\001%s", ns->prefix);
+	return str_c_modifiable(str);
+}
+
+static int
+solr_search_multi(struct solr_fts_backend *backend, string_t *str,
+		  struct mailbox *const boxes[],
+		  enum fts_lookup_flags flags,
+		  struct fts_multi_result *result)
+{
+	struct solr_result **solr_results;
+	struct fts_result *fts_result;
+	ARRAY(struct fts_result) fts_results;
+	struct mail_namespace *ns;
+	struct mailbox_status status;
+	HASH_TABLE(char *, struct mailbox *) mailboxes;
+	struct mailbox *box;
+	const char *box_name;
+	char *box_id;
+	unsigned int i;
+	size_t len;
+
+	/* use a separate filter query for selecting the mailbox. it shouldn't
+	   affect the score and there could be some caching benefits too. */
+	str_append(str, "&fq=%2Buser:");
+	if (backend->backend.ns->owner != NULL)
+		solr_quote_http(str, backend->backend.ns->owner->username);
+	else
+		str_append(str, "%22%22");
+
+	hash_table_create(&mailboxes, default_pool, 0, str_hash, strcmp);
+	str_append(str, "%2B(");
+	len = str_len(str);
+	for (i = 0; boxes[i] != NULL; i++) {
+		if (str_len(str) != len)
+			str_append(str, "+OR+");
+
+		box_name = fts_box_get_root(boxes[i], &ns);
+		mailbox_get_open_status(boxes[i], STATUS_UIDVALIDITY, &status);
+		str_printfa(str, "%%2B(%%2Buidv:%u+%%2Bbox:", status.uidvalidity);
+		solr_quote_http(str, box_name);
+		solr_add_ns_query_http(str, backend, ns);
+		str_append_c(str, ')');
+
+		box_id = mailbox_get_id(backend, ns, box_name, status.uidvalidity);
+		hash_table_insert(mailboxes, box_id, boxes[i]);
+	}
+	str_append_c(str, ')');
+
+	if (solr_connection_select(backend->solr_conn, str_c(str),
+				   result->pool, &solr_results) < 0) {
+		hash_table_destroy(&mailboxes);
+		return -1;
+	}
+
+	p_array_init(&fts_results, result->pool, 32);
+	for (i = 0; solr_results[i] != NULL; i++) {
+		box = hash_table_lookup(mailboxes, solr_results[i]->box_id);
+		if (box == NULL) {
+			i_warning("fts_solr: Lookup returned unexpected mailbox "
+				  "with id=%s", solr_results[i]->box_id);
+			continue;
+		}
+		fts_result = array_append_space(&fts_results);
+		fts_result->box = box;
+		if ((flags & FTS_LOOKUP_FLAG_NO_AUTO_FUZZY) == 0)
+			fts_result->definite_uids = solr_results[i]->uids;
+		else
+			fts_result->maybe_uids = solr_results[i]->uids;
+		fts_result->scores = solr_results[i]->scores;
+		fts_result->scores_sorted = TRUE;
+	}
+	array_append_zero(&fts_results);
+	result->box_results = array_front_modifiable(&fts_results);
+	hash_table_destroy(&mailboxes);
+	return 0;
+}
+
+static int
+fts_backend_solr_lookup_multi(struct fts_backend *_backend,
+			      struct mailbox *const boxes[],
+			      struct mail_search_arg *args,
+			      enum fts_lookup_flags flags,
+			      struct fts_multi_result *result)
+{
+	bool and_args = (flags & FTS_LOOKUP_FLAG_AND_ARGS) != 0;
+	struct solr_fts_backend *backend =
+		(struct solr_fts_backend *)_backend;
+	string_t *str;
+
+	fts_solr_set_default_ns(backend);
+
+	str = t_str_new(256);
+	str_printfa(str, "fl=ns,box,uidv,uid,score&rows=%u&sort=box+asc,uid+asc&q=%%7b!lucene+q.op%%3dAND%%7d",
+		    SOLR_MAX_MULTI_ROWS);
+
+	if (solr_add_definite_query_args(str, args, and_args)) {
+		if (solr_search_multi(backend, str, boxes, flags, result) < 0)
+			return -1;
+	}
+	/* FIXME: maybe_uids could be handled also with some more work.. */
+	return 0;
+}
+
+struct fts_backend fts_backend_solr_old = {
+	.name = "solr_old",
+	.flags = 0,
+
+	{
+		fts_backend_solr_alloc,
+		fts_backend_solr_init,
+		fts_backend_solr_deinit,
+		fts_backend_solr_get_last_uid,
+		fts_backend_solr_update_init,
+		fts_backend_solr_update_deinit,
+		fts_backend_solr_update_set_mailbox,
+		fts_backend_solr_update_expunge,
+		fts_backend_solr_update_set_build_key,
+		fts_backend_solr_update_unset_build_key,
+		fts_backend_solr_update_build_more,
+		fts_backend_solr_refresh,
+		NULL,
+		fts_backend_solr_optimize,
+		fts_backend_default_can_lookup,
+		fts_backend_solr_lookup,
+		fts_backend_solr_lookup_multi,
+		NULL
+	}
+};
diff --git a/src/plugins/fts-solr/fts-backend-solr.c b/src/plugins/fts-solr/fts-backend-solr.c
new file mode 100644
index 0000000..0ac0f18
--- /dev/null
+++ b/src/plugins/fts-solr/fts-backend-solr.c
@@ -0,0 +1,984 @@
+/* Copyright (c) 2006-2018 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "array.h"
+#include "str.h"
+#include "hash.h"
+#include "strescape.h"
+#include "unichar.h"
+#include "iostream-ssl.h"
+#include "http-url.h"
+#include "mail-storage-private.h"
+#include "mailbox-list-private.h"
+#include "mail-search.h"
+#include "fts-api.h"
+#include "solr-connection.h"
+#include "fts-solr-plugin.h"
+
+#include <ctype.h>
+
+#define SOLR_CMDBUF_SIZE (1024*64)
+#define SOLR_CMDBUF_FLUSH_SIZE (SOLR_CMDBUF_SIZE-128)
+#define SOLR_MAX_MULTI_ROWS 100000
+
+/* If header is larger than this, truncate it. */
+#define SOLR_HEADER_MAX_SIZE (1024*1024)
+/* If SOLR_HEADER_MAX_SIZE was already reached, write still to individual
+   header fields as long as they're smaller than this */
+#define SOLR_HEADER_LINE_MAX_TRUNC_SIZE 1024
+
+#define SOLR_QUERY_MAX_MAILBOX_COUNT 10
+
+struct solr_fts_backend {
+	struct fts_backend backend;
+	struct solr_connection *solr_conn;
+};
+
+struct solr_fts_field {
+	char *key;
+	string_t *value;
+};
+
+struct solr_fts_backend_update_context {
+	struct fts_backend_update_context ctx;
+
+	struct mailbox *cur_box;
+	char box_guid[MAILBOX_GUID_HEX_LENGTH+1];
+
+	struct solr_connection_post *post;
+	uint32_t prev_uid;
+	string_t *cmd, *cur_value, *cur_value2;
+	string_t *cmd_expunge;
+	ARRAY(struct solr_fts_field) fields;
+
+	uint32_t last_indexed_uid;
+	unsigned int mails_since_flush;
+
+	bool tokenized_input:1;
+	bool last_indexed_uid_set:1;
+	bool body_open:1;
+	bool documents_added:1;
+	bool expunges:1;
+	bool truncate_header:1;
+};
+
+static const char *solr_escape_chars = "+-&|!(){}[]^\"~*?:\\/ ";
+
+static bool is_valid_xml_char(unichar_t chr)
+{
+	/* Valid characters in XML:
+
+	   #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] |
+	   [#x10000-#x10FFFF]
+
+	   This function gets called only for #x80 and higher */
+	if (chr > 0xd7ff && chr < 0xe000)
+		return FALSE;
+	if (chr > 0xfffd && chr < 0x10000)
+		return FALSE;
+	return chr < 0x10ffff;
+}
+
+static size_t
+xml_encode_data_max(string_t *dest, const unsigned char *data, size_t len,
+		    unsigned int max_len)
+{
+	unichar_t chr;
+	size_t i;
+
+	i_assert(max_len > 0 || len == 0);
+
+	if (max_len > len)
+		max_len = len;
+	for (i = 0; i < max_len; i++) {
+		switch (data[i]) {
+		case '&':
+			str_append(dest, "&amp;");
+			break;
+		case '<':
+			str_append(dest, "&lt;");
+			break;
+		case '>':
+			str_append(dest, "&gt;");
+			break;
+		case '\t':
+		case '\n':
+		case '\r':
+			/* exceptions to the following control char check */
+			str_append_c(dest, data[i]);
+			break;
+		default:
+			if (data[i] < 32) {
+				/* SOLR doesn't like control characters.
+				   replace them with spaces. */
+				str_append_c(dest, ' ');
+			} else if (data[i] >= 0x80) {
+				/* make sure the character is valid for XML
+				   so we don't get XML parser errors */
+				int char_len =
+					uni_utf8_get_char_n(data + i, len - i, &chr);
+				i_assert(char_len > 0); /* input is valid UTF8 */
+				if (is_valid_xml_char(chr))
+					str_append_data(dest, data + i, char_len);
+				else {
+					str_append_data(dest, utf8_replacement_char,
+							UTF8_REPLACEMENT_CHAR_LEN);
+				}
+				i += char_len - 1;
+			} else {
+				str_append_c(dest, data[i]);
+			}
+			break;
+		}
+	}
+	return i;
+}
+
+static void
+xml_encode_data(string_t *dest, const unsigned char *data, size_t len)
+{
+	(void)xml_encode_data_max(dest, data, len, len);
+}
+
+static void xml_encode(string_t *dest, const char *str)
+{
+	xml_encode_data(dest, (const unsigned char *)str, strlen(str));
+}
+
+static const char *solr_escape(const char *str)
+{
+	string_t *ret;
+	unsigned int i;
+
+	ret = t_str_new(strlen(str) + 16);
+	for (i = 0; str[i] != '\0'; i++) {
+		if (strchr(solr_escape_chars, str[i]) != NULL)
+			str_append_c(ret, '\\');
+		str_append_c(ret, str[i]);
+	}
+	return str_c(ret);
+}
+
+static void solr_quote_http(string_t *dest, const char *str)
+{
+	if (str[0] != '\0')
+		http_url_escape_param(dest, solr_escape(str));
+	else
+		str_append(dest, "%22%22");
+}
+
+static struct fts_backend *fts_backend_solr_alloc(void)
+{
+	struct solr_fts_backend *backend;
+
+	backend = i_new(struct solr_fts_backend, 1);
+	backend->backend = fts_backend_solr;
+	return &backend->backend;
+}
+
+static int
+fts_backend_solr_init(struct fts_backend *_backend, const char **error_r)
+{
+	struct solr_fts_backend *backend = (struct solr_fts_backend *)_backend;
+	struct fts_solr_user *fuser = FTS_SOLR_USER_CONTEXT(_backend->ns->user);
+	struct ssl_iostream_settings ssl_set;
+
+	if (fuser == NULL) {
+		*error_r = "Invalid fts_solr setting";
+		return -1;
+	}
+	if (fuser->set.use_libfts) {
+		/* change our flags so we get proper input */
+		_backend->flags &= ENUM_NEGATE(FTS_BACKEND_FLAG_FUZZY_SEARCH);
+		_backend->flags |= FTS_BACKEND_FLAG_TOKENIZED_INPUT;
+	}
+
+	mail_user_init_ssl_client_settings(_backend->ns->user, &ssl_set);
+	return solr_connection_init(&fuser->set, &ssl_set,
+				    _backend->ns->user->event,
+				    &backend->solr_conn, error_r);
+}
+
+static void fts_backend_solr_deinit(struct fts_backend *_backend)
+{
+	struct solr_fts_backend *backend = (struct solr_fts_backend *)_backend;
+
+	solr_connection_deinit(&backend->solr_conn);
+	i_free(backend);
+}
+
+static int
+get_last_uid_fallback(struct fts_backend *_backend, struct mailbox *box,
+		      uint32_t *last_uid_r)
+{
+	struct solr_fts_backend *backend = (struct solr_fts_backend *)_backend;
+	const struct seq_range *uidvals;
+	const char *box_guid;
+	unsigned int count;
+	struct solr_result **results;
+	string_t *str;
+	pool_t pool;
+	int ret = 0;
+
+	str = t_str_new(256);
+	str_append(str, "wt=xml&fl=uid&rows=1&sort=uid+desc&q=");
+
+	if (fts_mailbox_get_guid(box, &box_guid) < 0)
+		return -1;
+
+	str_printfa(str, "box:%s+AND+user:", box_guid);
+	if (_backend->ns->owner != NULL)
+		solr_quote_http(str, _backend->ns->owner->username);
+	else
+		str_append(str, "%22%22");
+
+	pool = pool_alloconly_create("solr last uid lookup", 1024);
+	if (solr_connection_select(backend->solr_conn, str_c(str),
+				   pool, &results) < 0)
+		ret = -1;
+	else if (results[0] == NULL) {
+		/* no UIDs */
+		*last_uid_r = 0;
+	} else {
+		uidvals = array_get(&results[0]->uids, &count);
+		i_assert(count > 0);
+		if (count == 1 && uidvals[0].seq1 == uidvals[0].seq2) {
+			*last_uid_r = uidvals[0].seq1;
+		} else {
+			i_error("fts_solr: Last UID lookup returned multiple rows");
+			ret = -1;
+		}
+	}
+	pool_unref(&pool);
+	return ret;
+}
+
+static int
+fts_backend_solr_get_last_uid(struct fts_backend *_backend,
+			      struct mailbox *box, uint32_t *last_uid_r)
+{
+	struct fts_index_header hdr;
+
+	if (fts_index_get_header(box, &hdr)) {
+		*last_uid_r = hdr.last_indexed_uid;
+		return 0;
+	}
+
+	/* either nothing has been indexed, or the index was corrupted.
+	   do it the slow way. */
+	if (get_last_uid_fallback(_backend, box, last_uid_r) < 0)
+		return -1;
+
+	fts_index_set_last_uid(box, *last_uid_r);
+	return 0;
+}
+
+static struct fts_backend_update_context *
+fts_backend_solr_update_init(struct fts_backend *_backend)
+{
+	struct solr_fts_backend_update_context *ctx;
+
+	ctx = i_new(struct solr_fts_backend_update_context, 1);
+	ctx->ctx.backend = _backend;
+	ctx->tokenized_input =
+		(_backend->flags & FTS_BACKEND_FLAG_TOKENIZED_INPUT) != 0;
+	i_array_init(&ctx->fields, 16);
+	return &ctx->ctx;
+}
+
+static void xml_encode_id(struct solr_fts_backend_update_context *ctx,
+			  string_t *str, uint32_t uid)
+{
+	str_printfa(str, "%u/%s", uid, ctx->box_guid);
+	if (ctx->ctx.backend->ns->owner != NULL) {
+		str_append_c(str, '/');
+		xml_encode(str, ctx->ctx.backend->ns->owner->username);
+	}
+}
+
+static void
+fts_backend_solr_doc_open(struct solr_fts_backend_update_context *ctx,
+			  uint32_t uid)
+{
+	ctx->documents_added = TRUE;
+
+	str_printfa(ctx->cmd, "<doc>"
+		    "<field name=\"uid\">%u</field>"
+		    "<field name=\"box\">%s</field>",
+		    uid, ctx->box_guid);
+	str_append(ctx->cmd, "<field name=\"user\">");
+	if (ctx->ctx.backend->ns->owner != NULL)
+		xml_encode(ctx->cmd, ctx->ctx.backend->ns->owner->username);
+	str_append(ctx->cmd, "</field>");
+
+	str_printfa(ctx->cmd, "<field name=\"id\">");
+	xml_encode_id(ctx, ctx->cmd, uid);
+	str_append(ctx->cmd, "</field>");
+}
+
+static string_t *
+fts_solr_field_get(struct solr_fts_backend_update_context *ctx, const char *key)
+{
+	const struct solr_fts_field *field;
+	struct solr_fts_field new_field;
+
+	/* there are only a few fields. this lookup is fast enough. */
+	array_foreach(&ctx->fields, field) {
+		if (strcasecmp(field->key, key) == 0)
+			return field->value;
+	}
+
+	i_zero(&new_field);
+	new_field.key = str_lcase(i_strdup(key));
+	new_field.value = str_new(default_pool, 128);
+	array_push_back(&ctx->fields, &new_field);
+	return new_field.value;
+}
+
+static void
+fts_backend_solr_doc_close(struct solr_fts_backend_update_context *ctx)
+{
+	struct solr_fts_field *field;
+
+	if (ctx->body_open) {
+		ctx->body_open = FALSE;
+		str_append(ctx->cmd, "</field>");
+	}
+	array_foreach_modifiable(&ctx->fields, field) {
+		str_printfa(ctx->cmd, "<field name=\"%s\">", field->key);
+		/* the values are already xml-escaped */
+		str_append_str(ctx->cmd, field->value);
+		str_append(ctx->cmd, "</field>");
+		str_truncate(field->value, 0);
+	}
+	str_append(ctx->cmd, "</doc>");
+}
+
+static int
+fts_backed_solr_build_flush(struct solr_fts_backend_update_context *ctx)
+{
+	if (ctx->post == NULL)
+		return 0;
+
+	fts_backend_solr_doc_close(ctx);
+	str_append(ctx->cmd, "</add>");
+	ctx->mails_since_flush = 0;
+
+	solr_connection_post_more(ctx->post, str_data(ctx->cmd),
+				  str_len(ctx->cmd));
+	str_truncate(ctx->cmd, 0);
+	return solr_connection_post_end(&ctx->post);
+}
+
+static void
+fts_backend_solr_expunge_flush(struct solr_fts_backend_update_context *ctx)
+{
+	struct solr_fts_backend *backend =
+		(struct solr_fts_backend *)ctx->ctx.backend;
+
+	str_append(ctx->cmd_expunge, "</delete>");
+	(void)solr_connection_post(backend->solr_conn, str_c(ctx->cmd_expunge));
+	str_truncate(ctx->cmd_expunge, 0);
+	str_append(ctx->cmd_expunge, "<delete>");
+}
+
+static int
+fts_backend_solr_update_deinit(struct fts_backend_update_context *_ctx)
+{
+	struct solr_fts_backend_update_context *ctx =
+		(struct solr_fts_backend_update_context *)_ctx;
+	struct solr_fts_backend *backend =
+		(struct solr_fts_backend *)_ctx->backend;
+	struct fts_solr_user *fuser = FTS_SOLR_USER_CONTEXT(_ctx->backend->ns->user);
+	struct solr_fts_field *field;
+	const char *str;
+	int ret = _ctx->failed ? -1 : 0;
+
+	if (fts_backed_solr_build_flush(ctx) < 0)
+		ret = -1;
+
+	if (ctx->documents_added || ctx->expunges) {
+		/* commit and wait until the documents we just indexed are
+		   visible to the following search */
+		if (ctx->expunges)
+			fts_backend_solr_expunge_flush(ctx);
+		if (fuser->set.soft_commit) {
+			str = t_strdup_printf("<commit softCommit=\"true\" waitSearcher=\"%s\"/>",
+					      ctx->documents_added ? "true" : "false");
+			if (solr_connection_post(backend->solr_conn, str) < 0)
+				ret = -1;
+		}
+	}
+
+	str_free(&ctx->cmd);
+	str_free(&ctx->cmd_expunge);
+	array_foreach_modifiable(&ctx->fields, field) {
+		str_free(&field->value);
+		i_free(field->key);
+	}
+	array_free(&ctx->fields);
+	i_free(ctx);
+	return ret;
+}
+
+static void
+fts_backend_solr_update_set_mailbox(struct fts_backend_update_context *_ctx,
+				    struct mailbox *box)
+{
+	struct solr_fts_backend_update_context *ctx =
+		(struct solr_fts_backend_update_context *)_ctx;
+	const char *box_guid;
+
+	if (ctx->prev_uid != 0) {
+		i_assert(ctx->cur_box != NULL);
+
+		/* flush solr between mailboxes, so we don't wrongly update
+		   last_uid before we know it has succeeded */
+		if (fts_backed_solr_build_flush(ctx) < 0)
+			_ctx->failed = TRUE;
+		else if (!_ctx->failed)
+			fts_index_set_last_uid(ctx->cur_box, ctx->prev_uid);
+		ctx->prev_uid = 0;
+	}
+
+	if (box != NULL) {
+		if (fts_mailbox_get_guid(box, &box_guid) < 0)
+			_ctx->failed = TRUE;
+
+		i_assert(strlen(box_guid) == sizeof(ctx->box_guid)-1);
+		memcpy(ctx->box_guid, box_guid, sizeof(ctx->box_guid)-1);
+	} else {
+		memset(ctx->box_guid, 0, sizeof(ctx->box_guid));
+	}
+	ctx->cur_box = box;
+}
+
+static void
+fts_backend_solr_update_expunge(struct fts_backend_update_context *_ctx,
+				uint32_t uid)
+{
+	struct solr_fts_backend_update_context *ctx =
+		(struct solr_fts_backend_update_context *)_ctx;
+	struct fts_index_header hdr;
+
+	if (!ctx->last_indexed_uid_set) {
+		if (!fts_index_get_header(ctx->cur_box, &hdr))
+			ctx->last_indexed_uid = 0;
+		else
+			ctx->last_indexed_uid = hdr.last_indexed_uid;
+		ctx->last_indexed_uid_set = TRUE;
+	}
+	if (ctx->last_indexed_uid == 0 ||
+	    uid > ctx->last_indexed_uid + 100) {
+		/* don't waste time asking Solr to expunge a message that is
+		   highly unlikely to be indexed at this time. */
+		return;
+	}
+	if (!ctx->expunges) {
+		ctx->expunges = TRUE;
+		ctx->cmd_expunge = str_new(default_pool, 1024);
+		str_append(ctx->cmd_expunge, "<delete>");
+	}
+
+	if (str_len(ctx->cmd_expunge) >= SOLR_CMDBUF_FLUSH_SIZE)
+		fts_backend_solr_expunge_flush(ctx);
+
+	str_append(ctx->cmd_expunge, "<id>");
+	xml_encode_id(ctx, ctx->cmd_expunge, uid);
+	str_append(ctx->cmd_expunge, "</id>");
+}
+
+static void
+fts_backend_solr_uid_changed(struct solr_fts_backend_update_context *ctx,
+			     uint32_t uid)
+{
+	struct solr_fts_backend *backend =
+		(struct solr_fts_backend *)ctx->ctx.backend;
+	struct fts_solr_user *fuser = FTS_SOLR_USER_CONTEXT(ctx->ctx.backend->ns->user);
+
+	if (ctx->mails_since_flush >= fuser->set.batch_size) {
+		if (fts_backed_solr_build_flush(ctx) < 0)
+			ctx->ctx.failed = TRUE;
+	}
+	ctx->mails_since_flush++;
+	if (ctx->post == NULL) {
+		if (ctx->cmd == NULL)
+			ctx->cmd = str_new(default_pool, SOLR_CMDBUF_SIZE);
+		ctx->post = solr_connection_post_begin(backend->solr_conn);
+		str_append(ctx->cmd, "<add>");
+	} else {
+		fts_backend_solr_doc_close(ctx);
+	}
+	ctx->prev_uid = uid;
+	ctx->truncate_header = FALSE;
+	fts_backend_solr_doc_open(ctx, uid);
+}
+
+static bool
+fts_backend_solr_update_set_build_key(struct fts_backend_update_context *_ctx,
+				      const struct fts_backend_build_key *key)
+{
+	struct solr_fts_backend_update_context *ctx =
+		(struct solr_fts_backend_update_context *)_ctx;
+
+	if (key->uid != ctx->prev_uid)
+		fts_backend_solr_uid_changed(ctx, key->uid);
+
+	switch (key->type) {
+	case FTS_BACKEND_BUILD_KEY_HDR:
+		if (fts_header_want_indexed(key->hdr_name)) {
+			ctx->cur_value2 =
+				fts_solr_field_get(ctx, key->hdr_name);
+		}
+		/* fall through */
+	case FTS_BACKEND_BUILD_KEY_MIME_HDR:
+		ctx->cur_value = fts_solr_field_get(ctx, "hdr");
+		xml_encode(ctx->cur_value, key->hdr_name);
+		str_append(ctx->cur_value, ": ");
+		break;
+	case FTS_BACKEND_BUILD_KEY_BODY_PART:
+		if (!ctx->body_open) {
+			ctx->body_open = TRUE;
+			str_append(ctx->cmd, "<field name=\"body\">");
+		}
+		ctx->cur_value = ctx->cmd;
+		break;
+	case FTS_BACKEND_BUILD_KEY_BODY_PART_BINARY:
+		i_unreached();
+	}
+	return TRUE;
+}
+
+static void
+fts_backend_solr_update_unset_build_key(struct fts_backend_update_context *_ctx)
+{
+	struct solr_fts_backend_update_context *ctx =
+		(struct solr_fts_backend_update_context *)_ctx;
+
+	/* There can be multiple duplicate keys (duplicate header lines,
+	   multiple MIME body parts). Make sure they are separated by
+	   whitespace. */
+	str_append_c(ctx->cur_value, '\n');
+	ctx->cur_value = NULL;
+	if (ctx->cur_value2 != NULL) {
+		str_append_c(ctx->cur_value2, '\n');
+		ctx->cur_value2 = NULL;
+	}
+}
+
+static int
+fts_backend_solr_update_build_more(struct fts_backend_update_context *_ctx,
+				   const unsigned char *data, size_t size)
+{
+	struct solr_fts_backend_update_context *ctx =
+		(struct solr_fts_backend_update_context *)_ctx;
+	size_t len;
+
+	if (_ctx->failed)
+		return -1;
+
+	if (ctx->cur_value2 == NULL && ctx->cur_value == ctx->cmd) {
+		/* we're writing to message body. if size is huge,
+		   flush it once in a while */
+		while (size >= SOLR_CMDBUF_FLUSH_SIZE) {
+			if (str_len(ctx->cmd) >= SOLR_CMDBUF_FLUSH_SIZE) {
+				solr_connection_post_more(ctx->post,
+							  str_data(ctx->cmd),
+							  str_len(ctx->cmd));
+				str_truncate(ctx->cmd, 0);
+			}
+			len = xml_encode_data_max(ctx->cmd, data, size,
+						  SOLR_CMDBUF_FLUSH_SIZE -
+						  str_len(ctx->cmd));
+			i_assert(len > 0);
+			i_assert(len <= size);
+			data += len;
+			size -= len;
+		}
+		xml_encode_data(ctx->cmd, data, size);
+		if (ctx->tokenized_input)
+			str_append_c(ctx->cmd, ' ');
+	} else {
+		if (!ctx->truncate_header) {
+			xml_encode_data(ctx->cur_value, data, size);
+			if (ctx->tokenized_input)
+				str_append_c(ctx->cur_value, ' ');
+		}
+		if (ctx->cur_value2 != NULL &&
+		    (!ctx->truncate_header ||
+		     str_len(ctx->cur_value2) < SOLR_HEADER_LINE_MAX_TRUNC_SIZE)) {
+			xml_encode_data(ctx->cur_value2, data, size);
+			if (ctx->tokenized_input)
+				str_append_c(ctx->cur_value2, ' ');
+		}
+	}
+
+	if (str_len(ctx->cmd) >= SOLR_CMDBUF_FLUSH_SIZE) {
+		solr_connection_post_more(ctx->post, str_data(ctx->cmd),
+					  str_len(ctx->cmd));
+		str_truncate(ctx->cmd, 0);
+	}
+	if (!ctx->truncate_header &&
+	    str_len(ctx->cur_value) >= SOLR_HEADER_MAX_SIZE) {
+		/* a large header */
+		i_assert(ctx->cur_value != ctx->cmd);
+
+		i_warning("fts-solr(%s): Mailbox %s UID=%u header size is huge, truncating",
+			  ctx->cur_box->storage->user->username,
+			  mailbox_get_vname(ctx->cur_box), ctx->prev_uid);
+		ctx->truncate_header = TRUE;
+	}
+	return 0;
+}
+
+static int fts_backend_solr_refresh(struct fts_backend *backend ATTR_UNUSED)
+{
+	return 0;
+}
+
+static int fts_backend_solr_rescan(struct fts_backend *backend)
+{
+	/* FIXME: proper rescan needed. for now we'll just reset the
+	   last-uids */
+	return fts_backend_reset_last_uids(backend);
+}
+
+static int fts_backend_solr_optimize(struct fts_backend *backend ATTR_UNUSED)
+{
+	return 0;
+}
+
+static bool solr_need_escaping(const char *str)
+{
+	for (; *str != '\0'; str++) {
+		if (strchr(solr_escape_chars, *str) != NULL)
+			return TRUE;
+	}
+	return FALSE;
+}
+
+static void solr_add_str_arg(string_t *str, struct mail_search_arg *arg)
+{
+	/* currently we'll just disable fuzzy searching if there are any
+	   parameters that need escaping. solr doesn't seem to give good
+	   fuzzy results even if we did escape them.. */
+	if (!arg->fuzzy || arg->value.str[0] == '\0' ||
+	    solr_need_escaping(arg->value.str))
+		solr_quote_http(str, arg->value.str);
+	else {
+		http_url_escape_param(str, arg->value.str);
+		str_append_c(str, '~');
+	}
+}
+
+static bool
+solr_add_definite_query(string_t *str, struct mail_search_arg *arg)
+{
+	if (arg->no_fts)
+		return FALSE;
+	switch (arg->type) {
+	case SEARCH_TEXT: {
+		if (arg->match_not)
+			str_append_c(str, '-');
+		str_append(str, "(hdr:");
+		solr_add_str_arg(str, arg);
+		str_append(str, "+OR+body:");
+		solr_add_str_arg(str, arg);
+		str_append(str, ")");
+		break;
+	}
+	case SEARCH_BODY:
+		if (arg->match_not)
+			str_append_c(str, '-');
+		str_append(str, "body:");
+		solr_add_str_arg(str, arg);
+		break;
+	case SEARCH_HEADER:
+	case SEARCH_HEADER_ADDRESS:
+	case SEARCH_HEADER_COMPRESS_LWSP:
+		if (!fts_header_want_indexed(arg->hdr_field_name))
+			return FALSE;
+
+		if (arg->match_not)
+			str_append_c(str, '-');
+		str_append(str, t_str_lcase(arg->hdr_field_name));
+		str_append_c(str, ':');
+		solr_add_str_arg(str, arg);
+		break;
+	default:
+		return FALSE;
+	}
+	return TRUE;
+}
+
+static bool
+solr_add_definite_query_args(string_t *str, struct mail_search_arg *arg,
+			     bool and_args)
+{
+	size_t last_len;
+
+	last_len = str_len(str);
+	for (; arg != NULL; arg = arg->next) {
+		if (solr_add_definite_query(str, arg)) {
+			arg->match_always = TRUE;
+			last_len = str_len(str);
+			if (and_args)
+				str_append(str, "+AND+");
+			else
+				str_append(str, "+OR+");
+		}
+	}
+	if (str_len(str) == last_len)
+		return FALSE;
+
+	str_truncate(str, last_len);
+	return TRUE;
+}
+
+static bool
+solr_add_maybe_query(string_t *str, struct mail_search_arg *arg)
+{
+	if (arg->no_fts)
+		return FALSE;
+	switch (arg->type) {
+	case SEARCH_HEADER:
+	case SEARCH_HEADER_ADDRESS:
+	case SEARCH_HEADER_COMPRESS_LWSP:
+		if (fts_header_want_indexed(arg->hdr_field_name))
+			return FALSE;
+		if (arg->match_not) {
+			/* all matches would be definite, but all non-matches
+			   would be maybies. too much trouble to optimize. */
+			return FALSE;
+		}
+
+		/* we can check if the search key exists in some header and
+		   filter out the messages that have no chance of matching */
+		str_append(str, "hdr:");
+		if (*arg->value.str != '\0')
+			solr_quote_http(str, arg->value.str);
+		else {
+			/* checking potential existence of the header name */
+			solr_quote_http(str, t_str_lcase(arg->hdr_field_name));
+		}
+		break;
+	default:
+		return FALSE;
+	}
+	return TRUE;
+}
+
+static bool
+solr_add_maybe_query_args(string_t *str, struct mail_search_arg *arg,
+			  bool and_args)
+{
+	size_t last_len;
+
+	last_len = str_len(str);
+	for (; arg != NULL; arg = arg->next) {
+		if (solr_add_maybe_query(str, arg)) {
+			arg->match_always = TRUE;
+			last_len = str_len(str);
+			if (and_args)
+				str_append(str, "+AND+");
+			else
+				str_append(str, "+OR+");
+		}
+	}
+	if (str_len(str) == last_len)
+		return FALSE;
+
+	str_truncate(str, last_len);
+	return TRUE;
+}
+
+static int solr_search(struct fts_backend *_backend, string_t *str,
+		       const char *box_guid, ARRAY_TYPE(seq_range) *uids_r,
+		       ARRAY_TYPE(fts_score_map) *scores_r)
+{
+	struct solr_fts_backend *backend = (struct solr_fts_backend *)_backend;
+	pool_t pool = pool_alloconly_create("fts solr search", 1024);
+	struct solr_result **results;
+	int ret;
+
+	/* use a separate filter query for selecting the mailbox. it shouldn't
+	   affect the score and there could be some caching benefits too. */
+	str_printfa(str, "&fq=%%2Bbox:%s+%%2Buser:", box_guid);
+	if (_backend->ns->owner != NULL)
+		solr_quote_http(str, _backend->ns->owner->username);
+	else
+		str_append(str, "%22%22");
+
+	ret = solr_connection_select(backend->solr_conn, str_c(str),
+				     pool, &results);
+	if (ret == 0 && results[0] != NULL) {
+		array_append_array(uids_r, &results[0]->uids);
+		array_append_array(scores_r, &results[0]->scores);
+	}
+	pool_unref(&pool);
+	return ret;
+}
+
+static int
+fts_backend_solr_lookup(struct fts_backend *_backend, struct mailbox *box,
+			struct mail_search_arg *args,
+			enum fts_lookup_flags flags,
+			struct fts_result *result)
+{
+	bool and_args = (flags & FTS_LOOKUP_FLAG_AND_ARGS) != 0;
+	struct mailbox_status status;
+	string_t *str;
+	const char *box_guid;
+	size_t prefix_len;
+
+	if (fts_mailbox_get_guid(box, &box_guid) < 0)
+		return -1;
+	mailbox_get_open_status(box, STATUS_UIDNEXT, &status);
+
+	str = t_str_new(256);
+	str_printfa(str, "wt=xml&fl=uid,score&rows=%u&sort=uid+asc&q=%%7b!lucene+q.op%%3dAND%%7d",
+		    status.uidnext);
+	prefix_len = str_len(str);
+
+	if (solr_add_definite_query_args(str, args, and_args)) {
+		ARRAY_TYPE(seq_range) *uids_arr =
+			(flags & FTS_LOOKUP_FLAG_NO_AUTO_FUZZY) == 0 ?
+			&result->definite_uids : &result->maybe_uids;
+		if (solr_search(_backend, str, box_guid,
+				uids_arr, &result->scores) < 0)
+			return -1;
+	}
+	str_truncate(str, prefix_len);
+	if (solr_add_maybe_query_args(str, args, and_args)) {
+		if (solr_search(_backend, str, box_guid,
+				&result->maybe_uids, &result->scores) < 0)
+			return -1;
+	}               
+	result->scores_sorted = TRUE;
+	return 0;
+}
+
+static int
+solr_search_multi(struct fts_backend *_backend, string_t *str,
+		  struct mailbox *const boxes[], enum fts_lookup_flags flags,
+		  struct fts_multi_result *result)
+{
+	struct solr_fts_backend *backend = (struct solr_fts_backend *)_backend;
+	struct solr_result **solr_results;
+	struct fts_result *fts_result;
+	ARRAY(struct fts_result) fts_results;
+	HASH_TABLE(char *, struct mailbox *) mailboxes;
+	struct mailbox *box;
+	const char *box_guid;
+	unsigned int i;
+	size_t len;
+	bool search_all_mailboxes;
+
+	/* use a separate filter query for selecting the mailbox. it shouldn't
+	   affect the score and there could be some caching benefits too. */
+	str_append(str, "&fq=%2Buser:");
+	if (_backend->ns->owner != NULL)
+		solr_quote_http(str, _backend->ns->owner->username);
+	else
+		str_append(str, "%22%22");
+
+	hash_table_create(&mailboxes, default_pool, 0, str_hash, strcmp);
+	for (i = 0; boxes[i] != NULL; i++) ;
+	search_all_mailboxes = i > SOLR_QUERY_MAX_MAILBOX_COUNT;
+	if (!search_all_mailboxes)
+		str_append(str, "+%2B(");
+	len = str_len(str);
+
+	for (i = 0; boxes[i] != NULL; i++) {
+		if (fts_mailbox_get_guid(boxes[i], &box_guid) < 0)
+			continue;
+
+		if (!search_all_mailboxes) {
+			if (str_len(str) != len)
+				str_append(str, "+OR+");
+			str_printfa(str, "box:%s", box_guid);
+		}
+		hash_table_insert(mailboxes, t_strdup_noconst(box_guid),
+				  boxes[i]);
+	}
+	if (!search_all_mailboxes)
+		str_append_c(str, ')');
+
+	if (solr_connection_select(backend->solr_conn, str_c(str),
+				   result->pool, &solr_results) < 0) {
+		hash_table_destroy(&mailboxes);
+		return -1;
+	}
+
+	p_array_init(&fts_results, result->pool, 32);
+	for (i = 0; solr_results[i] != NULL; i++) {
+		box = hash_table_lookup(mailboxes, solr_results[i]->box_id);
+		if (box == NULL) {
+			if (!search_all_mailboxes) {
+				i_warning("fts_solr: Lookup returned unexpected mailbox "
+					  "with guid=%s", solr_results[i]->box_id);
+			}
+			continue;
+		}
+		fts_result = array_append_space(&fts_results);
+		fts_result->box = box;
+		if ((flags & FTS_LOOKUP_FLAG_NO_AUTO_FUZZY) == 0)
+			fts_result->definite_uids = solr_results[i]->uids;
+		else
+			fts_result->maybe_uids = solr_results[i]->uids;
+		fts_result->scores = solr_results[i]->scores;
+		fts_result->scores_sorted = TRUE;
+	}
+	array_append_zero(&fts_results);
+	result->box_results = array_front_modifiable(&fts_results);
+	hash_table_destroy(&mailboxes);
+	return 0;
+}
+
+static int
+fts_backend_solr_lookup_multi(struct fts_backend *backend,
+			      struct mailbox *const boxes[],
+			      struct mail_search_arg *args,
+			      enum fts_lookup_flags flags,
+			      struct fts_multi_result *result)
+{
+	bool and_args = (flags & FTS_LOOKUP_FLAG_AND_ARGS) != 0;
+	string_t *str;
+
+	str = t_str_new(256);
+	str_printfa(str, "wt=xml&fl=box,uid,score&rows=%u&sort=box+asc,uid+asc&q=%%7b!lucene+q.op%%3dAND%%7d",
+		    SOLR_MAX_MULTI_ROWS);
+
+	if (solr_add_definite_query_args(str, args, and_args)) {
+		if (solr_search_multi(backend, str, boxes, flags, result) < 0)
+			return -1;
+	}
+	/* FIXME: maybe_uids could be handled also with some more work.. */
+	return 0;
+}
+
+struct fts_backend fts_backend_solr = {
+	.name = "solr",
+	.flags = FTS_BACKEND_FLAG_FUZZY_SEARCH,
+
+	{
+		fts_backend_solr_alloc,
+		fts_backend_solr_init,
+		fts_backend_solr_deinit,
+		fts_backend_solr_get_last_uid,
+		fts_backend_solr_update_init,
+		fts_backend_solr_update_deinit,
+		fts_backend_solr_update_set_mailbox,
+		fts_backend_solr_update_expunge,
+		fts_backend_solr_update_set_build_key,
+		fts_backend_solr_update_unset_build_key,
+		fts_backend_solr_update_build_more,
+		fts_backend_solr_refresh,
+		fts_backend_solr_rescan,
+		fts_backend_solr_optimize,
+		fts_backend_default_can_lookup,
+		fts_backend_solr_lookup,
+		fts_backend_solr_lookup_multi,
+		NULL
+	}
+};
diff --git a/src/plugins/fts-solr/fts-solr-plugin.c b/src/plugins/fts-solr/fts-solr-plugin.c
new file mode 100644
index 0000000..5899784
--- /dev/null
+++ b/src/plugins/fts-solr/fts-solr-plugin.c
@@ -0,0 +1,131 @@
+/* Copyright (c) 2006-2018 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "array.h"
+#include "http-client.h"
+#include "mail-user.h"
+#include "mail-storage-hooks.h"
+#include "solr-connection.h"
+#include "fts-user.h"
+#include "fts-solr-plugin.h"
+
+#define DEFAULT_SOLR_BATCH_SIZE 1000
+
+const char *fts_solr_plugin_version = DOVECOT_ABI_VERSION;
+struct http_client *solr_http_client = NULL;
+
+struct fts_solr_user_module fts_solr_user_module =
+	MODULE_CONTEXT_INIT(&mail_user_module_register);
+
+static int
+fts_solr_plugin_init_settings(struct mail_user *user,
+			      struct fts_solr_settings *set, const char *str)
+{
+	const char *const *tmp;
+
+	if (str == NULL)
+		str = "";
+
+	set->batch_size = DEFAULT_SOLR_BATCH_SIZE;
+	set->soft_commit = TRUE;
+
+	for (tmp = t_strsplit_spaces(str, " "); *tmp != NULL; tmp++) {
+		if (str_begins(*tmp, "url=")) {
+			set->url = p_strdup(user->pool, *tmp + 4);
+		} else if (strcmp(*tmp, "debug") == 0) {
+			set->debug = TRUE;
+		} else if (strcmp(*tmp, "use_libfts") == 0) {
+			set->use_libfts = TRUE;
+		} else if (str_begins(*tmp, "default_ns=")) {
+			set->default_ns_prefix =
+				p_strdup(user->pool, *tmp + 11);
+		} else if (str_begins(*tmp, "rawlog_dir=")) {
+			set->rawlog_dir = p_strdup(user->pool, *tmp + 11);
+		} else if (str_begins(*tmp, "batch_size=")) {
+			if (str_to_uint(*tmp+11, &set->batch_size) < 0 ||
+			    set->batch_size == 0) {
+				i_error("fts_solr: batch_size must be a positive integer");
+					return -1;
+			}
+		} else if (str_begins(*tmp, "soft_commit=")) {
+			if (strcmp(*tmp + 12, "yes") == 0) {
+				set->soft_commit = TRUE;
+			} else if (strcmp(*tmp + 12, "no") == 0) {
+				set->soft_commit = FALSE;
+			} else {
+				i_error("fts_solr: Invalid setting for soft_commit: %s", *tmp+12);
+				return -1;
+			}
+		} else {
+			i_error("fts_solr: Invalid setting: %s", *tmp);
+			return -1;
+		}
+	}
+	if (set->url == NULL) {
+		i_error("fts_solr: url setting missing");
+		return -1;
+	}
+	return 0;
+}
+
+static void fts_solr_mail_user_deinit(struct mail_user *user)
+{
+	struct fts_solr_user *fuser = FTS_SOLR_USER_CONTEXT_REQUIRE(user);
+
+	fts_mail_user_deinit(user);
+	fuser->module_ctx.super.deinit(user);
+}
+
+static void fts_solr_mail_user_create(struct mail_user *user, const char *env)
+{
+	struct mail_user_vfuncs *v = user->vlast;
+	struct fts_solr_user *fuser;
+	const char *error;
+
+	fuser = p_new(user->pool, struct fts_solr_user, 1);
+	if (fts_solr_plugin_init_settings(user, &fuser->set, env) < 0) {
+		/* invalid settings, disabling */
+		return;
+	}
+	if (fts_mail_user_init(user, fuser->set.use_libfts, &error) < 0) {
+		i_error("fts-solr: %s", error);
+		return;
+	}
+
+	fuser->module_ctx.super = *v;
+	user->vlast = &fuser->module_ctx.super;
+	v->deinit = fts_solr_mail_user_deinit;
+	MODULE_CONTEXT_SET(user, fts_solr_user_module, fuser);
+}
+
+static void fts_solr_mail_user_created(struct mail_user *user)
+{
+	const char *env;
+
+	env = mail_user_plugin_getenv(user, "fts_solr");
+	if (env != NULL)
+		fts_solr_mail_user_create(user, env);
+}
+
+static struct mail_storage_hooks fts_solr_mail_storage_hooks = {
+	.mail_user_created = fts_solr_mail_user_created
+};
+
+void fts_solr_plugin_init(struct module *module)
+{
+	fts_backend_register(&fts_backend_solr);
+	fts_backend_register(&fts_backend_solr_old);
+	mail_storage_hooks_add(module, &fts_solr_mail_storage_hooks);
+}
+
+void fts_solr_plugin_deinit(void)
+{
+	fts_backend_unregister(fts_backend_solr.name);
+	fts_backend_unregister(fts_backend_solr_old.name);
+	mail_storage_hooks_remove(&fts_solr_mail_storage_hooks);
+	if (solr_http_client != NULL)
+		http_client_deinit(&solr_http_client);
+
+}
+
+const char *fts_solr_plugin_dependencies[] = { "fts", NULL };
diff --git a/src/plugins/fts-solr/fts-solr-plugin.h b/src/plugins/fts-solr/fts-solr-plugin.h
new file mode 100644
index 0000000..abc1b66
--- /dev/null
+++ b/src/plugins/fts-solr/fts-solr-plugin.h
@@ -0,0 +1,35 @@
+#ifndef FTS_SOLR_PLUGIN_H
+#define FTS_SOLR_PLUGIN_H
+
+#include "module-context.h"
+#include "mail-user.h"
+#include "fts-api-private.h"
+
+#define FTS_SOLR_USER_CONTEXT(obj) \
+	MODULE_CONTEXT(obj, fts_solr_user_module)
+#define FTS_SOLR_USER_CONTEXT_REQUIRE(obj) \
+	MODULE_CONTEXT_REQUIRE(obj, fts_solr_user_module)
+
+struct fts_solr_settings {
+	const char *url, *default_ns_prefix, *rawlog_dir;
+	unsigned int batch_size;
+	bool use_libfts;
+	bool debug;
+	bool soft_commit;
+};
+
+struct fts_solr_user {
+	union mail_user_module_context module_ctx;
+	struct fts_solr_settings set;
+};
+
+extern const char *fts_solr_plugin_dependencies[];
+extern struct fts_backend fts_backend_solr;
+extern struct fts_backend fts_backend_solr_old;
+extern MODULE_CONTEXT_DEFINE(fts_solr_user_module, &mail_user_module_register);
+extern struct http_client *solr_http_client;
+
+void fts_solr_plugin_init(struct module *module);
+void fts_solr_plugin_deinit(void);
+
+#endif
diff --git a/src/plugins/fts-solr/solr-connection.c b/src/plugins/fts-solr/solr-connection.c
new file mode 100644
index 0000000..41a4fee
--- /dev/null
+++ b/src/plugins/fts-solr/solr-connection.c
@@ -0,0 +1,327 @@
+/* Copyright (c) 2006-2018 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "array.h"
+#include "hash.h"
+#include "str.h"
+#include "strescape.h"
+#include "ioloop.h"
+#include "istream.h"
+#include "http-url.h"
+#include "http-client.h"
+#include "fts-solr-plugin.h"
+#include "solr-connection.h"
+
+#include <expat.h>
+
+struct solr_lookup_context {
+	pool_t result_pool;
+	struct istream *payload;
+	struct io *io;
+
+	int request_status;
+
+	struct solr_response_parser *parser;
+	struct solr_result **results;
+};
+
+struct solr_connection_post {
+	struct solr_connection *conn;
+
+	struct http_client_request *http_req;
+	int request_status;
+
+	bool failed:1;
+};
+
+struct solr_connection {
+	struct event *event;
+	char *http_host;
+	in_port_t http_port;
+	char *http_base_url;
+	char *http_failure;
+	char *http_user;
+	char *http_password;
+
+	bool debug:1;
+	bool posting:1;
+	bool http_ssl:1;
+};
+
+/* Regardless of the specified URL, make sure path ends in '/' */
+static char *solr_connection_create_http_base_url(struct http_url *http_url)
+{
+	if (http_url->path == NULL)
+		return i_strconcat("/", http_url->enc_query, NULL);
+	size_t len = strlen(http_url->path);
+	if (len > 0 && http_url->path[len-1] != '/')
+		return i_strconcat(http_url->path, "/",
+				   http_url->enc_query, NULL);
+	/* http_url->path is NULL on empty path, so this is impossible. */
+	i_assert(len != 0);
+	return i_strconcat(http_url->path, http_url->enc_query, NULL);
+}
+
+int solr_connection_init(const struct fts_solr_settings *solr_set,
+			 const struct ssl_iostream_settings *ssl_client_set,
+			 struct event *event_parent,
+			 struct solr_connection **conn_r, const char **error_r)
+{
+	struct http_client_settings http_set;
+	struct solr_connection *conn;
+	struct http_url *http_url;
+	const char *error;
+
+	if (http_url_parse(solr_set->url, NULL, HTTP_URL_ALLOW_USERINFO_PART,
+			   pool_datastack_create(), &http_url, &error) < 0) {
+		*error_r = t_strdup_printf(
+			"fts_solr: Failed to parse HTTP url: %s", error);
+		return -1;
+	}
+
+	conn = i_new(struct solr_connection, 1);
+	conn->event = event_create(event_parent);
+	conn->http_host = i_strdup(http_url->host.name);
+	conn->http_port = http_url->port;
+	conn->http_base_url = solr_connection_create_http_base_url(http_url);
+	conn->http_ssl = http_url->have_ssl;
+	if (http_url->user != NULL) {
+		conn->http_user = i_strdup(http_url->user);
+		/* allow empty password */
+		conn->http_password = i_strdup(http_url->password != NULL ?
+					       http_url->password : "");
+	}
+
+	conn->debug = solr_set->debug;
+
+	if (solr_http_client == NULL) {
+		i_zero(&http_set);
+		http_set.max_idle_time_msecs = 5*1000;
+		http_set.max_parallel_connections = 1;
+		http_set.max_pipelined_requests = 1;
+		http_set.max_redirects = 1;
+		http_set.max_attempts = 3;
+		http_set.connect_timeout_msecs = 5*1000;
+		http_set.request_timeout_msecs = 60*1000;
+		http_set.ssl = ssl_client_set;
+		http_set.debug = solr_set->debug;
+		http_set.rawlog_dir = solr_set->rawlog_dir;
+		http_set.event_parent = conn->event;
+
+		/* FIXME: We should initialize a shared client instead. However,
+		          this is currently not possible due to an obscure bug
+		          in the blocking HTTP payload API, which causes
+		          conflicts with other HTTP applications like FTS Tika.
+		          Using a private client will provide a quick fix for
+		          now. */
+		solr_http_client = http_client_init_private(&http_set);
+	}
+
+	*conn_r = conn;
+	return 0;
+}
+
+void solr_connection_deinit(struct solr_connection **_conn)
+{
+	struct solr_connection *conn = *_conn;
+
+	*_conn = NULL;
+	event_unref(&conn->event);
+	i_free(conn->http_host);
+	i_free(conn->http_base_url);
+	i_free(conn->http_user);
+	i_free(conn->http_password);
+	i_free(conn);
+}
+
+static void solr_connection_payload_input(struct solr_lookup_context *lctx)
+{
+	int ret;
+
+	/* read payload */
+	ret = solr_response_parse(lctx->parser, &lctx->results);
+
+	if (ret == 0) {
+		/* we will be called again for more data */
+	} else {
+		if (lctx->payload->stream_errno != 0) {
+			i_assert(ret < 0);
+			i_error("fts_solr: "
+				"failed to read payload from HTTP server: %s",
+				i_stream_get_error(lctx->payload));
+		}
+		if (ret < 0)
+			lctx->request_status = -1;
+		solr_response_parser_deinit(&lctx->parser);
+		io_remove(&lctx->io);
+	}
+}
+
+static void
+solr_connection_select_response(const struct http_response *response,
+				struct solr_lookup_context *lctx)
+{
+	if (response->status / 100 != 2) {
+		i_error("fts_solr: Lookup failed: %s",
+			http_response_get_message(response));
+		lctx->request_status = -1;
+		return;
+	}
+
+	if (response->payload == NULL) {
+		i_error("fts_solr: Lookup failed: Empty response payload");
+		lctx->request_status = -1;
+		return;
+	}
+
+	lctx->parser = solr_response_parser_init(lctx->result_pool,
+						 response->payload);
+	lctx->payload = response->payload;
+	lctx->io = io_add_istream(response->payload,
+				  solr_connection_payload_input, lctx);
+	solr_connection_payload_input(lctx);
+}
+
+int solr_connection_select(struct solr_connection *conn, const char *query,
+			   pool_t pool, struct solr_result ***box_results_r)
+{
+	struct solr_lookup_context lctx;
+	struct http_client_request *http_req;
+	const char *url;
+
+	i_zero(&lctx);
+	lctx.result_pool = pool;
+
+	i_free_and_null(conn->http_failure);
+	url = t_strconcat(conn->http_base_url, "select?", query, NULL);
+
+	http_req = http_client_request(solr_http_client, "GET",
+				       conn->http_host, url,
+				       solr_connection_select_response,
+				       &lctx);
+	if (conn->http_user != NULL) {
+		http_client_request_set_auth_simple(
+			http_req, conn->http_user, conn->http_password);
+	}
+	http_client_request_set_port(http_req, conn->http_port);
+	http_client_request_set_ssl(http_req, conn->http_ssl);
+	http_client_request_submit(http_req);
+
+	lctx.request_status = 0;
+	http_client_wait(solr_http_client);
+
+	if (lctx.request_status < 0)
+		return -1;
+
+	*box_results_r = lctx.results;
+	return 0;
+}
+
+static void
+solr_connection_update_response(const struct http_response *response,
+				struct solr_connection_post *post)
+{
+	if (response->status / 100 != 2) {
+		i_error("fts_solr: Indexing failed: %s",
+			http_response_get_message(response));
+		post->request_status = -1;
+	}
+}
+
+static struct http_client_request *
+solr_connection_post_request(struct solr_connection_post *post)
+{
+	struct solr_connection *conn = post->conn;
+	struct http_client_request *http_req;
+	const char *url;
+
+	url = t_strconcat(conn->http_base_url, "update", NULL);
+
+	http_req = http_client_request(solr_http_client, "POST",
+				       conn->http_host, url,
+				       solr_connection_update_response, post);
+	if (conn->http_user != NULL) {
+		http_client_request_set_auth_simple(
+			http_req, conn->http_user, conn->http_password);
+	}
+	http_client_request_set_port(http_req, conn->http_port);
+	http_client_request_set_ssl(http_req, conn->http_ssl);
+	http_client_request_add_header(http_req, "Content-Type", "text/xml");
+	return http_req;
+}
+
+struct solr_connection_post *
+solr_connection_post_begin(struct solr_connection *conn)
+{
+	struct solr_connection_post *post;
+
+	i_assert(!conn->posting);
+	conn->posting = TRUE;
+
+	post = i_new(struct solr_connection_post, 1);
+	post->conn = conn;
+	post->http_req = solr_connection_post_request(post);
+	return post;
+}
+
+void solr_connection_post_more(struct solr_connection_post *post,
+			       const unsigned char *data, size_t size)
+{
+	i_assert(post->conn->posting);
+
+	if (post->failed)
+		return;
+
+	if (post->request_status == 0) {
+		(void)http_client_request_send_payload(
+			&post->http_req, data, size);
+	}
+	if (post->request_status < 0)
+		post->failed = TRUE;
+}
+
+int solr_connection_post_end(struct solr_connection_post **_post)
+{
+	struct solr_connection_post *post = *_post;
+	struct solr_connection *conn = post->conn;
+	int ret = post->failed ? -1 : 0;
+
+	i_assert(conn->posting);
+
+	*_post = NULL;
+
+	if (!post->failed) {
+		if (http_client_request_finish_payload(&post->http_req) < 0 ||
+		    post->request_status < 0) {
+			ret = -1;
+		}
+	} else {
+		http_client_request_abort(&post->http_req);
+	}
+	i_free(post);
+
+	conn->posting = FALSE;
+	return ret;
+}
+
+int solr_connection_post(struct solr_connection *conn, const char *cmd)
+{
+	struct istream *post_payload;
+	struct solr_connection_post post;
+
+	i_assert(!conn->posting);
+
+	i_zero(&post);
+	post.conn = conn;
+
+	post.http_req = solr_connection_post_request(&post);
+	post_payload = i_stream_create_from_data(cmd, strlen(cmd));
+	http_client_request_set_payload(post.http_req, post_payload, TRUE);
+	i_stream_unref(&post_payload);
+	http_client_request_submit(post.http_req);
+
+	post.request_status = 0;
+	http_client_wait(solr_http_client);
+
+	return post.request_status;
+}
diff --git a/src/plugins/fts-solr/solr-connection.h b/src/plugins/fts-solr/solr-connection.h
new file mode 100644
index 0000000..ebad8be
--- /dev/null
+++ b/src/plugins/fts-solr/solr-connection.h
@@ -0,0 +1,26 @@
+#ifndef SOLR_CONNECTION_H
+#define SOLR_CONNECTION_H
+
+#include "solr-response.h"
+
+struct solr_connection;
+struct fts_solr_settings;
+
+int solr_connection_init(const struct fts_solr_settings *solr_set,
+			 const struct ssl_iostream_settings *ssl_client_set,
+			 struct event *event_parent,
+			 struct solr_connection **conn_r,
+			 const char **error_r);
+void solr_connection_deinit(struct solr_connection **conn);
+
+int solr_connection_select(struct solr_connection *conn, const char *query,
+			   pool_t pool, struct solr_result ***box_results_r);
+int solr_connection_post(struct solr_connection *conn, const char *cmd);
+
+struct solr_connection_post *
+solr_connection_post_begin(struct solr_connection *conn);
+void solr_connection_post_more(struct solr_connection_post *post,
+			       const unsigned char *data, size_t size);
+int solr_connection_post_end(struct solr_connection_post **post);
+
+#endif
diff --git a/src/plugins/fts-solr/solr-response.c b/src/plugins/fts-solr/solr-response.c
new file mode 100644
index 0000000..65a6a1f
--- /dev/null
+++ b/src/plugins/fts-solr/solr-response.c
@@ -0,0 +1,372 @@
+/* Copyright (c) 2006-2018 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "array.h"
+#include "hash.h"
+#include "str.h"
+#include "istream.h"
+#include "solr-response.h"
+
+#include <expat.h>
+
+#define MAX_VALUE_LEN 2048
+
+enum solr_xml_response_state {
+	SOLR_XML_RESPONSE_STATE_ROOT,
+	SOLR_XML_RESPONSE_STATE_RESPONSE,
+	SOLR_XML_RESPONSE_STATE_RESULT,
+	SOLR_XML_RESPONSE_STATE_DOC,
+	SOLR_XML_RESPONSE_STATE_CONTENT
+};
+
+enum solr_xml_content_state {
+	SOLR_XML_CONTENT_STATE_NONE = 0,
+	SOLR_XML_CONTENT_STATE_UID,
+	SOLR_XML_CONTENT_STATE_SCORE,
+	SOLR_XML_CONTENT_STATE_MAILBOX,
+	SOLR_XML_CONTENT_STATE_NAMESPACE,
+	SOLR_XML_CONTENT_STATE_UIDVALIDITY,
+	SOLR_XML_CONTENT_STATE_ERROR
+};
+
+struct solr_response_parser {
+	XML_Parser xml_parser;
+	struct istream *input;
+
+	enum solr_xml_response_state state;
+	enum solr_xml_content_state content_state;
+	int depth;
+	string_t *buffer;
+
+	uint32_t uid, uidvalidity;
+	float score;
+	char *mailbox, *ns;
+
+	pool_t result_pool;
+	/* box_id -> solr_result */
+	HASH_TABLE(char *, struct solr_result *) mailboxes;
+	ARRAY(struct solr_result *) results;
+
+	bool xml_failed:1;
+};
+
+static int
+solr_xml_parse(struct solr_response_parser *parser,
+	       const void *data, size_t size, bool done)
+{
+	enum XML_Error err;
+	int line, col;
+
+	if (parser->xml_failed)
+		return -1;
+
+	if (XML_Parse(parser->xml_parser, data, size, done ? 1 : 0) != 0)
+		return 0;
+
+	err = XML_GetErrorCode(parser->xml_parser);
+	if (err != XML_ERROR_FINISHED) {
+		line = XML_GetCurrentLineNumber(parser->xml_parser);
+		col = XML_GetCurrentColumnNumber(parser->xml_parser);
+		i_error("fts_solr: Invalid XML input at %d:%d: %s "
+			"(near: %.*s)", line, col, XML_ErrorString(err),
+			(int)I_MIN(size, 128), (const char *)data);
+		parser->xml_failed = TRUE;
+		return -1;
+	}
+	return 0;
+}
+
+static const char *attrs_get_name(const char **attrs)
+{
+	for (; *attrs != NULL; attrs += 2) {
+		if (strcmp(attrs[0], "name") == 0)
+			return attrs[1];
+	}
+	return "";
+}
+
+static void
+solr_lookup_xml_start(void *context, const char *name, const char **attrs)
+{
+	struct solr_response_parser *parser = context;
+	const char *name_attr;
+
+	i_assert(parser->depth >= (int)parser->state);
+
+	parser->depth++;
+	if (parser->depth - 1 > (int)parser->state) {
+		/* skipping over unwanted elements */
+		return;
+	}
+
+	str_truncate(parser->buffer, 0);
+
+	/* response -> result -> doc */
+	switch (parser->state) {
+	case SOLR_XML_RESPONSE_STATE_ROOT:
+		if (strcmp(name, "response") == 0)
+			parser->state++;
+		break;
+	case SOLR_XML_RESPONSE_STATE_RESPONSE:
+		if (strcmp(name, "result") == 0)
+			parser->state++;
+		break;
+	case SOLR_XML_RESPONSE_STATE_RESULT:
+		if (strcmp(name, "doc") == 0) {
+			parser->state++;
+			parser->uid = 0;
+			parser->score = 0;
+			i_free_and_null(parser->mailbox);
+			i_free_and_null(parser->ns);
+			parser->uidvalidity = 0;
+		}
+		break;
+	case SOLR_XML_RESPONSE_STATE_DOC:
+		name_attr = attrs_get_name(attrs);
+		if (strcmp(name_attr, "uid") == 0)
+			parser->content_state = SOLR_XML_CONTENT_STATE_UID;
+		else if (strcmp(name_attr, "score") == 0)
+			parser->content_state = SOLR_XML_CONTENT_STATE_SCORE;
+		else if (strcmp(name_attr, "box") == 0)
+			parser->content_state = SOLR_XML_CONTENT_STATE_MAILBOX;
+		else if (strcmp(name_attr, "ns") == 0)
+			parser->content_state = SOLR_XML_CONTENT_STATE_NAMESPACE;
+		else if (strcmp(name_attr, "uidv") == 0)
+			parser->content_state = SOLR_XML_CONTENT_STATE_UIDVALIDITY;
+		else
+			break;
+		parser->state++;
+		break;
+	case SOLR_XML_RESPONSE_STATE_CONTENT:
+		break;
+	}
+}
+
+static struct solr_result *
+solr_result_get(struct solr_response_parser *parser, const char *box_id)
+{
+	struct solr_result *result;
+	char *box_id_dup;
+
+	result = hash_table_lookup(parser->mailboxes, box_id);
+	if (result != NULL)
+		return result;
+
+	box_id_dup = p_strdup(parser->result_pool, box_id);
+	result = p_new(parser->result_pool, struct solr_result, 1);
+	result->box_id = box_id_dup;
+	p_array_init(&result->uids, parser->result_pool, 32);
+	p_array_init(&result->scores, parser->result_pool, 32);
+	hash_table_insert(parser->mailboxes, box_id_dup, result);
+	array_push_back(&parser->results, &result);
+	return result;
+}
+
+static int solr_lookup_add_doc(struct solr_response_parser *parser)
+{
+	struct fts_score_map *score;
+	struct solr_result *result;
+	const char *box_id;
+
+	if (parser->uid == 0) {
+		i_error("fts_solr: uid missing from inside doc");
+		return -1;
+	}
+
+	if (parser->mailbox == NULL) {
+		/* looking up from a single mailbox only */
+		box_id = "";
+	} else if (parser->uidvalidity != 0) {
+		/* old style lookup */
+		string_t *str = t_str_new(64);
+		str_printfa(str, "%u\001", parser->uidvalidity);
+		str_append(str, parser->mailbox);
+		if (parser->ns != NULL)
+			str_printfa(str, "\001%s", parser->ns);
+		box_id = str_c(str);
+	} else {
+		/* new style lookup */
+		box_id = parser->mailbox;
+	}
+	result = solr_result_get(parser, box_id);
+
+	if (seq_range_array_add(&result->uids, parser->uid)) {
+		/* duplicate result */
+	} else if (parser->score != 0) {
+		score = array_append_space(&result->scores);
+		score->uid = parser->uid;
+		score->score = parser->score;
+	}
+	return 0;
+}
+
+static void solr_lookup_xml_end(void *context, const char *name ATTR_UNUSED)
+{
+	struct solr_response_parser *parser = context;
+	string_t *buf = parser->buffer;
+	int ret;
+
+	switch (parser->content_state) {
+	case SOLR_XML_CONTENT_STATE_NONE:
+		break;
+	case SOLR_XML_CONTENT_STATE_UID:
+		if (str_to_uint32(str_c(buf), &parser->uid) < 0 ||
+		    parser->uid == 0) {
+			i_error("fts_solr: received invalid uid '%s'",
+				str_c(buf));
+			parser->content_state = SOLR_XML_CONTENT_STATE_ERROR;
+		}
+		break;
+	case SOLR_XML_CONTENT_STATE_SCORE:
+		parser->score = strtod(str_c(buf), NULL);
+		break;
+	case SOLR_XML_CONTENT_STATE_MAILBOX:
+		parser->mailbox = i_strdup(str_c(buf));
+		break;
+	case SOLR_XML_CONTENT_STATE_NAMESPACE:
+		parser->ns = i_strdup(str_c(buf));
+		break;
+	case SOLR_XML_CONTENT_STATE_UIDVALIDITY:
+		if (str_to_uint32(str_c(buf), &parser->uidvalidity) < 0)
+			i_error("fts_solr: received invalid uidvalidity");
+		break;
+	case SOLR_XML_CONTENT_STATE_ERROR:
+		return;
+	}
+
+	i_assert(parser->depth >= (int)parser->state);
+
+	if (parser->state == SOLR_XML_RESPONSE_STATE_CONTENT &&
+	    parser->content_state == SOLR_XML_CONTENT_STATE_MAILBOX &&
+	    parser->mailbox == NULL) {
+		/* mailbox is namespace prefix */
+		parser->mailbox = i_strdup("");
+	}
+
+	if (parser->depth == (int)parser->state) {
+		ret = 0;
+		if (parser->state == SOLR_XML_RESPONSE_STATE_DOC) {
+			T_BEGIN {
+				ret = solr_lookup_add_doc(parser);
+			} T_END;
+		}
+		parser->state--;
+		if (ret < 0)
+			parser->content_state = SOLR_XML_CONTENT_STATE_ERROR;
+		else
+			parser->content_state = SOLR_XML_CONTENT_STATE_NONE;
+	}
+	parser->depth--;
+}
+
+static void solr_lookup_xml_data(void *context, const char *str, int len)
+{
+	struct solr_response_parser *parser = context;
+
+	switch (parser->content_state) {
+	case SOLR_XML_CONTENT_STATE_NONE:
+	case SOLR_XML_CONTENT_STATE_ERROR:
+		/* ignore element data */
+		return;
+	case SOLR_XML_CONTENT_STATE_UID:
+	case SOLR_XML_CONTENT_STATE_SCORE:
+	case SOLR_XML_CONTENT_STATE_MAILBOX:
+	case SOLR_XML_CONTENT_STATE_NAMESPACE:
+	case SOLR_XML_CONTENT_STATE_UIDVALIDITY:
+		break;
+	}
+
+	if (str_len(parser->buffer) + len > MAX_VALUE_LEN) {
+		i_error("fts_solr: XML element data length out of range");
+		parser->content_state = SOLR_XML_CONTENT_STATE_ERROR;
+		return;
+	}
+
+	str_append_data(parser->buffer, str, len);
+}
+
+struct solr_response_parser *
+solr_response_parser_init(pool_t result_pool, struct istream *input)
+{
+	struct solr_response_parser *parser;
+
+	parser = i_new(struct solr_response_parser, 1);
+
+	parser->xml_parser = XML_ParserCreate("UTF-8");
+	if (parser->xml_parser == NULL) {
+		i_fatal_status(FATAL_OUTOFMEM,
+			       "fts_solr: Failed to allocate XML parser");
+	}
+
+	parser->buffer = str_new(default_pool, 256);
+	hash_table_create(&parser->mailboxes, default_pool, 0,
+			  str_hash, strcmp);
+
+	parser->result_pool = result_pool;
+	pool_ref(result_pool);
+	p_array_init(&parser->results, result_pool, 32);
+
+	parser->input = input;
+	i_stream_ref(input);
+
+	parser->xml_failed = FALSE;
+	XML_SetElementHandler(parser->xml_parser,
+			      solr_lookup_xml_start, solr_lookup_xml_end);
+	XML_SetCharacterDataHandler(parser->xml_parser, solr_lookup_xml_data);
+	XML_SetUserData(parser->xml_parser, parser);
+
+	return parser;
+}
+
+void solr_response_parser_deinit(struct solr_response_parser **_parser)
+{
+	struct solr_response_parser *parser = *_parser;
+
+	*_parser = NULL;
+
+	if (parser == NULL)
+		return;
+
+	str_free(&parser->buffer);
+	hash_table_destroy(&parser->mailboxes);
+	XML_ParserFree(parser->xml_parser);
+	i_stream_unref(&parser->input);
+	pool_unref(&parser->result_pool);
+	i_free(parser);
+}
+
+int solr_response_parse(struct solr_response_parser *parser,
+			struct solr_result ***box_results_r)
+{
+	const unsigned char *data;
+	size_t size;
+	int stream_errno, ret;
+
+	i_assert(parser->input != NULL);
+	i_zero(box_results_r);
+
+	/* read payload */
+	while ((ret = i_stream_read_more(parser->input, &data, &size)) > 0) {
+		(void)solr_xml_parse(parser, data, size, FALSE);
+		i_stream_skip(parser->input, size);
+	}
+
+	if (ret == 0) {
+		/* we will be called again for more data */
+		return 0;
+	}
+
+	stream_errno = parser->input->stream_errno;
+	i_stream_unref(&parser->input);
+
+	if (parser->content_state == SOLR_XML_CONTENT_STATE_ERROR)
+		return -1;
+	if (stream_errno != 0)
+		return -1;
+
+	ret = solr_xml_parse(parser, "", 0, TRUE);
+
+	array_append_zero(&parser->results);
+	*box_results_r = array_front_modifiable(&parser->results);
+	return (ret == 0 ? 1 : -1);
+}
diff --git a/src/plugins/fts-solr/solr-response.h b/src/plugins/fts-solr/solr-response.h
new file mode 100644
index 0000000..1d5cdd5
--- /dev/null
+++ b/src/plugins/fts-solr/solr-response.h
@@ -0,0 +1,23 @@
+#ifndef SOLR_RESPONSE_H
+#define SOLR_RESPONSE_H
+
+#include "seq-range-array.h"
+#include "fts-api.h"
+
+struct solr_response_parser;
+
+struct solr_result {
+	const char *box_id;
+
+	ARRAY_TYPE(seq_range) uids;
+	ARRAY_TYPE(fts_score_map) scores;
+};
+
+struct solr_response_parser *
+solr_response_parser_init(pool_t result_pool, struct istream *input);
+void solr_response_parser_deinit(struct solr_response_parser **_parser);
+
+int solr_response_parse(struct solr_response_parser *parser,
+			struct solr_result ***box_results_r);
+
+#endif
diff --git a/src/plugins/fts-solr/test-solr-response.c b/src/plugins/fts-solr/test-solr-response.c
new file mode 100644
index 0000000..8add6db
--- /dev/null
+++ b/src/plugins/fts-solr/test-solr-response.c
@@ -0,0 +1,295 @@
+/* Copyright (c) 2019 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "str.h"
+#include "array.h"
+#include "istream.h"
+#include "solr-response.h"
+#include "test-common.h"
+
+#include <unistd.h>
+
+static bool debug = FALSE;
+
+struct solr_response_test_result {
+	const char *box_id;
+	struct fts_score_map *scores;
+};
+
+struct solr_response_test {
+	const char *input;
+
+	struct solr_response_test_result *results;
+};
+
+struct fts_score_map test_results1_scores[] = {
+	{ .score = 0.042314477,	.uid = 1 },
+	{ .score = 0.06996078, .uid = 2, },
+	{ .score = 0.020381179, .uid = 3 },
+	{ .score = 0.020381179,	.uid = 4 },
+	{ .score = 5.510487E-4,	.uid = 6 },
+	{ .score = 0.0424253, .uid = 7 },
+	{ .score = 0.04215967, .uid = 8 },
+	{ .score = 0.02470572, .uid = 9 },
+	{ .score = 0.05936369, .uid = 10 },
+	{ .score = 0.048221838,	.uid = 11 },
+	{ .score = 7.793006E-4,	.uid = 12 },
+	{ .score = 2.7900032E-4, .uid = 13 },
+	{ .score = 0.02088323, .uid = 14 },
+	{ .score = 0.011646388, .uid = 15 },
+	{ .score = 1.3776218E-4, .uid = 17 },
+	{ .score = 2.386111E-4, .uid = 19 },
+	{ .score = 2.7552436E-4, .uid = 20 },
+	{ .score = 4.772222E-4, .uid = 23 },
+	{ .score = 4.772222E-4, .uid = 24 },
+	{ .score = 5.965277E-4, .uid = 25 },
+	{ .score = 0.0471366, .uid = 26 },
+	{ .score = 0.0471366, .uid = 50 },
+	{ .score = 0.047274362, .uid = 51 },
+	{ .score = 0.053303234, .uid = 56 },
+	{ .score = 5.445528E-4, .uid = 62 },
+	{ .score = 2.922377E-4, .uid = 66 },
+	{ .score = 0.02623833, .uid = 68 },
+	{ .score = 3.4440547E-4, .uid = 70 },
+	{ .score = 2.922377E-4, .uid = 74 },
+	{ .score = 2.7552436E-4, .uid = 76 },
+	{ .score = 1.3776218E-4, .uid = 77 },
+	{ .score = 0, .uid = 0 },
+};
+
+struct solr_response_test_result test_results1[] = {
+	{
+		.box_id = "",
+		.scores = test_results1_scores,
+	},
+	{
+		.box_id = NULL
+	}
+};
+
+static const struct solr_response_test tests[] = {
+	{
+		.input =
+			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+			"<response>\n"
+			"<lst name=\"responseHeader\"><int name=\"status\""
+			">0</int><int name=\"QTime\">3</int><lst name=\"pa"
+			"rams\"><str name=\"wt\">xml</str><str name=\"fl\""
+			">uid,score</str><str name=\"rows\">4023</str><str"
+			" name=\"sort\">uid asc</str><str name=\"q\">{!luc"
+			"ene q.op=AND}subject:pierreserveur OR from:pierre"
+			"serveur OR to:pierreserveur OR cc:pierreserveur O"
+			"R bcc:pierreserveur OR body:pierreserveur</str><s"
+			"tr name=\"fq\">+box:fa74101044cb607d5f0900001de14"
+			"712 +user:jpierreserveur</str></lst></lst><result"
+			" name=\"response\" numFound=\"31\" start=\"0\" ma"
+			"xScore=\"0.06996078\"><doc><float name=\"score\">"
+			"0.042314477</float><long name=\"uid\">1</long></d"
+			"oc><doc><float name=\"score\">0.06996078</float><"
+			"long name=\"uid\">2</long></doc><doc><float name="
+			"\"score\">0.020381179</float><long name=\"uid\">3"
+			"</long></doc><doc><float name=\"score\">0.0203811"
+			"79</float><long name=\"uid\">4</long></doc><doc><"
+			"float name=\"score\">5.510487E-4</float><long nam"
+			"e=\"uid\">6</long></doc><doc><float name=\"score\""
+			">0.0424253</float><long name=\"uid\">7</long></do"
+			"c><doc><float name=\"score\">0.04215967</float><l"
+			"ong name=\"uid\">8</long></doc><doc><float name=\""
+			"score\">0.02470572</float><long name=\"uid\">9</l"
+			"ong></doc><doc><float name=\"score\">0.05936369</"
+			"float><long name=\"uid\">10</long></doc><doc><flo"
+			"at name=\"score\">0.048221838</float><long name=\""
+			"uid\">11</long></doc><doc><float name=\"score\">7"
+			".793006E-4</float><long name=\"uid\">12</long></d"
+			"oc><doc><float name=\"score\">2.7900032E-4</float"
+			"><long name=\"uid\">13</long></doc><doc><float na"
+			"me=\"score\">0.02088323</float><long name=\"uid\""
+			">14</long></doc><doc><float name=\"score\">0.0116"
+			"46388</float><long name=\"uid\">15</long></doc><d"
+			"oc><float name=\"score\">1.3776218E-4</float><lon"
+			"g name=\"uid\">17</long></doc><doc><float name=\""
+			"score\">2.386111E-4</float><long name=\"uid\">19<"
+			"/long></doc><doc><float name=\"score\">2.7552436E"
+			"-4</float><long name=\"uid\">20</long></doc><doc>"
+			"<float name=\"score\">4.772222E-4</float><long na"
+			"me=\"uid\">23</long></doc><doc><float name=\"scor"
+			"e\">4.772222E-4</float><long name=\"uid\">24</lon"
+			"g></doc><doc><float name=\"score\">5.965277E-4</f"
+			"loat><long name=\"uid\">25</long></doc><doc><floa"
+			"t name=\"score\">0.0471366</float><long name=\"ui"
+			"d\">26</long></doc><doc><float name=\"score\">0.0"
+			"471366</float><long name=\"uid\">50</long></doc><"
+			"doc><float name=\"score\">0.047274362</float><lon"
+			"g name=\"uid\">51</long></doc><doc><float name=\""
+			"score\">0.053303234</float><long name=\"uid\">56<"
+			"/long></doc><doc><float name=\"score\">5.445528E-"
+			"4</float><long name=\"uid\">62</long></doc><doc><"
+			"float name=\"score\">2.922377E-4</float><long nam"
+			"e=\"uid\">66</long></doc><doc><float name=\"score"
+			"\">0.02623833</float><long name=\"uid\">68</long>"
+			"</doc><doc><float name=\"score\">3.4440547E-4</fl"
+			"oat><long name=\"uid\">70</long></doc><doc><float"
+			" name=\"score\">2.922377E-4</float><long name=\"u"
+			"id\">74</long></doc><doc><float name=\"score\">2."
+			"7552436E-4</float><long name=\"uid\">76</long></d"
+			"oc><doc><float name=\"score\">1.3776218E-4</float"
+			"><long name=\"uid\">77</long></doc></result>\n"
+			"</response>\n",
+		.results = test_results1,
+	},
+};
+
+static const unsigned tests_count = N_ELEMENTS(tests);
+
+static void
+test_solr_result(const struct solr_response_test_result *test_results,
+		 struct solr_result **parse_results)
+{
+	unsigned int rcount, i;
+
+	for (i = 0; test_results[i].box_id != NULL; i++);
+	rcount = i;
+
+	for (i = 0; parse_results[i] != NULL; i++);
+
+	test_out_quiet("result count equal", i == rcount);
+	if (test_has_failed())
+		return;
+
+	for (i = 0; i < rcount && parse_results[i] != NULL; i++) {
+		unsigned int scount, j;
+		const struct fts_score_map *tscores = test_results[i].scores;
+		const struct fts_score_map *pscores =
+			array_get(&parse_results[i]->scores, &scount);
+
+		test_out_quiet(t_strdup_printf("box id equal[%u]", i),
+			       strcmp(test_results[i].box_id,
+				      parse_results[i]->box_id) == 0);
+
+		for (j = 0; tscores[j].uid != 0; j++);
+		test_out_quiet(t_strdup_printf("scores count equal[%u]", i),
+			       j == scount);
+		if (j != scount)
+			continue;
+
+		for (j = 0; j < scount; j++) {
+			test_out_quiet(
+				t_strdup_printf("score uid equal[%u/%u]", i, j),
+				pscores[j].uid == tscores[j].uid);
+			test_out_quiet(
+				t_strdup_printf("score value equal[%u/%u]", i, j),
+				pscores[j].score == tscores[j].score);
+		}
+	}
+}
+
+static void test_solr_response_parser(void)
+{
+	unsigned int i;
+
+	for (i = 0; i < tests_count; i++) T_BEGIN {
+		const struct solr_response_test *test;
+		const char *text;
+		unsigned int pos, text_len;
+		struct istream *input;
+		struct solr_response_parser *parser;
+		struct solr_result **box_results;
+		const char *error = NULL;
+		pool_t pool;
+		int ret = 0;
+
+		test = &tests[i];
+		text = test->input;
+		text_len = strlen(text);
+
+		test_begin(t_strdup_printf("solr response [%d]", i));
+
+		input = test_istream_create_data(text, text_len);
+		pool = pool_alloconly_create("solr response", 4096);
+		parser = solr_response_parser_init(pool, input);
+
+		ret = solr_response_parse(parser, &box_results);
+
+		test_out_reason("parse ok (buffer)", ret > 0, error);
+		if (ret > 0)
+			test_solr_result(test->results, box_results);
+
+		solr_response_parser_deinit(&parser);
+		pool_unref(&pool);
+		i_stream_unref(&input);
+
+		input = test_istream_create_data(text, text_len);
+		pool = pool_alloconly_create("solr response", 4096);
+		parser = solr_response_parser_init(pool, input);
+
+		ret = 0;
+		for (pos = 0; pos <= text_len && ret == 0; pos++) {
+			test_istream_set_size(input, pos);
+			ret = solr_response_parse(parser, &box_results);
+		}
+
+		test_out_reason("parse ok (trickle)", ret > 0, error);
+		if (ret > 0)
+			test_solr_result(test->results, box_results);
+
+		solr_response_parser_deinit(&parser);
+		pool_unref(&pool);
+		i_stream_unref(&input);
+
+		test_end();
+
+	} T_END;
+}
+
+static void test_solr_response_file(const char *file)
+{
+	pool_t pool;
+	struct istream *input;
+	struct solr_response_parser *parser;
+	struct solr_result **box_results;
+	int ret = 0;
+
+	pool = pool_alloconly_create("solr response", 4096);
+	input = i_stream_create_file(file, 1024);
+	parser = solr_response_parser_init(pool, input);
+
+	while ((ret = solr_response_parse(parser, &box_results)) == 0);
+
+	if (ret < 0)
+		i_fatal("Failed to read response");
+
+	solr_response_parser_deinit(&parser);
+	i_stream_unref(&input);
+	pool_unref(&pool);
+}
+
+int main(int argc, char *argv[])
+{
+	int c;
+
+	static void (*test_functions[])(void) = {
+		test_solr_response_parser,
+		NULL
+	};
+
+	while ((c = getopt(argc, argv, "D")) > 0) {
+		switch (c) {
+		case 'D':
+			debug = TRUE;
+			break;
+		default:
+			i_fatal("Usage: %s [-D]", argv[0]);
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (argc > 0) {
+		test_solr_response_file(argv[0]);
+		return 0;
+	}
+
+	return test_run(test_functions);
+}
+
+