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.

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

Increase timeout if proxy is starting #1269

Merged
merged 2 commits into from
Dec 3, 2020

Conversation

eszkadev
Copy link
Contributor

Signed-off-by: Szymon Kłos szymon.klos@collabora.com

  • Resolves: #
  • Target version: master

Summary

TODO

  • ...

Checklist

  • Code is properly formatted
  • Sign-off message is added to all commits
  • Documentation (manuals or wiki) has been updated or is not required

Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
@@ -77,6 +77,35 @@ public function fetchFromRemote() {
$options['verify'] = false;
}

// first load with proxy can take some time - increase timeout in that case
$usesProxy = false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would probably be nice to move this into a dedicated function so the general flow is a bit more readable and we might be able to reuse this in case we need it for any other request that might run into the default timeout.

Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
@juliushaertl juliushaertl added 4. to release Ready to release, can be waiting for the tests to finish bug Something isn't working labels Nov 24, 2020
@juliushaertl juliushaertl merged commit bea5976 into nextcloud:master Dec 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to release, can be waiting for the tests to finish bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants