# HG changeset patch # User Tom Fredrik Blenning # Date 1674411355 -3600 # Node ID 00255ca8945986984781c230e82de07131d4d403 # Parent 51b53cd01080f75ac086842947be4760790fbfcd Generate URLs with correct protocol based on forwarded proto. diff -r 51b53cd01080 -r 00255ca89459 Sitemap.inc --- a/Sitemap.inc Sun Jan 22 18:59:03 2023 +0100 +++ b/Sitemap.inc Sun Jan 22 19:15:55 2023 +0100 @@ -69,13 +69,11 @@ return false; } - private function processDir($dir, $lang, $acceptedLanguages, $base) { + private function processDir($dir, $lang, $acceptedLanguages, $baseurl) { $urls = array(); $base=basePath(); $base=$_SERVER['DOCUMENT_ROOT']; - $baseurl = $_SERVER["REQUEST_SCHEME"] ."://". $_SERVER["SERVER_NAME"]; - if ($handle = opendir($base . "/${dir}")) { while (false !== ($entry = readdir($handle))) { @@ -126,7 +124,11 @@ http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"> '; - $base = $_SERVER["REQUEST_SCHEME"] ."://". $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"]; + $proto= $_SERVER["REQUEST_SCHEME"]; + if (array_key_exists('HTTP_X_FORWARDED_PROTO', $_SERVER)) { + $proto=$_SERVER['HTTP_X_FORWARDED_PROTO']; + } + $base = $proto ."://". $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"]; $l = strrpos($base, '/'); if ($l) $base = substr($base, 0, $l);