Skip to content

Fix ensure-connection. #163

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

Merged
floitsch merged 2 commits into from
Aug 22, 2025
Merged

Fix ensure-connection. #163

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd34ff5
Fix ensure-connection.
floitsch Aug 22, 2025
c379ab8
Feedback.
floitsch Aug 22, 2025
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
14 changes: 10 additions & 4 deletions src/client.toit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,10 +709,16 @@ class Client:
if connection_ and connection_.is-open_:
if location.can-reuse-connection connection_.location_:
connection_.drain_ // Remove any remnants of previous requests.
return true
// Hostname etc. didn't match so we need a new connection.
connection_.close
connection_ = null
// The 'drain' may have closed the connection. Check again.
if connection_:
if connection_.is-open_:
return true
else:
connection_ = null
Copy link
Copy Markdown
Member

@kasperl kasperl Aug 22, 2025

Choose a reason for hiding this comment

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

Suggested change
if connection_:
if connection_.is-open_:
return true
else:
connection_ = null
if connection_.is-open_ and connection_.is-open_: return true
connection_ = null

Maybe also share the setting of connection_ = null with the following else part.

Copy link
Copy Markdown
Member Author

@floitsch floitsch Aug 22, 2025

Choose a reason for hiding this comment

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

done.

else:
// Hostname etc. didn't match so we need a new connection.
connection_.close
connection_ = null
socket/tcp.Socket := interface_.tcp-connect location.host location.port
if location.use-tls:
// Wrap the socket in TLS.
Expand Down
Loading