aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/search
diff options
context:
space:
mode:
authorDhruv <dhruv.goel92@gmail.com>2012-07-22 03:43:50 +0530
committerDhruv <dhruv.goel92@gmail.com>2012-07-22 04:24:34 +0530
commit39bac86f7db881a1035bebad56507145103218d5 (patch)
treeee017322666c1d6a33a3469e51d413ca1b11d3e2 /phpBB/includes/search
parente40758db84a23bc7a2c5324dbedcd7f0911abeea (diff)
downloadforums-39bac86f7db881a1035bebad56507145103218d5.tar
forums-39bac86f7db881a1035bebad56507145103218d5.tar.gz
forums-39bac86f7db881a1035bebad56507145103218d5.tar.bz2
forums-39bac86f7db881a1035bebad56507145103218d5.tar.xz
forums-39bac86f7db881a1035bebad56507145103218d5.zip
[feature/sphinx-fulltext-search] improve port option
Use listen instead of deprecated port value in sphinx config file. sqlhost uses default $dbhost. PHPBB3-10946
Diffstat (limited to 'phpBB/includes/search')
-rw-r--r--phpBB/includes/search/fulltext_sphinx.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index e1052ee7da..18037a2be0 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -166,7 +166,7 @@ class phpbb_search_fulltext_sphinx
array('sql_user', $dbuser),
array('sql_pass', $dbpasswd),
array('sql_db', $dbname),
- array('sql_port', $this->config['fulltext_sphinx_port']),
+ array('sql_port', $dbport),
array('sql_query_pre', 'SET NAMES \'utf8\''),
array('sql_query_pre', 'UPDATE ' . SPHINX_TABLE . ' SET max_doc_id = (SELECT MAX(post_id) FROM ' . POSTS_TABLE . ') WHERE counter_id = 1'),
array('sql_query_range', 'SELECT MIN(post_id), MAX(post_id) FROM ' . POSTS_TABLE . ''),
@@ -241,8 +241,7 @@ class phpbb_search_fulltext_sphinx
),
'searchd' => array(
array('compat_sphinxql_magics' , '0'),
- array('listen' , '127.0.0.1'),
- array('port', ($this->config['fulltext_sphinx_port']) ? $this->config['fulltext_sphinx_port'] : '3312'),
+ array('listen' , 'localhost' . ':' . ($this->config['fulltext_sphinx_port'] ? $this->config['fulltext_sphinx_port'] : '3312')),
array('log', $this->config['fulltext_sphinx_data_path'] . 'log/searchd.log'),
array('query_log', $this->config['fulltext_sphinx_data_path'] . 'log/sphinx-query.log'),
array('read_timeout', '5'),
@@ -759,7 +758,7 @@ class phpbb_search_fulltext_sphinx
$config_vars = array(
'fulltext_sphinx_data_path' => 'string',
'fulltext_sphinx_host' => 'string',
- 'fulltext_sphinx_port' => 'int',
+ 'fulltext_sphinx_port' => 'string',
'fulltext_sphinx_indexer_mem_limit' => 'int',
);