Skip to content

https protocol和Hession冲突 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zjulbj merged 4 commits into from
Apr 21, 2017
Merged

https protocol和Hession冲突 #1

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
202ceac
支持https close #299
Apr 20, 2017
64c8c9b
fix https protocol和Hession冲突
Apr 21, 2017
a8acd6f
Merge pull request #1 from QuVideo/rest-https-feature
zjulbj Apr 21, 2017
8c06ecc
Merge branch 'master' into master
zjulbj Apr 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RestProtocol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ public class RestProtocol extends AbstractProxyProtocol {

private static final int DEFAULT_PORT = 80;

private static final String HTTP_PROTOCOL = "protocol";

private static final String DEFAULT_HTTP_PROTOCOL = "http";

private final Map<String, RestServer> servers = new ConcurrentHashMap<String, RestServer>();

private final RestServerFactory serverFactory = new RestServerFactory();
Expand Down Expand Up @@ -184,9 +188,9 @@ public long getKeepAliveDuration(HttpResponse response, HttpContext context) {

ResteasyWebTarget target;
if(url.getPort() == 0){
target = client.target(url.getProtocol() + "://" + url.getHost() + "/" + getContextPath(url));
target = client.target(url.getParameter(HTTP_PROTOCOL,DEFAULT_HTTP_PROTOCOL) + "://" + url.getHost() + "/" + getContextPath(url));
} else {
target = client.target(url.getProtocol() + "://" + url.getHost() + ":" + url.getPort() + "/" + getContextPath(url));
target = client.target(url.getParameter(HTTP_PROTOCOL,DEFAULT_HTTP_PROTOCOL) + "://" + url.getHost() + ":" + url.getPort() + "/" + getContextPath(url));
}
return target.proxy(serviceType);
}
Expand Down