Permalink
Browse files

Merge branch 'w15_MDL-26910_m20_httpd' of git://github.com/skodak/moo…

…dle into MOODLE_20_STABLE
  • Loading branch information...
stronk7 committed Apr 10, 2011
2 parents f9068e5 + 6743d6c commit 12b734434bcb68806a71f108c1ebeeb60ce99bfc
Showing with 4 additions and 0 deletions.
  1. +4 −0 lib/setuplib.php
View
@@ -772,6 +772,10 @@ function setup_get_remote_url() {
//LiteSpeed - not officially supported
$rurl['fullpath'] = $_SERVER['REQUEST_URI']; // TODO: verify this is always properly encoded
+ } else if ($_SERVER['SERVER_SOFTWARE'] === 'HTTPD') {
+ //obscure name found on some servers - this is definitely not supported
+ $rurl['fullpath'] = $_SERVER['REQUEST_URI']; // TODO: verify this is always properly encoded
+
} else {
throw new moodle_exception('unsupportedwebserver', 'error', '', $_SERVER['SERVER_SOFTWARE']);
}

0 comments on commit 12b7344

Please sign in to comment.