Merge pull request #2158 from Xwite/master

'fix(AnalyzeUrl): skip analyze when mUrl is DataURL'
This commit is contained in:
kunfei authored and GitHub committed 2022-08-12 23:09:12 +08:00
commit 937929e6c1
2 files changed
+9 -11

No files matched your search

@@ -72,18 +72,16 @@ class AnalyzeUrl(
private val enabledCookieJar = source?.enabledCookieJar ?: false
init {
if (!mUrl.isDataUrl()) {
val urlMatcher = paramPattern.matcher(baseUrl)
if (urlMatcher.find()) baseUrl = baseUrl.substring(0, urlMatcher.start())
(headerMapF ?: source?.getHeaderMap(true))?.let {
headerMap.putAll(it)
if (it.containsKey("proxy")) {
proxy = it["proxy"]
headerMap.remove("proxy")
}
val urlMatcher = paramPattern.matcher(baseUrl)
if (urlMatcher.find()) baseUrl = baseUrl.substring(0, urlMatcher.start())
(headerMapF ?: source?.getHeaderMap(true))?.let {
headerMap.putAll(it)
if (it.containsKey("proxy")) {
proxy = it["proxy"]
headerMap.remove("proxy")
}
initUrl()
}
initUrl()
}
/**