summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-11-30 18:42:55 +0100
committerBenny Baumann <BenBE@geshi.org>2014-11-30 18:42:55 +0100
commitfd40b4032e0b9181ae2cec871bcae4dcfb88c9fb (patch)
tree5df5816eddb3d21db105d64f9374b4107868f892
parenta31cb94286635f6055afc63b2dd22e3cf96f4d2f (diff)
parentae094ec445fb164e1b6d5c369ae9556bb9c521cd (diff)
downloadcacert-devel-fd40b4032e0b9181ae2cec871bcae4dcfb88c9fb.tar.gz
cacert-devel-fd40b4032e0b9181ae2cec871bcae4dcfb88c9fb.tar.xz
cacert-devel-fd40b4032e0b9181ae2cec871bcae4dcfb88c9fb.zip
Merge branch 'bug-1288' into testserver-stable
-rw-r--r--includes/general.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/includes/general.php b/includes/general.php
index 5a4548f..ef94819 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -654,7 +654,6 @@
fputs($fp, "EHLO www.cacert.org\r\n");
do {
$line = fgets($fp, 4096);
- $has_starttls |= trim($line) == "250-STARTTLS";
} while(substr($line, 0, 4) == "250-");
if(substr($line, 0, 3) != "250") {
fclose($fp);