Skip to content

Commit

Permalink
Backed out 3 changesets (bug 1820807, bug 1853025, bug 1848763) for c…
Browse files Browse the repository at this point in the history
…ausing frequent network-related startup crashes (bug 1853231). a=backout

Backed out changeset 92d80b858050 (bug 1848763)
Backed out changeset c08cba545d2c (bug 1853025)
Backed out changeset 2fae28575ca8 (bug 1820807)

UltraBlame original commit: f4b0e304ecebf431616ce014dd198c1d361b37c1
  • Loading branch information
marco-c committed Sep 15, 2023
1 parent 7236d20 commit e311afc
Show file tree
Hide file tree
Showing 13 changed files with 520 additions and 2,194 deletions.
30 changes: 0 additions & 30 deletions modules/libpref/init/StaticPrefList.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68424,36 +68424,6 @@ mirror
:
always
#
whether
to
redirect
the
channel
for
auth
redirects
.
See
Bug
1820807
-
name
:
network
.
auth
.
use_redirect_for_retries
type
:
RelaxedAtomicBool
value
:
IS_EARLY_BETA_OR_EARLIER
mirror
:
always
#
Whether
to
allow
Expand Down
72 changes: 0 additions & 72 deletions netwerk/base/nsIChannelEventSink.idl
Original file line number Diff line number Diff line change
Expand Up @@ -440,78 +440,6 @@ REDIRECT_STS_UPGRADE
*
*
*
This
is
a
internal
redirect
used
to
handle
http
authentication
retries
.
*
Upon
receiving
a
401
or
407
the
channel
gets
redirected
to
a
new
channel
*
(
same
URL
)
that
performs
the
request
with
the
appropriate
credentials
.
*
Auth
retry
to
the
server
must
be
made
after
redirecting
to
a
new
channel
*
/
const
unsigned
long
REDIRECT_AUTH_RETRY
=
1
<
<
4
;
/
*
*
*
Called
when
a
Expand Down
46 changes: 0 additions & 46 deletions netwerk/protocol/http/HttpBaseChannel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35858,52 +35858,6 @@ REDIRECT_INTERNAL
{
/
/
for
internal
redirect
due
to
auth
retry
we
do
not
have
any
limit
/
/
as
we
might
restrict
the
number
of
times
a
user
might
retry
/
/
authentication
if
(
aRedirectFlags
&
nsIChannelEventSink
:
:
REDIRECT_AUTH_RETRY
)
{
return
NS_OK
;
}
/
/
Some
platform
features
Expand Down
83 changes: 7 additions & 76 deletions netwerk/protocol/http/HttpChannelParent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11845,27 +11845,6 @@ return
NS_OK
;
}
bool
HttpChannelParent
:
:
IsRedirectDueToAuthRetry
(
uint32_t
redirectFlags
)
{
return
(
redirectFlags
&
nsIChannelEventSink
:
:
REDIRECT_AUTH_RETRY
)
;
}
/
/
-
Expand Down Expand Up @@ -12173,37 +12152,28 @@ for
service
worker
interception
or
then
/
/
internal
redirect
due
to
auth
retries
then
hide
it
from
the
child
/
/
process
.
The
original
e10s
interception
code
/
/
was
not
designed
with
this
/
/
in
mind
and
Expand All @@ -12212,12 +12182,12 @@ not
necessary
to
replace
/
/
the
HttpChannelChild
/
Parent
/
/
objects
in
this
Expand Down Expand Up @@ -12268,8 +12238,6 @@ newChannel
;
/
/
1
.
We
only
want
Expand All @@ -12278,18 +12246,14 @@ hide
the
special
internal
redirects
redirect
from
nsHttpChannel
/
/
nsHttpChannel
to
InterceptedHttpChannel
.
/
/
2
.
We
want
to
Expand Down Expand Up @@ -12333,31 +12297,6 @@ reset
/
case
.
/
/
3
.
If
this
is
an
internal
redirect
due
to
auth
retry
then
we
will
/
/
hide
it
from
the
child
process
if
(
(
Expand All @@ -12384,14 +12323,6 @@ IsReset
(
)
)
|
|
(
IsRedirectDueToAuthRetry
(
redirectFlags
)
)
)
{
/
Expand Down
7 changes: 0 additions & 7 deletions netwerk/protocol/http/HttpChannelParent.h
Original file line number Diff line number Diff line change
Expand Up @@ -1633,13 +1633,6 @@ NeedFlowControl
(
)
;
bool
IsRedirectDueToAuthRetry
(
uint32_t
redirectFlags
)
;
int32_t
mSendWindowSize
;
Expand Down
12 changes: 6 additions & 6 deletions netwerk/protocol/http/HttpTransactionChild.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3261,12 +3261,6 @@ GetSupportsHTTP3
)
mode
reason
mTransaction
-
>
Caps
(
)
)
;
return
Expand Down Expand Up @@ -3790,6 +3784,12 @@ Timings
responseTrailers
mTransactionObserverResult
lastActTabOpt
mTransaction
-
>
Caps
(
)
infoArgs
)
;
Expand Down
Loading

0 comments on commit e311afc

Please sign in to comment.