Author: rande
Date: 2010-04-28 19:08:05 +0200 (Wed, 28 Apr 2010)
New Revision: 29304
Modified:
plugins/sfWebBrowserPlugin/trunk/lib/sfCurlAdapter.class.php
Log:
[sfWebBrowserPlugin] unset ssl_verify_host on sfCurlAdapter.class.php
Modified: plugins/sfWebBrowserPlugin/trunk/lib/sfCurlAdapter.class.php
===================================================================
--- plugins/sfWebBrowserPlugin/trunk/lib/sfCurlAdapter.class.php
2010-04-28 15:50:52 UTC (rev 29303)
+++ plugins/sfWebBrowserPlugin/trunk/lib/sfCurlAdapter.class.php
2010-04-28 17:08:05 UTC (rev 29304)
@@ -91,22 +91,25 @@
curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, false);
curl_setopt($this->curl, CURLOPT_FRESH_CONNECT, true);
- if(isset($this->options['followlocation']))
+ if(isset($curl_options['followlocation']))
{
curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, (bool)
$this->options['followlocation']);
+ unset($curl_options['followlocation']);
}
// activate ssl certificate verification?
-
- if (isset($this->options['ssl_verify_host']))
+ if (isset($curl_options['ssl_verify_host']))
{
curl_setopt($this->curl, CURLOPT_SSL_VERIFYHOST, (bool)
$this->options['ssl_verify_host']);
+ unset($curl_options['ssl_verify_host']);
}
+
if (isset($curl_options['ssl_verify']))
{
curl_setopt($this->curl, CURLOPT_SSL_VERIFYPEER, (bool)
$this->options['ssl_verify']);
unset($curl_options['ssl_verify']);
}
+
// verbose execution?
if (isset($curl_options['verbose']))
{
@@ -114,6 +117,7 @@
curl_setopt($this->curl, CURLOPT_VERBOSE, true);
unset($curl_options['cookies']);
}
+
if (isset($curl_options['verbose_log']))
{
$log_file = sfConfig::get('sf_log_dir').'/sfCurlAdapter_verbose.log';
@@ -204,8 +208,9 @@
// handle any request method
curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $method);
+
$response = curl_exec($this->curl);
-
+
if (curl_errno($this->curl))
{
throw new Exception(curl_error($this->curl));
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
