13 files changed, 35 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index 830d122..cabdde3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -109,6 +109,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/configure b/configure
index 9a43b70..5dec5bb 100755
--- a/configure
+++ b/configure
@@ -643,6 +643,7 @@ THREADS_LIBS
 LFS_FLAG
 V6_FLAG
 OPENSSL_LIBS
+HTTPS_SUPPORT
 VERSION_INFO
 DEFAULT_CFLAGS
 LT_CV_OBJDIR
@@ -15688,7 +15689,7 @@ fi
 
 
 
-### OpenSSL
+### OpenSSL is explicitely enabled/disabled ?
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable https support" >&5
 $as_echo_n "checking whether to enable https support... " >&6; }
 # Check whether --enable-https was given.
@@ -15713,6 +15714,10 @@ $as_echo "$https_support" >&6; }
 
 fi
 
+HTTPS_SUPPORT=$https_support
+
+
+# Probe OpenSSL ?
 if test x"$https_support" = x"no"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: disabling https support" >&5
 $as_echo "$as_me: disabling https support" >&6;}
diff --git a/configure.ac b/configure.ac
index df6e3f3..2730680 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,7 +121,7 @@ AC_MSG_WARN([*** in_addr_t not found]),
 ### zlib
 CHECK_ZLIB()
 
-### OpenSSL
+### OpenSSL is explicitely enabled/disabled ?
 AC_MSG_CHECKING(whether to enable https support)
 AC_ARG_ENABLE([https],
 	[AC_HELP_STRING([--enable-https=@<:@yes/no/auto@:>@],
@@ -141,6 +141,9 @@ AC_ARG_ENABLE([https],
 	https_support=yes
 	AC_MSG_RESULT($https_support)
 	])
+AC_SUBST(HTTPS_SUPPORT,$https_support)
+
+# Probe OpenSSL ?
 if test x"$https_support" = x"no"; then
 AC_MSG_NOTICE([disabling https support])
 AC_DEFINE(HTS_USEOPENSSL, 0)
diff --git a/html/Makefile.in b/html/Makefile.in
index 262536b..8697e5c 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -118,6 +118,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/lang/Makefile.in b/lang/Makefile.in
index df8c2a0..713894a 100644
--- a/lang/Makefile.in
+++ b/lang/Makefile.in
@@ -95,6 +95,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/libtest/Makefile.in b/libtest/Makefile.in
index 74bdbe5..01abff6 100644
--- a/libtest/Makefile.in
+++ b/libtest/Makefile.in
@@ -160,6 +160,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 6deda3a..6275c9e 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -84,6 +84,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/man/Makefile.in b/man/Makefile.in
index bd3a594..c99c58e 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -88,6 +88,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Makefile.in b/src/Makefile.in
index 9152bfb..e15bc71 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -153,6 +153,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/templates/Makefile.in b/templates/Makefile.in
index de23337..5471afb 100644
--- a/templates/Makefile.in
+++ b/templates/Makefile.in
@@ -94,6 +94,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/tests/12_crawl_https.test b/tests/12_crawl_https.test
new file mode 100755
index 0000000..48ae3ce
--- /dev/null
+++ b/tests/12_crawl_https.test
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+
+bash check-network.sh ||  ! echo "skipping online unit tests" || exit 77
+
+if test "$HTTPS_SUPPORT" == "no"; then
+	echo "no https support compiled, skipping"
+	exit 77
+fi
+
+bash crawl-test.sh --errors 0 --files 5 httrack https://ut.httrack.com/simple/basic.html
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bac94e8..87a62d2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,6 +4,7 @@ TESTS_ENVIRONMENT =
 TESTS_ENVIRONMENT += $(SHLIBPATH_VAR)="$(top_builddir)/src/$(LT_CV_OBJDIR)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)"
 TESTS_ENVIRONMENT += PATH=$(top_builddir)/src/$(LT_CV_OBJDIR):$$PATH
 TESTS_ENVIRONMENT += ONLINE_UNIT_TESTS=$(ONLINE_UNIT_TESTS)
+TESTS_ENVIRONMENT += HTTPS_SUPPORT=$(HTTPS_SUPPORT)
 
 TEST_EXTENSIONS = .test
-TESTS = 00_runnable.test 01_engine-charset.test 01_engine-entities.test 01_engine-idna.test 01_engine-simplify.test 10_crawl-simple.test 11_crawl-idna.test 11_crawl-international.test 11_crawl-parsing.test 
+TESTS = 00_runnable.test 01_engine-charset.test 01_engine-entities.test 01_engine-idna.test 01_engine-simplify.test 10_crawl-simple.test 11_crawl-idna.test 11_crawl-international.test 11_crawl-parsing.test 12_crawl_https.test 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1614ab8..bb0a187 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -84,6 +84,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -183,9 +184,10 @@ target_alias = @target_alias@
 EXTRA_DIST = $(TESTS) crawl-test.sh run-all-tests.sh check-network.sh
 TESTS_ENVIRONMENT = $(SHLIBPATH_VAR)="$(top_builddir)/src/$(LT_CV_OBJDIR)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" \
 	PATH=$(top_builddir)/src/$(LT_CV_OBJDIR):$$PATH \
-	ONLINE_UNIT_TESTS=$(ONLINE_UNIT_TESTS)
+	ONLINE_UNIT_TESTS=$(ONLINE_UNIT_TESTS) \
+	HTTPS_SUPPORT=$(HTTPS_SUPPORT)
 TEST_EXTENSIONS = .test
-TESTS = 00_runnable.test 01_engine-charset.test 01_engine-entities.test 01_engine-idna.test 01_engine-simplify.test 10_crawl-simple.test 11_crawl-idna.test 11_crawl-international.test 11_crawl-parsing.test 
+TESTS = 00_runnable.test 01_engine-charset.test 01_engine-entities.test 01_engine-idna.test 01_engine-simplify.test 10_crawl-simple.test 11_crawl-idna.test 11_crawl-international.test 11_crawl-parsing.test 12_crawl_https.test 
 all: all-am
 
 .SUFFIXES: