diff lib/https.c @ 169:d40f9db52cdf

2003-6-8 Brian Masney <[e-mail]> * lib/https.c lib/options.h lib/sslcommon.c - make sure USE_SSL is defined before using any SSL functions * lib/gftp.h lib/protocols.c lib/rfc2068.c lib/sshv2.c lib/sslcommon.c lib/rfc959.c - make sure we use request->datafd for the connection. Removed sockfd from gftp_request structure * lib/rfc959.c - add data_connection to rfc959_parms structure. Use this for the FTP data connection * src/text/gftp-text.c - fixes for username/password prompt * src/gtk/misc-gtk.c src/gtk/transfer.c - s/sockfd/datafd/g * configure.in - added lib/Makefile (forgot to commit last time) * Makefile.am - added intl to SUBDIRS

--- a/lib/https.c	Sun Jun 08 15:04:40 2003 +0000
+++ b/lib/https.c	Sun Jun 08 15:49:02 2003 +0000
@@ -22,6 +22,7 @@
 
 static const char cvsid[] = "$Id$";
 
+#ifdef USE_SSL
 static int
 https_get_next_file (gftp_request * request, gftp_file * fle, int fd)
 {
@@ -48,18 +49,21 @@
 
   return (ret);
 }
-
+#endif
 
 void
 https_register_module (void)
 {
+#ifdef USE_SSL
   gftp_ssl_startup (NULL); /* FIXME - take out of here */
+#endif
 }
 
 
 void
 https_init (gftp_request * request)
 {
+#ifdef USE_SSL
   rfc2068_params * params;
 
   g_return_if_fail (request != NULL);
@@ -72,5 +76,11 @@
   request->write_function = gftp_ssl_write;
   request->get_next_file = https_get_next_file;
   request->url_prefix = g_strdup ("https");
+#else
+  gftp_protocols[GFTP_HTTP_NUM].init (request);
+
+  request->logging_function (gftp_logging_error, request->user_data,
+                             _("HTTPS Support unavailable since SSL support was not compiled in. Reverting back to plaintext\n"));
+#endif
 }