Changeset 3349:92af373753e4 for inc

Timestamp:

09/20/16 16:42:44 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Try HTTP if HTTPS url fails to be reached for version info and update download, fixes #2209

File:

• inc/core/class.dc.update.php (modified) (2 diffs)

inc/core/class.dc.update.php

@@ -109 +109 @@
                     $client->setUserAgent($_SERVER['HTTP_USER_AGENT']);
                     $client->get($path);
-
+                    $status = (int) $client->getStatus();
+
+                    if ($status >= 400) {
+                         // If original URL uses HTTPS, try with HTTP
+                         $url_parts = parse_url($client->getRequestURL());
+                         if (isset($url_parts['scheme']) && $url_parts['scheme'] == 'https') {
+
+                              // Replace https by http in url
+                              $this->url = preg_replace('/^https(?=:\/\/)/i','http',$this->url);
+
+                              $client = netHttp::initClient($this->url,$path);
+                              if ($client !== false) {
+                                   $client->setTimeout(4);
+                                   $client->setUserAgent($_SERVER['HTTP_USER_AGENT']);
+                                   $client->get($path);
+                                   $status = (int) $client->getStatus();
+                              }
+                         }
+                    }
+
+                    if (!$status || $status >= 400) {
+                         return;
+                    }
                     $this->readVersion($client->getContent());
                }
@@ -209 +231 @@
                $client->setOutput($dest);
                $client->get($path);
-
-               if ($client->getStatus() != 200) {
+               $status = (int) $client->getStatus();
+
+               if ($status >= 400) {
+                    // If original URL uses HTTPS, try with HTTP
+                    $url_parts = parse_url($client->getRequestURL());
+                    if (isset($url_parts['scheme']) && $url_parts['scheme'] == 'https') {
+
+                         // Replace https by http in url
+                         $url = preg_replace('/^https(?=:\/\/)/i','http',$url);
+
+                         $client = netHttp::initClient($url,$path);
+                         $client->setTimeout(4);
+                         $client->setUserAgent($_SERVER['HTTP_USER_AGENT']);
+                         $client->useGzip(false);
+                         $client->setPersistReferers(false);
+                         $client->setOutput($dest);
+                         $client->get($path);
+                         $status = (int) $client->getStatus();
+                    }
+               }
+
+               if ($status != 200) {
                     @unlink($dest);
                     throw new Exception();