summaryrefslogtreecommitdiff
path: root/include/git2/proxy.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/git2/proxy.h')
-rw-r--r--include/git2/proxy.h15
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;
/**