Description: ------------ cURL supports HTTP and socks5 proxies. This patch adds this feature to the adapter: https://gist.github.com/2040668 A new configuration value: proxy_type Supported values: 'http', 'socks5'. Throws exceptions in case un-supported value is passed or the version of cURL doesn't support it. Version number was taken from the PHP manual: http://docs.php.net/manual/en/function.curl-setopt.php (see CURLOPT PROXYTYPE) Let me know what you think. Till

I don't want to add features that are supported by one adapter only. Can you estimate what will it take to add SOCKS support to Socket adapter?

I briefly looked at the socket adapeter but didn't dive into it. I know that stream_context_create() supports a proxy directive: http://www.php.net/manual/en/context.http.php I'm not sure what kind of proxy this is though. It seems like it's a simple tcp transport, so it could be socks5 too but I haven't tried it. I'll try to remember when I get to work to write a test script. Till

Too briefly, I should say. Socket adapter does not use 'http' transport, it is a pure PHP implementation of HTTP protocol.

Out of curiosity, why are you against specialisation in certain adapters? Or would you be more comfortable with a HTTP_Request2_CurlProxyAdapter that is obviously specialised?

Because. I won't.

I can't figure out if the socket adapter (through stream_context_create()) even has the potential to support socks5 proxies. Not sure how you would build that in userland if it didn't. I'd second the CurlProxyAdapter thing as well – we could extend the curl adapter for it to work and not add more maintenance.

Your suggestion is extremely valuable to me. However, the feedback I specifically asked for would be even more valuable.

Looks like SOCKS5 protocol is pretty simple [1] and there are a few PHP implementations available [2], [3] Connection can be done in a way similar to HTTP_Request2_Adapter_Socket::establishTunnel(), probably using a separate HTTP_Request2_SOCKS5 class, Adapter_Socket is pretty bloated as it is. [1] http://www.faqs.org/rfcs/rfc1928.html [2] http://www.phpkode.com/source/s/socks5/socks5/class.socks5.php [3] http://forum.antichat.ru/printthread.php?t=57030

Curl version check in https://gist.github.com/2040668 is redundant: > PHP 5.0.0 requires a libcurl version 7.10.5 or greater. http://ru.php.net/manual/en/curl.requirements.php

Gist updated (removed cURL-version-check): https://gist.github.com/2040668

I've committed 'socks5' proxy support for both Curl and Socket adapters. Please test! Need to do some refactoring though, Adapter_Socket::connect() is 150 lines long and I have trouble understanding it myself... Also SOCKS5 class uses the same wrappers as Adapter_Socket, these should probably be extracted into a separate old-Net_Socket-like class.

This bug has been fixed in SVN. If this was a documentation problem, the fix will appear on pear.php.net by the end of next Sunday (CET). If this was a problem with the pear.php.net website, the change should be live shortly. Otherwise, the fix will appear in the package's next release. Thank you for the report and for helping us make PEAR better. -- Did some refactoring, all socket-wrapping code is now in separate class.