diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2016-03-14 17:36:04 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2016-04-19 13:54:19 +0200 |
| commit | 0d72f67f28d52b3d7fb2760484fb51c014273bb2 (patch) | |
| tree | 17e9de02338e01e47a1f9af84b62985991d0dacd /include/git2 | |
| parent | db01724fd969a7d01711e1b8e6f8d763873c9245 (diff) | |
| download | libgit2-0d72f67f28d52b3d7fb2760484fb51c014273bb2.tar.gz | |
proxy: don't specify the protocol in the type
We leave this up to the scheme in the url field. The type should only
tell us about whether we want a proxy and whether we want to auto-detect
it.
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/proxy.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/include/git2/proxy.h b/include/git2/proxy.h index b45b55b3b..dcd615633 100644 --- a/include/git2/proxy.h +++ b/include/git2/proxy.h @@ -18,6 +18,9 @@ GIT_BEGIN_DECL typedef enum { /** * Do not attempt to connect through a proxy + * + * If built against lbicurl, it itself may attempt to connect + * to a proxy if the environment variables specify it. */ GIT_PROXY_NONE, /** @@ -25,17 +28,9 @@ typedef enum { */ GIT_PROXY_AUTO, /** - * Connect through a HTTP proxy - */ - GIT_PROXY_HTTP, - /** - * Connect through a SOCKS v4 proxy - */ - GIT_PROXY_SOCKS4, - /** - * Connect through a SOCKS v5 proxy + * Connect via the URL given in the options */ - GIT_PROXY_SOCKS5, + GIT_PROXY_SPECIFIED, } git_proxy_t; /** |