Attachment 152176 Details for Bug 295030 – Solution that works for me

[patch] Solution that works for me

patch_295030 (text/plain), 4.43 KB, created by John Cortell

on 2009-11-13 12:38:23 EST

(hide)

Description:

Filename:

MIME Type:

Creator: John Cortell

Created: 2009-11-13 12:38:23 EST

Size: 4.43 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ecf.provider.filetransfer
>Index: src/org/eclipse/ecf/provider/filetransfer/browse/AbstractFileSystemBrowser.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.ecf/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/AbstractFileSystemBrowser.java,v
>retrieving revision 1.12
>diff -u -r1.12 AbstractFileSystemBrowser.java
>--- src/org/eclipse/ecf/provider/filetransfer/browse/AbstractFileSystemBrowser.java	16 Mar 2009 21:37:39 -0000	1.12
>+++ src/org/eclipse/ecf/provider/filetransfer/browse/AbstractFileSystemBrowser.java	13 Nov 2009 17:40:56 -0000
>@@ -241,9 +241,22 @@
> 				// Only do this if platform service exists
> 				if (proxyService != null && proxyService.isProxiesEnabled()) {
> 					// Setup via proxyService entry
>-					URI target = new URI(directoryOrFile.toExternalForm());
>-					final IProxyData[] proxies = proxyService.select(target);
>-					IProxyData selectedProxy = selectProxyFromProxies(target.getScheme(), proxies);
>+					IProxyData selectedProxy = null;
>+					final IProxyData socksProxy = proxyService.getProxyData(IProxyData.SOCKS_PROXY_TYPE);
>+					if (socksProxy != null && socksProxy.getHost() != null) {
>+						// [bugzilla 295030] If the user has a SOCKS proxy
>+						// configured, use it regardless of the target's URI
>+						// scheme. The reason is that regardless of any factors,
>+						// we always use a SOCKS socket implementation and it
>+						// will always attempt to use the SOCKS server if one is
>+						// configured. If we're inconsistent here, things will
>+						// go awry at connect time.
>+						selectedProxy = socksProxy;
>+					} else {
>+						URI target = new URI(directoryOrFile.toExternalForm());
>+						final IProxyData[] proxies = proxyService.select(target);
>+						selectedProxy = selectProxyFromProxies(target.getScheme(), proxies);
>+					}
> 					if (selectedProxy != null) {
> 						proxy = new Proxy(((selectedProxy.getType().equalsIgnoreCase(IProxyData.SOCKS_PROXY_TYPE)) ? Proxy.Type.SOCKS : Proxy.Type.HTTP), new ProxyAddress(selectedProxy.getHost(), selectedProxy.getPort()), selectedProxy.getUserId(), selectedProxy.getPassword());
> 					}
>Index: src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.ecf/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java,v
>retrieving revision 1.48
>diff -u -r1.48 AbstractRetrieveFileTransfer.java
>--- src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java	26 Oct 2009 19:18:33 -0000	1.48
>+++ src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java	13 Nov 2009 17:40:56 -0000
>@@ -920,9 +920,22 @@
> 				// Only do this if platform service exists
> 				if (proxyService != null && proxyService.isProxiesEnabled()) {
> 					// Setup via proxyService entry
>-					URI target = new URI(getRemoteFileURL().toExternalForm());
>-					final IProxyData[] proxies = proxyService.select(target);
>-					IProxyData selectedProxy = selectProxyFromProxies(target.getScheme(), proxies);
>+					IProxyData selectedProxy = null;
>+					final IProxyData socksProxy = proxyService.getProxyData(IProxyData.SOCKS_PROXY_TYPE);
>+					if (socksProxy != null && socksProxy.getHost() != null) {
>+						// [bugzilla 295030] If the user has a SOCKS proxy
>+						// configured, use it regardless of the target's URI
>+						// scheme. The reason is that regardless of any factors,
>+						// we always use a SOCKS socket implementation and it
>+						// will always attempt to use the SOCKS server if one is
>+						// configured. If we're inconsistent here, things will
>+						// go awry at connect time.
>+						selectedProxy = socksProxy;
>+					} else {
>+						URI target = new URI(getRemoteFileURL().toExternalForm());
>+						final IProxyData[] proxies = proxyService.select(target);
>+						selectedProxy = selectProxyFromProxies(target.getScheme(), proxies);
>+					}
> 					if (selectedProxy != null) {
> 						proxy = new Proxy(((selectedProxy.getType().equalsIgnoreCase(IProxyData.SOCKS_PROXY_TYPE)) ? Proxy.Type.SOCKS : Proxy.Type.HTTP), new ProxyAddress(selectedProxy.getHost(), selectedProxy.getPort()), selectedProxy.getUserId(), selectedProxy.getPassword());
> 					}

Actions: View | Diff

Attachments on bug 295030: 152132 | 152176 | 152177 | 152212 | 157623 | 157652 | 157683 | 165828 | 165852 | 165981