Skip to content

Commit e6fc85a

Browse files
authored
(150128868) Restore selective nil path behavior for bridged NSURLs (#1278)
1 parent e8ce4a6 commit e6fc85a

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

Sources/FoundationEssentials/URL/URL_Swift.swift

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,12 +1176,14 @@ extension _SwiftURL {
11761176
ranges.append(CFRange(location: nsRange.location, length: nsRange.length))
11771177
}
11781178

1179-
flags.insert(.hasPath)
1180-
if let pathRange = parseInfo.pathRange {
1181-
let nsRange = string._toRelativeNSRange(pathRange)
1182-
ranges.append(CFRange(location: nsRange.location, length: nsRange.length))
1183-
} else {
1184-
ranges.append(CFRange(location: kCFNotFound, length: 0))
1179+
if !parseInfo.path.isEmpty || parseInfo.netLocationRange?.isEmpty == false {
1180+
flags.insert(.hasPath)
1181+
if let pathRange = parseInfo.pathRange {
1182+
let nsRange = string._toRelativeNSRange(pathRange)
1183+
ranges.append(CFRange(location: nsRange.location, length: nsRange.length))
1184+
} else {
1185+
ranges.append(CFRange(location: kCFNotFound, length: 0))
1186+
}
11851187
}
11861188

11871189
if let queryRange = parseInfo.queryRange {

0 commit comments

Comments
 (0)