Commit 74853b52 authored by David Thorne's avatar David Thorne Committed by Thomas Seidl
Browse files

Issue #1549244 by cferthorney, drunken monkey: Added SSL Support for Solr servers.

parent 18c601f2

CHANGELOG.txt

+1 −0
Original line number Diff line number Diff line 
Search API Solr search 1.x, dev (xx/xx/xxxx):

---------------------------------------------

- #1549244 by cferthorney, drunken monkey: Added SSL Support for Solr servers.



Search API Solr search 1.0, RC 5 (05/17/2013):

----------------------------------------------

includes/service.inc

+14 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ class SearchApiSolrService extends SearchApiAbstractService { 
  public function configurationForm(array $form, array &$form_state) {

    if ($this->options) {

      // Editing this server

      $url = 'http://' . $this->options['host'] . ':' . $this->options['port'] . $this->options['path'];

      $url = $this->options['scheme'] . '://' . $this->options['host'] . ':' . $this->options['port'] . $this->options['path'];

      $form['server_description'] = array(

        '#type' => 'item',

        '#title' => t('Solr server URI'),
@@ -93,6 +93,7 @@ class SearchApiSolrService extends SearchApiAbstractService { 
    }



    $options = $this->options + array(

      'scheme' => 'http',

      'host' => 'localhost',

      'port' => '8983',

      'path' => '/solr',
@@ -106,6 +107,17 @@ class SearchApiSolrService extends SearchApiAbstractService { 
      'autocorrect_suggest_words' => TRUE,

    );



    $form['scheme'] = array(

      '#type' => 'select',

      '#title' => t('HTTP protocol'),

      '#description' => t('The HTTP protocol to use for sending queries.'),

      '#default_value' => $options['scheme'],

      '#options' => array(

        'http' => 'http',

        'https' => 'https',

      ),

    );



    $form['host'] = array(

      '#type' => 'textfield',

      '#title' => t('Solr host'),
@@ -263,7 +275,7 @@ class SearchApiSolrService extends SearchApiAbstractService { 
    $output = '';

    $options = $this->options;



    $url = 'http://' . $options['host'] . ':' . $options['port'] . $options['path'];

    $url = $options['scheme'] . '://' . $options['host'] . ':' . $options['port'] . $options['path'];

    $output .= "<dl>\n  <dt>";

    $output .= t('Solr server URI');

    $output .= "</dt>\n  <dd>";