Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove HHVM proxy detection #1818

Merged
merged 2 commits into from
Oct 21, 2020
Merged

Remove HHVM proxy detection #1818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d65946a
Remove HHVM proxy detection
deguif Oct 20, 2020
a37231e
Add changelog
deguif Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Deprecated Match query class and introduced MatchQuery instead for PHP 8.0 compatibility reason [#1799](https://github.com/ruflin/Elastica/pull/1799)
* Deprecated `version`/`version_type` options [(deprecated in `6.7.0`)](https://www.elastic.co/guide/en/elasticsearch/reference/6.8/docs-update.html) and added `if_seq_no` / `if_primary_term` that replaced it
### Removed
* Removed HHVM proxy detection [#1818](https://github.com/ruflin/Elastica/pull/1818)
### Fixed
* fixed issue [1789](https://github.com/ruflin/Elastica/issues/1789)
* Replaced `_routing` and `_retry_on_conflict` by `routing` and `retry_on_conflict` in `AbstractUpdateAction` [#1807](https://github.com/ruflin/Elastica/issues/1807)
Expand Down
9 changes: 1 addition & 8 deletions src/Transport/Guzzle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,7 @@ public function exec(Request $request, array $params): Response
$options['timeout'] = $connection->getTimeout();
}

$proxy = $connection->getProxy();

// See: https://github.com/facebook/hhvm/issues/4875
if (null === $proxy && \defined('HHVM_VERSION')) {
$proxy = \getenv('http_proxy') ?: null;
}

if (null !== $proxy) {
if (null !== $proxy = $connection->getProxy()) {
$options['proxy'] = $proxy;
}

Expand Down
9 changes: 1 addition & 8 deletions src/Transport/Http.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,7 @@ public function exec(Request $request, array $params): Response
\curl_setopt($conn, CURLOPT_CONNECTTIMEOUT, $connectTimeout);
}

$proxy = $connection->getProxy();

// See: https://github.com/facebook/hhvm/issues/4875
if (null === $proxy && \defined('HHVM_VERSION')) {
$proxy = \getenv('http_proxy') ?: null;
}

if (null !== $proxy) {
if (null !== $proxy = $connection->getProxy()) {
\curl_setopt($conn, CURLOPT_PROXY, $proxy);
}

Expand Down