From f2e9dc834328c48e89283c8fa66d5d1a0750ac84 Mon Sep 17 00:00:00 2001
From: Janos SUTO <sj@acts.hu>
Date: Mon, 17 Aug 2020 20:32:42 +0200
Subject: [PATCH] Made strict sphinx schema the default

Signed-off-by: Janos SUTO <sj@acts.hu>
---
 config.php.in      | 2 +-
 etc/sphinx.conf.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.php.in b/config.php.in
index f7903b79..146b2d18 100644
--- a/config.php.in
+++ b/config.php.in
@@ -238,7 +238,7 @@ $config['SPHINX_MAIN_INDEX'] = 'main1,dailydelta1,delta1';
 $config['SPHINX_ATTACHMENT_INDEX'] = 'att1';
 $config['SPHINX_TAG_INDEX'] = 'tag1';
 $config['SPHINX_NOTE_INDEX'] = 'note1';
-$config['SPHINX_STRICT_SCHEMA'] = 0;
+$config['SPHINX_STRICT_SCHEMA'] = 1;
 
 $config['RELOAD_COMMAND'] = 'sudo -n /etc/init.d/rc.piler reload';
 $config['PILERIMPORT_IMAP_COMMAND'] = '/usr/local/bin/pilerimport -d /var/piler/imap -q -r';
diff --git a/etc/sphinx.conf.in b/etc/sphinx.conf.in
index cb0a8a62..a4b21591 100644
--- a/etc/sphinx.conf.in
+++ b/etc/sphinx.conf.in
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-define('SPHINX_VERSION', 321); // If you have sphinx-3.2.1, then set SPHINX_VERSION to 321
+define('SPHINX_VERSION', 331); // If you have sphinx-3.3.1, then set SPHINX_VERSION to 331
 define('LOCALSTATEDIR', '@LOCALSTATEDIR@');
 define('NGRAM_CONFIG', "        #ngram_len               = 1\n        #ngram_chars             = U+3000..U+2FA1F\n");
 
@@ -18,7 +18,7 @@ define('SPHINX_CHARSET_TABLE', "0..9, english, _, \
 // Be sure to check out http://www.mailpiler.org/wiki/current:sphinx3 for more
 // NB: The SPHINX_STRICT_SCHEMA in sphinx.conf MUST BE THE SAME as in config.php (or in config-site.php)
 //
-define('SPHINX_STRICT_SCHEMA', 0);
+define('SPHINX_STRICT_SCHEMA', 1);
 
 
 if(SPHINX_STRICT_SCHEMA) {