Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
S
solarium
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
common
solarium
Commits
6b540584
Commit
6b540584
authored
Sep 10, 2015
by
Bas de Nooijer
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #358 from keesschepers/develop
Make it possible to bypass proxy.
parents
099f57ca
e966d913
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
library/Solarium/Core/Client/Adapter/Curl.php
library/Solarium/Core/Client/Adapter/Curl.php
+1
-1
No files found.
library/Solarium/Core/Client/Adapter/Curl.php
View file @
6b540584
...
...
@@ -122,7 +122,7 @@ class Curl extends Configurable implements AdapterInterface
curl_setopt
(
$handler
,
CURLOPT_TIMEOUT
,
$options
[
'timeout'
]);
curl_setopt
(
$handler
,
CURLOPT_CONNECTTIMEOUT
,
$options
[
'timeout'
]);
if
(
$proxy
=
$this
->
getOption
(
'proxy'
))
{
if
(
null
!==
(
$proxy
=
$this
->
getOption
(
'proxy'
)
))
{
curl_setopt
(
$handler
,
CURLOPT_PROXY
,
$proxy
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment