apply #3793: libfcgi cannot change mapserv's environment variables on…

… windows
qgis · May 4, 2011 · 5794256 · 5794256
1 parent 4d480fc
commit 5794256
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/src/mapserver/qgis_map_serv.cpp b/src/mapserver/qgis_map_serv.cpp
@@ -126,7 +126,17 @@ QFileInfo defaultAdminSLD()
   return QFileInfo( "admin.sld" );
 }
 
-
+int fcgi_accept()
+{
+#ifdef Q_OS_WIN
+  if ( FCGX_IsCGI() )
+    return FCGI_Accept();
+  else
+    return FCGX_Accept( &FCGI_stdin->fcgx_stream, &FCGI_stdout->fcgx_stream, &FCGI_stderr->fcgx_stream, &environ );
+#else
+  return FCGI_Accept();
+#endif
+}
 
 int main( int argc, char * argv[] )
 {
@@ -181,11 +191,10 @@ int main( int argc, char * argv[] )
     }
   }
 
-
   //creating QgsMapRenderer is expensive (access to srs.db), so we do it here before the fcgi loop
   QgsMapRenderer* theMapRenderer = new QgsMapRenderer();
 
-  while ( FCGI_Accept() >= 0 )
+  while ( fcgi_accept() >= 0 )
   {
     printRequestInfos(); //print request infos if in debug mode
 

diff --git a/src/mapserver/qgsconfigcache.cpp b/src/mapserver/qgsconfigcache.cpp
@@ -73,14 +73,19 @@ QgsConfigParser* QgsConfigCache::insertConfiguration( const QString& filePath )
   QFile* configFile = new QFile( filePath );
   if ( !configFile->exists() || !configFile->open( QIODevice::ReadOnly ) )
   {
+    QgsMSDebugMsg( "File unreadable: " + filePath );
     delete configFile;
     return 0;
   }
 
   //then create xml document
   QDomDocument* configDoc = new QDomDocument();
-  if ( !configDoc->setContent( configFile, true ) )
+  QString errorMsg;
+  int line, column;
+  if ( !configDoc->setContent( configFile, true, &errorMsg, &line, &column ) )
   {
+    QgsMSDebugMsg( QString( "Parse error %1 at row %2, column %3 in %4 " )
+                   .arg( errorMsg ).arg( line ).arg( column ).arg( filePath ) );
     delete configFile;
     delete configDoc;
     return 0;
@@ -99,6 +104,7 @@ QgsConfigParser* QgsConfigCache::insertConfiguration( const QString& filePath )
   }
   else
   {
+    QgsMSDebugMsg( "SLD or qgis expected in " + filePath );
     delete configDoc;
     return 0;
   }

diff --git a/src/mapserver/qgsmapserverlogger.cpp b/src/mapserver/qgsmapserverlogger.cpp
@@ -57,7 +57,8 @@ void QgsMapServerLogger::printMessage( const QString& message )
   if ( !mLogFile.isOpen() )
   {
 #ifdef _MSC_VER
-    ::OutputDebugString( message.toLocal8Bit() );
+    ::OutputDebugString( message .toLocal8Bit() );
+    ::OutputDebugString( "\n" );
 #endif
     return;
   }