From 72e3ff3c1564924dc35797a418293bfa7e913f12 Mon Sep 17 00:00:00 2001
From: Jake Dallimore <jake@moodle.com>
Date: Wed, 15 Feb 2017 13:31:52 +0800
Subject: [PATCH] MDL-57274 upgrade: fix curl security notices during
 upgrade/install

Handles the case where $CFG->curlsecurityxxx vars don't yet exist
during install or upgrade by treating not set the same as empty.
---
 lib/classes/files/curl_security_helper.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/classes/files/curl_security_helper.php b/lib/classes/files/curl_security_helper.php
index 6c0639f8f81..4c26307418d 100644
--- a/lib/classes/files/curl_security_helper.php
+++ b/lib/classes/files/curl_security_helper.php
@@ -235,6 +235,9 @@ class curl_security_helper extends curl_security_helper_base {
      */
     protected function get_whitelisted_ports() {
         global $CFG;
+        if (!isset($CFG->curlsecurityallowedport)) {
+            return [];
+        }
         return array_filter(explode("\n", $CFG->curlsecurityallowedport), function($entry) {
             return !empty($entry);
         });
@@ -247,6 +250,9 @@ class curl_security_helper extends curl_security_helper_base {
      */
     protected function get_blacklisted_hosts() {
         global $CFG;
+        if (!isset($CFG->curlsecurityblockedhosts)) {
+            return [];
+        }
         return array_filter(array_map('trim', explode("\n", $CFG->curlsecurityblockedhosts)), function($entry) {
             return !empty($entry);
         });