Move definition of conn/globals.h back into globals.h (#912)

Fixed #907

diff --git a/conn/conn_globals.c b/conn/conn_globals.c
index 2f8ef5115f5a500c974d825a16c0f6a031e1c6d7..b8838e2f0a807501e87110919174f787516d6701 100644 (file)
--- a/conn/conn_globals.c
+++ b/conn/conn_globals.c
@@ -40,6 +40,7 @@
 
 #include "config.h"
 
+#if 0
 short ConnectTimeout; /**< Config: $connect_timeout */
 
 #ifdef USE_SSL
@@ -57,3 +58,4 @@ short SslMinDhPrimeBits;           /**< Config: $ssl_min_dh_prime_bits */
 const char *Preconnect; /**< Config: $preconnect */
 const char *Tunnel;     /**< Config: $tunnel */
 #endif                  /* USE_SOCKET */
+#endif

diff --git a/globals.h b/globals.h
index 5fd8e97badac1b06b6f74dc0d17ae729673cb680..d4a8355b0c8f904a051c89a17f200ac64b41e24c 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -326,6 +326,26 @@ WHERE int NmQueryWindowCurrentPosition;
 WHERE char *NmQueryWindowCurrentSearch;
 #endif
 
+#if 1
+WHERE short ConnectTimeout;
+
+#ifdef USE_SSL
+WHERE const char *CertificateFile;
+WHERE const char *EntropyFile;
+WHERE const char *SslCiphers;
+WHERE const char *SslClientCert;
+#ifdef USE_SSL_GNUTLS
+WHERE const char *SslCaCertificatesFile;
+WHERE short SslMinDhPrimeBits;
+#endif
+#endif
+
+#ifdef USE_SOCKET
+WHERE const char *Preconnect;
+WHERE const char *Tunnel;
+#endif
+#endif
+
 #ifdef MAIN_C
 const char *const BodyTypes[] = {
     "x-unknown", "audio",     "application", "image", "message",