From 52f69fcf2529501bed81b2bc5b036c4edd729cd5 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sat, 14 Mar 2020 16:07:23 -0500 Subject: [PATCH 1/3] add sponsor link --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 81f2f62b..e4bc97ee 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,7 @@ We would like to extend our thanks to the following sponsors for funding Laravel - [Hyper Host](https://hyper.host) - [Appoly](https://www.appoly.co.uk) - [OP.GG](https://op.gg) +- [云软科技](http://www.yunruan.ltd/) ## Contributing From d82bf9768b5d486d08159c191bec8a3d7b426436 Mon Sep 17 00:00:00 2001 From: Markus Podar Date: Sun, 15 Mar 2020 17:25:50 +0100 Subject: [PATCH 2/3] [7.x] Allow configuring the timeout for the smtp driver (#5262) * Allow configuring the timeout for the smtp driver The default is the same as in `\Swift_Transport_EsmtpTransport::$params` * Corrected default * Update mail.php Co-authored-by: Graham Campbell Co-authored-by: Taylor Otwell --- config/mail.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/mail.php b/config/mail.php index cfef410f..5201bb76 100644 --- a/config/mail.php +++ b/config/mail.php @@ -41,6 +41,7 @@ return [ 'encryption' => env('MAIL_ENCRYPTION', 'tls'), 'username' => env('MAIL_USERNAME'), 'password' => env('MAIL_PASSWORD'), + 'timeout' => null, ], 'ses' => [ From b7b6e35bf88f346832bdd32b71ca7ed4f0ceddd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20Honor=C3=A9?= <643471+JacobHonore@users.noreply.github.com> Date: Tue, 24 Mar 2020 14:11:36 +0100 Subject: [PATCH 3/3] Fix s3 endpoint url reference (#5267) --- config/filesystems.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/filesystems.php b/config/filesystems.php index ec6a7cec..a0ec1290 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -61,7 +61,7 @@ return [ 'secret' => env('AWS_SECRET_ACCESS_KEY'), 'region' => env('AWS_DEFAULT_REGION'), 'bucket' => env('AWS_BUCKET'), - 'url' => env('AWS_URL'), + 'endpoint' => env('AWS_URL'), ], ],