Skip to content

Commit 9736ff6

Browse files
marco-cmarco-c
committed
Backed out 2 changesets (bug 1657582) for test_DNSLookup.js failures CLOSED TREE
Backed out changeset 784122a5f5ab (bug 1657582) Backed out changeset 0f17312b01ad (bug 1657582) UltraBlame original commit: 6a2b9be4ce0097d0d137e2184ec4576328ee292c
1 parent 5affb97 commit 9736ff6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2266
-1822
lines changed

‎browser/base/content/browser.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9071,13 +9071,7 @@ gDNSService
90719071
asyncResolve
90729072
(
90739073
hostName
9074-
Ci
9075-
.
9076-
nsIDNSService
9077-
.
9078-
RESOLVE_TYPE_DEFAULT
90799074
0
9080-
null
90819075
onLookupCompleteListener
90829076
Services
90839077
.

‎browser/components/doh/DoHHeuristics.jsm

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -614,15 +614,6 @@ name
614614
return
615615
;
616616
}
617-
inRecord
618-
.
619-
QueryInterface
620-
(
621-
Ci
622-
.
623-
nsIDNSAddrRecord
624-
)
625-
;
626617
if
627618
(
628619
resolveCanonicalName
@@ -749,13 +740,7 @@ gDNSService
749740
asyncResolve
750741
(
751742
hostname
752-
Ci
753-
.
754-
nsIDNSService
755-
.
756-
RESOLVE_TYPE_DEFAULT
757743
dnsFlags
758-
null
759744
listener
760745
null
761746
{

‎browser/components/doh/TRRPerformance.jsm

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -749,29 +749,19 @@ getRandomSubdomain
749749
;
750750
gDNSService
751751
.
752-
asyncResolve
752+
asyncResolveWithTrrServer
753753
(
754754
this
755755
.
756756
usedDomain
757-
Ci
758-
.
759-
nsIDNSService
757+
this
760758
.
761-
RESOLVE_TYPE_DEFAULT
759+
trrServer
762760
Ci
763761
.
764762
nsIDNSService
765763
.
766764
RESOLVE_BYPASS_CACHE
767-
gDNSService
768-
.
769-
newTRRResolverInfo
770-
(
771-
this
772-
.
773-
trrServer
774-
)
775765
this
776766
Services
777767
.
@@ -1137,13 +1127,6 @@ record
11371127
?
11381128
record
11391129
.
1140-
QueryInterface
1141-
(
1142-
Ci
1143-
.
1144-
nsIDNSAddrRecord
1145-
)
1146-
.
11471130
trrFetchDurationNetworkOnly
11481131
:
11491132
-

‎dom/html/nsHTMLDNSPrefetch.cpp

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -964,17 +964,12 @@ NS_ConvertUTF16toUTF8
964964
(
965965
hostname
966966
)
967-
nsIDNSService
968-
:
969-
:
970-
RESOLVE_TYPE_DEFAULT
971967
flags
972968
|
973969
nsIDNSService
974970
:
975971
:
976972
RESOLVE_SPECULATE
977-
nullptr
978973
sDNSListener
979974
nullptr
980975
aPartitionedPrincipalOriginAttributes
@@ -1046,7 +1041,7 @@ Unused
10461041
sDNSService
10471042
-
10481043
>
1049-
AsyncResolveNative
1044+
AsyncResolveByTypeNative
10501045
(
10511046
esniHost
10521047
nsIDNSService
@@ -1059,7 +1054,6 @@ nsIDNSService
10591054
:
10601055
:
10611056
RESOLVE_SPECULATE
1062-
nullptr
10631057
sDNSListener
10641058
nullptr
10651059
aPartitionedPrincipalOriginAttributes
@@ -1488,20 +1482,12 @@ NS_ConvertUTF16toUTF8
14881482
(
14891483
hostname
14901484
)
1491-
nsIDNSService
1492-
:
1493-
:
1494-
RESOLVE_TYPE_DEFAULT
14951485
flags
14961486
|
14971487
nsIDNSService
14981488
:
14991489
:
15001490
RESOLVE_SPECULATE
1501-
nullptr
1502-
/
1503-
/
1504-
resolverInfo
15051491
sDNSListener
15061492
aReason
15071493
aPartitionedPrincipalOriginAttributes
@@ -1555,7 +1541,7 @@ hostname
15551541
sDNSService
15561542
-
15571543
>
1558-
CancelAsyncResolveNative
1544+
CancelAsyncResolveByTypeNative
15591545
(
15601546
esniHost
15611547
nsIDNSService
@@ -1568,7 +1554,6 @@ nsIDNSService
15681554
:
15691555
:
15701556
RESOLVE_SPECULATE
1571-
nullptr
15721557
sDNSListener
15731558
aReason
15741559
aPartitionedPrincipalOriginAttributes
@@ -2527,10 +2512,6 @@ sDNSService
25272512
AsyncResolveNative
25282513
(
25292514
hostName
2530-
nsIDNSService
2531-
:
2532-
:
2533-
RESOLVE_TYPE_DEFAULT
25342515
mEntries
25352516
[
25362517
mTail
@@ -2542,7 +2523,6 @@ nsIDNSService
25422523
:
25432524
:
25442525
RESOLVE_SPECULATE
2545-
nullptr
25462526
sDNSListener
25472527
nullptr
25482528
oa
@@ -2602,7 +2582,7 @@ hostName
26022582
sDNSService
26032583
-
26042584
>
2605-
AsyncResolveNative
2585+
AsyncResolveByTypeNative
26062586
(
26072587
esniHost
26082588
nsIDNSService
@@ -2620,7 +2600,6 @@ nsIDNSService
26202600
:
26212601
:
26222602
RESOLVE_SPECULATE
2623-
nullptr
26242603
sDNSListener
26252604
nullptr
26262605
oa

‎extensions/auth/nsAuthSSPI.cpp

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,33 +1007,12 @@ rv
10071007
return
10081008
rv
10091009
;
1010-
nsCOMPtr
1011-
<
1012-
nsIDNSAddrRecord
1013-
>
1014-
rec
1015-
=
1016-
do_QueryInterface
1017-
(
1018-
record
1019-
)
1020-
;
1021-
if
1022-
(
1023-
!
1024-
rec
1025-
)
1026-
{
1027-
return
1028-
NS_ERROR_UNEXPECTED
1029-
;
1030-
}
10311010
nsAutoCString
10321011
cname
10331012
;
10341013
rv
10351014
=
1036-
rec
1015+
record
10371016
-
10381017
>
10391018
GetCanonicalName

‎media/mtransport/nriceresolver.cpp

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,12 +1135,7 @@ resource
11351135
>
11361136
domain_name
11371137
)
1138-
nsIDNSService
1139-
:
1140-
:
1141-
RESOLVE_TYPE_DEFAULT
11421138
resolve_flags
1143-
nullptr
11441139
pr
11451140
sts_thread_
11461141
attrs
@@ -1270,7 +1265,7 @@ nsICancelable
12701265
request
12711266
nsIDNSRecord
12721267
*
1273-
aRecord
1268+
record
12741269
nsresult
12751270
status
12761271
)
@@ -1361,22 +1356,8 @@ net
13611356
NetAddr
13621357
na
13631358
;
1364-
nsCOMPtr
1365-
<
1366-
nsIDNSAddrRecord
1367-
>
1368-
record
1369-
=
1370-
do_QueryInterface
1371-
(
1372-
aRecord
1373-
)
1374-
;
13751359
if
13761360
(
1377-
record
1378-
&
1379-
&
13801361
NS_SUCCEEDED
13811362
(
13821363
record

‎netwerk/base/Dashboard.cpp

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1168,26 +1168,12 @@ Value
11681168
(
11691169
)
11701170
;
1171-
nsCOMPtr
1172-
<
1173-
nsIDNSAddrRecord
1174-
>
1175-
record
1176-
=
1177-
do_QueryInterface
1178-
(
1179-
aRecord
1180-
)
1181-
;
11821171
if
11831172
(
11841173
NS_SUCCEEDED
11851174
(
11861175
mStatus
11871176
)
1188-
&
1189-
&
1190-
record
11911177
)
11921178
{
11931179
dict
@@ -1199,7 +1185,7 @@ true
11991185
bool
12001186
hasMore
12011187
;
1202-
record
1188+
aRecord
12031189
-
12041190
>
12051191
HasMore
@@ -1237,7 +1223,7 @@ NS_ERROR_OUT_OF_MEMORY
12371223
nsCString
12381224
nextAddressASCII
12391225
;
1240-
record
1226+
aRecord
12411227
-
12421228
>
12431229
GetNextAddrAsString
@@ -1252,7 +1238,7 @@ nextAddressASCII
12521238
nextAddress
12531239
)
12541240
;
1255-
record
1241+
aRecord
12561242
-
12571243
>
12581244
HasMore
@@ -4606,12 +4592,7 @@ mDnsService
46064592
AsyncResolveNative
46074593
(
46084594
aHost
4609-
nsIDNSService
4610-
:
4611-
:
4612-
RESOLVE_TYPE_DEFAULT
46134595
0
4614-
nullptr
46154596
helper
46164597
.
46174598
get

‎netwerk/base/NetworkConnectivityService.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -649,17 +649,12 @@ host
649649
nsIDNSService
650650
:
651651
:
652-
RESOLVE_TYPE_DEFAULT
653-
nsIDNSService
654-
:
655-
:
656652
RESOLVE_DISABLE_IPV6
657653
|
658654
nsIDNSService
659655
:
660656
:
661657
RESOLVE_DISABLE_TRR
662-
nullptr
663658
this
664659
NS_GetCurrentThread
665660
(
@@ -707,17 +702,12 @@ host
707702
nsIDNSService
708703
:
709704
:
710-
RESOLVE_TYPE_DEFAULT
711-
nsIDNSService
712-
:
713-
:
714705
RESOLVE_DISABLE_IPV4
715706
|
716707
nsIDNSService
717708
:
718709
:
719710
RESOLVE_DISABLE_TRR
720-
nullptr
721711
this
722712
NS_GetCurrentThread
723713
(

0 commit comments

Comments
 (0)