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

Prevent proxy host from blocking application shutdown #4155

Merged
merged 1 commit into from Jan 19, 2020

Conversation

@droidmonkey
Copy link
Member

droidmonkey commented Jan 11, 2020

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Description and Context

  • Fix #4079 - proxy host would get stuck trying to read characters from stdin. Switch to "readsome" which does not block if there are not enough characters to read. Added a longer delay to slow the checking loop down.

This may also address #4140, but that needs to be tested.

Testing strategy

Tested on Windows 10 using the debugger. The CLion debugger refused to close KeePassXC when browser integration was turned on. Found out it was the stdin blocking. This is most likely the cause of hangs during shutdown.

Checklist:

  • I have read the CONTRIBUTING document. [REQUIRED]
  • My code follows the code style of this project. [REQUIRED]
  • All new and existing tests passed. [REQUIRED]
  • I have compiled and verified my code with -DWITH_ASAN=ON. [REQUIRED]
  • My change requires a change to the documentation, and I have updated it accordingly.
  • I have added tests to cover my changes.
* Fix #4079 - proxy host would get stuck trying to read characters from stdin. Switch to "readsome" which does not block if there are not enough characters to read. Added a longer delay to slow the checking loop down.
@phoerious

This comment has been minimized.

Copy link
Member

phoerious commented Jan 11, 2020

Does this also fix the installer not being able to shut down a running KeePassXC? It's kinda strange when it tells me that "some changes" can only be made when I reboot my machine.

@droidmonkey

This comment has been minimized.

Copy link
Member Author

droidmonkey commented Jan 11, 2020

It might!

@phoerious phoerious merged commit dc37537 into release/2.5.3 Jan 19, 2020
4 checks passed
4 checks passed
Code Format (KeepassXC) TeamCity build finished
Details
MacOS (KeepassXC) TeamCity build finished
Details
Ubuntu Linux (KeepassXC) TeamCity build finished
Details
Windows 10 (KeepassXC) TeamCity build finished
Details
@phoerious phoerious deleted the hotfix/close-app branch Jan 19, 2020
phoerious added a commit that referenced this pull request Jan 19, 2020
Fixed

- Fix a possible database lockout when removing a YubiKey from a KDBX 3.1 database [#4147]
- Fix crash if Auto-Type is performed on a new entry [#4150]
- Fix crash when all entries are deleted from a group [#4156]
- Improve the reliability of clipboard clearing on Gnome [#4165]
- Do not check cmd:// URLs for valid URL syntax anymore [#4172]
- Prevent unnecessary merges for databases on network shares [#4153]
- Browser: Prevent native messaging proxy from blocking application shutdown [#4155]
- Browser: Improve website URL matching [#4134, #4177]

Added

- Browser: Enable support for Chromium-based Edge Browser [#3359]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.