#106 #107 Allow to set curl params over client config

ruflin · Jan 8, 2012 · ba88bd0 · ba88bd0
1 parent e32a30f
commit ba88bd0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/lib/Elastica/Client.php b/lib/Elastica/Client.php
@@ -45,6 +45,7 @@ class Elastica_Client
 		'timeout' => self::TIMEOUT,
 		'headers' => array(),
 		'servers' => array(),
+		'curl' => array(),
 		'roundRobin' => false,
 		'log' => false,
 	);

diff --git a/lib/Elastica/Request.php b/lib/Elastica/Request.php
@@ -135,20 +135,21 @@ public function send() {
 
 		$servers = $this->getClient()->getConfig('servers');
 
-		/*$dir = sys_get_temp_dir();
+		/*
+
+		// Integration of temp file
+		$dir = sys_get_temp_dir();
 		$name = 'elasticaServers.json';
 		$file = $dir . DIRECTORY_SEPARATOR . $name;
-		
-		error_log($file);
 
 		if (!file_exists($file)) {
 			file_put_contents($file, 'hh');
 			error_log(print_r($this->getClient()->getCluster(), true));
-		}*/
-
+		}
+
+		*/
 
 		if (empty($servers)) {
-				error_log(print_r($this->getClient()->getConfig('url'), true));
 			$params = array(
 				'url' => $this->getClient()->getConfig('url'),
 				'host' => $this->getClient()->getHost(),

diff --git a/lib/Elastica/Transport/Http.php b/lib/Elastica/Transport/Http.php
@@ -112,6 +112,9 @@ public function exec(array $params) {
 	 * @param resource $connection Curl connection
 	 */
 	protected function _setupCurl($connection) {
+		foreach ($this->_request->getClient()->getConfig('curl') as $key => $param) {
+			curl_setopt($connection, $key, $param);
+		}
 	}
 
 	/**

diff --git a/lib/Elastica/Transport/Https.php b/lib/Elastica/Transport/Https.php
@@ -20,6 +20,5 @@ class Elastica_Transport_Https extends Elastica_Transport_Http {
 	 */
 	protected function _setupCurl($connection) {
 		parent::_setupCurl($connection);
-		curl_setopt($connection, CURLOPT_SSL_VERIFYPEER, false);
 	}
 }