Merge pull request splitbrain#24 from txthinking/updates

TLS handling change
lainme · Jun 10, 2020 · ecee529 · ecee529
2 parents 49cd4e5 + 55ccc4d
commit ecee529
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,11 @@
 language: php
 sudo: false
 php:
+  - "7.4"
+  - "7.3"
+  - "7.2"
+  - "7.1"
   - "7.0"
   - "5.6"
-  - "nightly"
 install: composer update
 script: ./vendor/bin/phpunit --verbose
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "psr/log": "~1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0",
+        "phpunit/phpunit": "~5.0",
         "monolog/monolog": "~1.13"
     },
     "autoload": {

diff --git a/src/Mailer/SMTP.php b/src/Mailer/SMTP.php
@@ -241,7 +241,9 @@ protected function starttls()
                 $crypto_type = STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
                 break;
             default:
-                $crypto_type = STREAM_CRYPTO_METHOD_TLS_CLIENT;
+                $crypto_type = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT |
+                               STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT |
+                               STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
                 break;
         }