Closed Bug 1239655 Opened 5 years ago Closed 5 years ago

Do not do PR_ConnectContinue during shutdown

Categories

(Core :: Networking, defect)

defect
Not set
normal

Tracking

()

RESOLVED FIXED
mozilla46
Tracking Status
firefox46 --- fixed

People

(Reporter: dragana, Assigned: dragana)

References

Details

Attachments

(1 file, 2 obsolete files)

Assignee: nobody → dd.mozilla
Status: NEW → ASSIGNED
Blocks: 1152046
Attached patch bug_1239655.patch (obsolete) — Splinter Review
Attachment #8707847 - Flags: review?(mcmanus)
Comment on attachment 8707847 [details] [diff] [review]
bug_1239655.patch

Review of attachment 8707847 [details] [diff] [review]:
-----------------------------------------------------------------

::: netwerk/base/nsSocketTransport2.cpp
@@ +1890,5 @@
>  
> +        // We do not need to do PR_ConnectContinue when we are already
> +        // shutting down.
> +        if (gIOService->IsNetTearingDown()) {
> +            mCondition = NS_ERROR_ABORT;

this is a good find - thank you!

but how does this prevent continue connect from running?

shouldn't isNetTearingDown maybe imply a nspr failed return code for ContinueConnect and the normal logic can run afterwards?
Attached patch bug_1239655.patch (obsolete) — Splinter Review
Attachment #8707847 - Attachment is obsolete: true
Attachment #8707847 - Flags: review?(mcmanus)
Attachment #8707908 - Flags: review?(mcmanus)
Comment on attachment 8707908 [details] [diff] [review]
bug_1239655.patch

Review of attachment 8707908 [details] [diff] [review]:
-----------------------------------------------------------------

::: netwerk/base/nsSocketTransport2.cpp
@@ +1963,5 @@
>      }
> +    else if ((mState == STATE_CONNECTING) && gIOService->IsNetTearingDown()) {
> +        // We do not need to do PR_ConnectContinue when we are already
> +        // shutting down.
> +        mCondition = NS_ERROR_ABORT;

add a socket_log please
Attachment #8707908 - Flags: review?(mcmanus) → review+
Added a log.
Attachment #8707908 - Attachment is obsolete: true
Attachment #8707923 - Flags: review+
Keywords: checkin-needed
https://hg.mozilla.org/mozilla-central/rev/34a6488a7b20
Status: ASSIGNED → RESOLVED
Closed: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla46
You need to log in before you can comment on or make changes to this bug.