Merge branch 'bug/ssl-init'

This commit is contained in:
Tatsuya Kinoshita
2014-10-15 18:15:02 +09:00

4
fm.h
View File

@@ -1159,7 +1159,7 @@ global int view_unseenobject init(TRUE);
#endif #endif
#if defined(USE_SSL) && defined(USE_SSL_VERIFY) #if defined(USE_SSL) && defined(USE_SSL_VERIFY)
global int ssl_verify_server init(FALSE); global int ssl_verify_server init(TRUE);
global char *ssl_cert_file init(NULL); global char *ssl_cert_file init(NULL);
global char *ssl_key_file init(NULL); global char *ssl_key_file init(NULL);
global char *ssl_ca_path init(NULL); global char *ssl_ca_path init(NULL);
@@ -1168,7 +1168,7 @@ global int ssl_path_modified init(FALSE);
#endif /* defined(USE_SSL) && #endif /* defined(USE_SSL) &&
* defined(USE_SSL_VERIFY) */ * defined(USE_SSL_VERIFY) */
#ifdef USE_SSL #ifdef USE_SSL
global char *ssl_forbid_method init(NULL); global char *ssl_forbid_method init("2, 3");
#endif #endif
global int is_redisplay init(FALSE); global int is_redisplay init(FALSE);