Skip to content

WebInputStream: Honour a cancel that arrives while the macOS task is being created #1748

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

Closed
jdf wants to merge 1 commit into from
Closed

WebInputStream: Honour a cancel that arrives while the macOS task is being created #1748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions modules/juce_core/native/juce_Network_mac.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ void cancel()
void cancel()
{
const std::scoped_lock lock { mutex };
cancelled = true;
token.cancel();
}

Expand Down Expand Up @@ -423,6 +424,14 @@ bool start (WebInputStream& inputStream, WebInputStream::Listener* listener)
std::unique_lock lock { mutex };
token = std::move (newToken);

// A cancel that arrived while the task was being created found
// an empty token; it is honoured here, before anything waits.
if (cancelled)
{
token.cancel();
return false;
}

while (! condvar.wait_for (lock,
std::chrono::milliseconds { 1 },
[&] { return state != State::beforeStart; }))
Expand Down Expand Up @@ -544,6 +553,7 @@ void willPerformHTTPRedirection (NSURLRequest* urlRequest, void (^completionHand
int statusCode = 0;
int numRedirects = 0;
State state = State::beforeStart;
bool cancelled = false;

SharedResourcePointer<SharedSession> session;
TaskToken token;
Expand Down