LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-16 17:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proxy fixes

Browse Source
This commit is contained in:
Jindra Petk
2011-07-30 16:56:19 +02:00
parent fd853e51bf
commit f5a1451b9f
6 changed files with 66 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
trunk/libsrc/jpproxy/src/com/jpexs/proxy/Handler.java
View File

@@ -126,7 +126,7 @@ class Handler implements Runnable
}
catch(SSLHandshakeException she)
{
client.close();
she.printStackTrace();
break;
}
catch (IOException e)
@@ -136,7 +136,7 @@ class Handler implements Runnable
}
if(request.getCommand().equals("CONNECT")){
if(request.getCommand().equals("CONNECT")){
secureServer=request.getHost();
securePort=request.getPort();
if((ProxyConfig.httpsMode==ProxyConfig.HTTPS_FILTER)||((ProxyConfig.httpsMode==ProxyConfig.HTTPS_FILTERLIST)&&(ProxyConfig.enabledHttpsServers.contains(secureServer)))){
@@ -392,7 +392,24 @@ class Handler implements Runnable
if((ProxyConfig.httpsMode==ProxyConfig.HTTPS_FILTER)||((ProxyConfig.httpsMode==ProxyConfig.HTTPS_FILTERLIST)&&(ProxyConfig.enabledHttpsServers.contains(secureHost))))
{
http=Https.open(secureHost,securePort,ProxyConfig.useHTTPSProxy);
if(ProxyConfig.useHTTPSProxy){
http=Https.open(ProxyConfig.httpsProxyHost,ProxyConfig.httpsProxyPort,true);
Request connectReq=new Request(null);
connectReq.setStatusLine("CONNECT "+secureHost+":"+securePort+" HTTP/1.1");
connectReq.setCommand("CONNECT");
connectReq.setURL(secureHost+":"+securePort);
connectReq.setProtocol("HTTP/1.1");
try {
http.sendRequest(connectReq);
Reply rep=http.recvReply(connectReq);
} catch (RetryRequestException ex) {
}
((Https)http).promoteToClientSSL();
}else{
http=Https.open(secureHost,securePort,false);
((Https)http).promoteToClientSSL();
}
/*http = new Http(request.getHost(),request.getPort(),ProxyConfig.useHTTPSProxy);
if(ProxyConfig.useHTTPSProxy){
Request connectReq=new Request(client);