- add -k / --insecure-ssl

- update man page and ChangeLog

6 files changed, 22 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a4436bd..05ec838 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+* 0.4.0j	24.06.2008	Johannes Winkelmann
+- add gcc 4.3 fixes by Fredrik Rinnestam
+- add "[options]" to man page   ]
+- add --insecure-ssl/-k option  ] Suggested by Jose Beneyto
+
 * 0.4.0i	15.04.2006	Johannes Winkelmann
 - Remove directories again (regression from 4.0h)
 - improve some compilation issues reported by Han
diff --git a/Makefile b/Makefile
index 0113801..7f1bc79 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 name=httpup
-version=0.4.0i
+version=0.4.0j-pre
 
 prefix=		/usr/local
 bindir=		$(prefix)/bin
diff --git a/httpup.8 b/httpup.8
index d25ae61..8d47278 100644
--- a/httpup.8
+++ b/httpup.8
@@ -8,7 +8,7 @@
 httpup \- an md5sum based one way synchronisation tool for http file
 repositories
 .SH "SYNOPSIS"
-.B httpup <command> URL target
+.B httpup [options] <command> URL target
 
 .SH "DESCRIPTION"
 httpup performs a one way synchronisation of files published over
@@ -49,6 +49,8 @@ Alternative name for the remote REPO file
 .B --encode, -e:
 URL encode filenames
 
+.B --insecure-ssl, -k
+Ignore SSL certificates when downloading from an HTTPS host
 
 .SH "CONFIGURATION"
 In order to specify proxy server and proxy authentication information, httpup
diff --git a/httpup.cpp b/httpup.cpp
index 9b30999..56f1293 100644
--- a/httpup.cpp
+++ b/httpup.cpp
@@ -231,6 +231,10 @@ int HttpUp::exec(ExecType type)
     curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errorBuffer);
     curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
     curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+    if (m_argParser.isSet(HttpupArgparser::OPT_INSECURE_SSL)) {
+        curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false);
+    }
+
 
     long timeout = DEFAULT_TIMEOUT;
     if (config.operationTimeout != "") {
diff --git a/httpupargparser.cpp b/httpupargparser.cpp
index d52c883..573d293 100644
--- a/httpupargparser.cpp
+++ b/httpupargparser.cpp
@@ -19,6 +19,7 @@ ArgParser::APCmd HttpupArgparser::CMD_LIST;
 ArgParser::APOpt HttpupArgparser::OPT_REPOFILE;
 ArgParser::APOpt HttpupArgparser::OPT_ENCODE;
 ArgParser::APOpt HttpupArgparser::OPT_VERIFY_MD5;
+ArgParser::APOpt HttpupArgparser::OPT_INSECURE_SSL;
 
 
 HttpupArgparser::HttpupArgparser()
@@ -42,9 +43,13 @@ HttpupArgparser::HttpupArgparser()
                     'm',
                     "verify md5sum of downloaded files");
 
+    OPT_INSECURE_SSL.init("insecure-ssl",
+                          'k',
+                          "Don't verify the SSL certificate of the server");
     addOption(CMD_SYNC, OPT_REPOFILE, false);
     addOption(CMD_SYNC, OPT_ENCODE, false);
     addOption(CMD_SYNC, OPT_VERIFY_MD5, false);
+    addOption(CMD_SYNC, OPT_INSECURE_SSL, false);
 
 
     // - copy
@@ -53,11 +58,13 @@ HttpupArgparser::HttpupArgparser()
                ArgParser::EQ, 2, "<url> <target dir>");
     addOption(CMD_COPY, OPT_REPOFILE, false);
     addOption(CMD_COPY, OPT_ENCODE, false);
-    addOption(CMD_SYNC, OPT_VERIFY_MD5, false);
+    addOption(CMD_COPY, OPT_VERIFY_MD5, false);
+    addOption(CMD_COPY, OPT_INSECURE_SSL, false);
 
     // - list
     addCommand(CMD_LIST, "list",
                "list files in <directory> which are controlled by httpup",
                ArgParser::MAX, 1, "<directory>");
     addOption(CMD_LIST, OPT_REPOFILE, false);
+    addOption(CMD_LIST, OPT_INSECURE_SSL, false);
 }
diff --git a/httpupargparser.h b/httpupargparser.h
index ede9b42..63717bb 100644
--- a/httpupargparser.h
+++ b/httpupargparser.h
@@ -31,6 +31,7 @@ public:
     static ArgParser::APOpt OPT_REPOFILE;
     static ArgParser::APOpt OPT_ENCODE;
     static ArgParser::APOpt OPT_VERIFY_MD5;
+    static ArgParser::APOpt OPT_INSECURE_SSL;
 
     std::string getAppIdentification() const
         { return std::string("httpup ")  + MF_VERSION + "\n"; }