Skip to content

Commit 27e88cc

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 6099bca commit 27e88cc

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

+2291
-1581
lines changed

‎browser/base/content/browser.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7201,13 +7201,7 @@ gDNSService
72017201
asyncResolve
72027202
(
72037203
hostName
7204-
Ci
7205-
.
7206-
nsIDNSService
7207-
.
7208-
RESOLVE_TYPE_DEFAULT
72097204
0
7210-
null
72117205
onLookupCompleteListener
72127206
Services
72137207
.

‎browser/components/doh/DoHHeuristics.jsm

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -476,15 +476,6 @@ name
476476
return
477477
;
478478
}
479-
inRecord
480-
.
481-
QueryInterface
482-
(
483-
Ci
484-
.
485-
nsIDNSAddrRecord
486-
)
487-
;
488479
if
489480
(
490481
resolveCanonicalName
@@ -595,13 +586,7 @@ gDNSService
595586
asyncResolve
596587
(
597588
hostname
598-
Ci
599-
.
600-
nsIDNSService
601-
.
602-
RESOLVE_TYPE_DEFAULT
603589
dnsFlags
604-
null
605590
listener
606591
null
607592
{

‎browser/components/doh/TRRPerformance.jsm

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -447,29 +447,19 @@ getRandomSubdomain
447447
;
448448
gDNSService
449449
.
450-
asyncResolve
450+
asyncResolveWithTrrServer
451451
(
452452
this
453453
.
454454
usedDomain
455-
Ci
456-
.
457-
nsIDNSService
455+
this
458456
.
459-
RESOLVE_TYPE_DEFAULT
457+
trrServer
460458
Ci
461459
.
462460
nsIDNSService
463461
.
464462
RESOLVE_BYPASS_CACHE
465-
gDNSService
466-
.
467-
newTRRResolverInfo
468-
(
469-
this
470-
.
471-
trrServer
472-
)
473463
this
474464
Services
475465
.
@@ -760,13 +750,6 @@ record
760750
?
761751
record
762752
.
763-
QueryInterface
764-
(
765-
Ci
766-
.
767-
nsIDNSAddrRecord
768-
)
769-
.
770753
trrFetchDurationNetworkOnly
771754
:
772755
-

‎dom/html/nsHTMLDNSPrefetch.cpp

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -801,17 +801,12 @@ NS_ConvertUTF16toUTF8
801801
(
802802
hostname
803803
)
804-
nsIDNSService
805-
:
806-
:
807-
RESOLVE_TYPE_DEFAULT
808804
flags
809805
|
810806
nsIDNSService
811807
:
812808
:
813809
RESOLVE_SPECULATE
814-
nullptr
815810
sDNSListener
816811
nullptr
817812
aPartitionedPrincipalOriginAttributes
@@ -875,7 +870,7 @@ Unused
875870
sDNSService
876871
-
877872
>
878-
AsyncResolveNative
873+
AsyncResolveByTypeNative
879874
(
880875
esniHost
881876
nsIDNSService
@@ -888,7 +883,6 @@ nsIDNSService
888883
:
889884
:
890885
RESOLVE_SPECULATE
891-
nullptr
892886
sDNSListener
893887
nullptr
894888
aPartitionedPrincipalOriginAttributes
@@ -1265,17 +1259,12 @@ NS_ConvertUTF16toUTF8
12651259
(
12661260
hostname
12671261
)
1268-
nsIDNSService
1269-
:
1270-
:
1271-
RESOLVE_TYPE_DEFAULT
12721262
flags
12731263
|
12741264
nsIDNSService
12751265
:
12761266
:
12771267
RESOLVE_SPECULATE
1278-
nullptr
12791268
sDNSListener
12801269
aReason
12811270
aPartitionedPrincipalOriginAttributes
@@ -1320,7 +1309,7 @@ hostname
13201309
sDNSService
13211310
-
13221311
>
1323-
CancelAsyncResolveNative
1312+
CancelAsyncResolveByTypeNative
13241313
(
13251314
esniHost
13261315
nsIDNSService
@@ -1333,7 +1322,6 @@ nsIDNSService
13331322
:
13341323
:
13351324
RESOLVE_SPECULATE
1336-
nullptr
13371325
sDNSListener
13381326
aReason
13391327
aPartitionedPrincipalOriginAttributes
@@ -2034,10 +2022,6 @@ sDNSService
20342022
AsyncResolveNative
20352023
(
20362024
hostName
2037-
nsIDNSService
2038-
:
2039-
:
2040-
RESOLVE_TYPE_DEFAULT
20412025
mEntries
20422026
[
20432027
mTail
@@ -2049,7 +2033,6 @@ nsIDNSService
20492033
:
20502034
:
20512035
RESOLVE_SPECULATE
2052-
nullptr
20532036
sDNSListener
20542037
nullptr
20552038
oa
@@ -2101,7 +2084,7 @@ hostName
21012084
sDNSService
21022085
-
21032086
>
2104-
AsyncResolveNative
2087+
AsyncResolveByTypeNative
21052088
(
21062089
esniHost
21072090
nsIDNSService
@@ -2119,7 +2102,6 @@ nsIDNSService
21192102
:
21202103
:
21212104
RESOLVE_SPECULATE
2122-
nullptr
21232105
sDNSListener
21242106
nullptr
21252107
oa

‎extensions/auth/nsAuthSSPI.cpp

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -434,33 +434,12 @@ rv
434434
return
435435
rv
436436
;
437-
nsCOMPtr
438-
<
439-
nsIDNSAddrRecord
440-
>
441-
rec
442-
=
443-
do_QueryInterface
444-
(
445-
record
446-
)
447-
;
448-
if
449-
(
450-
!
451-
rec
452-
)
453-
{
454-
return
455-
NS_ERROR_UNEXPECTED
456-
;
457-
}
458437
nsAutoCString
459438
cname
460439
;
461440
rv
462441
=
463-
rec
442+
record
464443
-
465444
>
466445
GetCanonicalName

‎media/mtransport/nriceresolver.cpp

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -687,12 +687,7 @@ resource
687687
>
688688
domain_name
689689
)
690-
nsIDNSService
691-
:
692-
:
693-
RESOLVE_TYPE_DEFAULT
694690
resolve_flags
695-
nullptr
696691
pr
697692
sts_thread_
698693
attrs
@@ -754,7 +749,7 @@ nsICancelable
754749
request
755750
nsIDNSRecord
756751
*
757-
aRecord
752+
record
758753
nsresult
759754
status
760755
)
@@ -792,22 +787,8 @@ net
792787
NetAddr
793788
na
794789
;
795-
nsCOMPtr
796-
<
797-
nsIDNSAddrRecord
798-
>
799-
record
800-
=
801-
do_QueryInterface
802-
(
803-
aRecord
804-
)
805-
;
806790
if
807791
(
808-
record
809-
&
810-
&
811792
NS_SUCCEEDED
812793
(
813794
record

‎netwerk/base/Dashboard.cpp

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,26 +1112,12 @@ Value
11121112
(
11131113
)
11141114
;
1115-
nsCOMPtr
1116-
<
1117-
nsIDNSAddrRecord
1118-
>
1119-
record
1120-
=
1121-
do_QueryInterface
1122-
(
1123-
aRecord
1124-
)
1125-
;
11261115
if
11271116
(
11281117
NS_SUCCEEDED
11291118
(
11301119
mStatus
11311120
)
1132-
&
1133-
&
1134-
record
11351121
)
11361122
{
11371123
dict
@@ -1143,7 +1129,7 @@ true
11431129
bool
11441130
hasMore
11451131
;
1146-
record
1132+
aRecord
11471133
-
11481134
>
11491135
HasMore
@@ -1181,7 +1167,7 @@ NS_ERROR_OUT_OF_MEMORY
11811167
nsCString
11821168
nextAddressASCII
11831169
;
1184-
record
1170+
aRecord
11851171
-
11861172
>
11871173
GetNextAddrAsString
@@ -1196,7 +1182,7 @@ nextAddressASCII
11961182
nextAddress
11971183
)
11981184
;
1199-
record
1185+
aRecord
12001186
-
12011187
>
12021188
HasMore
@@ -4528,12 +4514,7 @@ mDnsService
45284514
AsyncResolveNative
45294515
(
45304516
aHost
4531-
nsIDNSService
4532-
:
4533-
:
4534-
RESOLVE_TYPE_DEFAULT
45354517
0
4536-
nullptr
45374518
helper
45384519
.
45394520
get

‎netwerk/base/NetworkConnectivityService.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -588,17 +588,12 @@ host
588588
nsIDNSService
589589
:
590590
:
591-
RESOLVE_TYPE_DEFAULT
592-
nsIDNSService
593-
:
594-
:
595591
RESOLVE_DISABLE_IPV6
596592
|
597593
nsIDNSService
598594
:
599595
:
600596
RESOLVE_DISABLE_TRR
601-
nullptr
602597
this
603598
NS_GetCurrentThread
604599
(
@@ -646,17 +641,12 @@ host
646641
nsIDNSService
647642
:
648643
:
649-
RESOLVE_TYPE_DEFAULT
650-
nsIDNSService
651-
:
652-
:
653644
RESOLVE_DISABLE_IPV4
654645
|
655646
nsIDNSService
656647
:
657648
:
658649
RESOLVE_DISABLE_TRR
659-
nullptr
660650
this
661651
NS_GetCurrentThread
662652
(

0 commit comments

Comments
 (0)