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
8053311b
Commit
8053311b
authored
Apr 28, 2017
by
Bas de Nooijer
Committed by
GitHub
Apr 28, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #493 from ejn/carefulIniGet
Check ini_get is not disabled before using it
parents
37c822d6
3c7677d5
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 @
8053311b
...
...
@@ -116,7 +116,7 @@ class Curl extends Configurable implements AdapterInterface
$handler
=
curl_init
();
curl_setopt
(
$handler
,
CURLOPT_URL
,
$uri
);
curl_setopt
(
$handler
,
CURLOPT_RETURNTRANSFER
,
true
);
if
(
!
ini_get
(
'open_basedir'
))
{
if
(
!
(
function_exists
(
'ini_get'
)
&&
ini_get
(
'open_basedir'
)
))
{
curl_setopt
(
$handler
,
CURLOPT_FOLLOWLOCATION
,
true
);
}
curl_setopt
(
$handler
,
CURLOPT_TIMEOUT
,
$options
[
'timeout'
]);
...
...
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