Merge branch 'w12_MDL-32043_m23_webserver' of git://github.com/skodak…

…/moodle
ds125v · Mar 19, 2012 · e2edc82 · e2edc82
2 parents f40400b + d860f1a
commit e2edc82
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/setuplib.php b/lib/setuplib.php
@@ -853,7 +853,11 @@ function setup_get_remote_url() {
         //obscure name found on some servers - this is definitely not supported
         $rurl['fullpath'] = $_SERVER['REQUEST_URI']; // TODO: verify this is always properly encoded
 
-     } else {
+    } else if (strpos($_SERVER['SERVER_SOFTWARE'], 'PHP') === 0) {
+        // built-in PHP Development Server
+        $rurl['fullpath'] = $_SERVER['REQUEST_URI'];
+
+    } else {
         throw new moodle_exception('unsupportedwebserver', 'error', '', $_SERVER['SERVER_SOFTWARE']);
     }