diff options
| author | David Sommerseth | 2010-06-04 23:18:03 +0200 |
|---|---|---|
| committer | David Sommerseth | 2010-06-04 23:18:03 +0200 |
| commit | e0ca5fdf8f54c3c264fcb1ddaf0adbde212d858a (patch) | |
| tree | 202c201b860f996ccf754d3bfc256658c3694dc4 /syshead.h | |
| parent | 9ca155403ec72c7152bcb05c4bf8588c7cf2617b (diff) | |
| parent | 91f69a319d389f45a927b3d003efacc648a5dbc2 (diff) | |
| download | openvpn-e0ca5fdf8f54c3c264fcb1ddaf0adbde212d858a.zip openvpn-e0ca5fdf8f54c3c264fcb1ddaf0adbde212d858a.tar.gz | |
Merge branch 'master' into bugfix2.1
Diffstat (limited to 'syshead.h')
| -rw-r--r-- | syshead.h | 22 |
1 files changed, 18 insertions, 4 deletions
@@ -629,6 +629,22 @@ socket_defined (const socket_descriptor_t sd) #define ENABLE_INLINE_FILES 1 /* + * Support "connection" directive + */ +#if ENABLE_INLINE_FILES +#define ENABLE_CONNECTION 1 +#endif + +/* + * Should we include http proxy fallback functionality + */ +#if defined(ENABLE_CONNECTION) && defined(ENABLE_MANAGEMENT) && defined(ENABLE_HTTP_PROXY) +#define HTTP_PROXY_FALLBACK 1 +#else +#define HTTP_PROXY_FALLBACK 0 +#endif + +/* * Reduce sensitivity to system clock instability * and backtracks. */ @@ -651,10 +667,8 @@ socket_defined (const socket_descriptor_t sd) #endif /* - * Support "connection" directive + * Do we support pushing peer info? */ -#if ENABLE_INLINE_FILES -#define ENABLE_CONNECTION 1 -#endif +#define ENABLE_PUSH_PEER_INFO #endif |