Showing with 242 additions and 92 deletions.

+1 −1 src/mapserver/qgshttprequesthandler.cpp

+216 −88 src/mapserver/qgswmsserver.cpp

+25 −3 src/mapserver/qgswmsserver.h
diff --git a/src/mapserver/qgshttprequesthandler.cpp b/src/mapserver/qgshttprequesthandler.cpp
@@ -162,7 +162,7 @@ void QgsHttpRequestHandler::sendGetFeatureInfoResponse( const QDomDocument& info
   QByteArray ba;
   QgsDebugMsg( "Info format is:" + infoFormat );
 
-  if ( infoFormat == "text/xml" )
+  if ( infoFormat == "text/xml" || infoFormat.startsWith("application/vnd.ogc.gml") )
   {
     ba = infoDoc.toByteArray();
   }