WMS server: detect correct service URL even if REQUEST_URI is not def…

…ined
qgis · Jan 12, 2015 · 95b4ebc · 95b4ebc
1 parent 03edac9
commit 95b4ebc
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2656,7 +2656,14 @@ bool QgsWMSServer::checkMaximumWidthHeight() const
 
 QString QgsWMSServer::serviceUrl() const
 {
-  QUrl mapUrl( getenv( "REQUEST_URI" ) );
+  QString requestUri = getenv( "REQUEST_URI" );
+  if ( requestUri.isEmpty() )
+  {
+    // in some cases (e.g. when running through python's CGIHTTPServer) the REQUEST_URI is not defined
+    requestUri = QString( getenv( "SCRIPT_NAME" ) ) + "?" + QString( getenv( "QUERY_STRING" ) );
+  }
+
+  QUrl mapUrl( requestUri );
   mapUrl.setHost( getenv( "SERVER_NAME" ) );
 
   //Add non-default ports to url