Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
rbri committed Aug 7, 2024
1 parent 64eab8a commit 8a80726
Showing 1 changed file with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -668,13 +668,14 @@ public void open(final String method, final Object urlParam, final Object asyncP
final HtmlPage containingPage = (HtmlPage) getWindow().getWebWindow().getEnclosedPage();

try {
final URL pageUrl = containingPage.getUrl();
final URL fullUrl = containingPage.getFullyQualifiedUrl(url);
final WebRequest request = new WebRequest(fullUrl, getBrowserVersion().getXmlHttpRequestAcceptHeader(),
getBrowserVersion().getAcceptEncodingHeader());
request.setCharset(UTF_8);
// https://xhr.spec.whatwg.org/#response-body
request.setDefaultResponseContentCharset(UTF_8);
request.setRefererHeader(containingPage.getUrl());
request.setRefererHeader(pageUrl);

try {
request.setHttpMethod(HttpMethod.valueOf(method.toUpperCase(Locale.ROOT)));
Expand All @@ -686,16 +687,15 @@ public void open(final String method, final Object urlParam, final Object asyncP
return;
}

final URL pageRequestUrl = containingPage.getUrl();
isSameOrigin_ = isSameOrigin(pageRequestUrl, fullUrl);
isSameOrigin_ = isSameOrigin(pageUrl, fullUrl);
final boolean alwaysAddOrigin = HttpMethod.GET != request.getHttpMethod()
&& HttpMethod.PATCH != request.getHttpMethod()
&& HttpMethod.HEAD != request.getHttpMethod();
if (alwaysAddOrigin || !isSameOrigin_) {
final StringBuilder origin = new StringBuilder().append(pageRequestUrl.getProtocol()).append("://")
.append(pageRequestUrl.getHost());
if (pageRequestUrl.getPort() != -1) {
origin.append(':').append(pageRequestUrl.getPort());
final StringBuilder origin = new StringBuilder().append(pageUrl.getProtocol()).append("://")
.append(pageUrl.getHost());
if (pageUrl.getPort() != -1) {
origin.append(':').append(pageUrl.getPort());
}
request.setAdditionalHeader(HttpHeader.ORIGIN, origin.toString());
}
Expand Down

0 comments on commit 8a80726

Please sign in to comment.