[mapserver-commits] r11305 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-03-22 18:34:30 -0700 (Tue, 22 Mar 2011)
New Revision: 11305

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapserv.c
Log:
Added missing arg to msSetErrorFile() when --enable-cgi-cl-debug-args is enabled (#2853)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-22 21:37:43 UTC (rev 11304)
+++ trunk/mapserver/HISTORY.TXT	2011-03-23 01:34:30 UTC (rev 11305)
@@ -31,8 +31,11 @@
 
 - Fix csharp Makefile.in (#3758)
 
-- Allow run-time subs in class->text (makes sense if you allow it in class->expression).
+- Allow run-time subs in class->text (makes sense if you allow it in 
+  class->expression).
 
+- Fix build problem when --enable-cgi-cl-debug-args is enabled (#2853)
+
 Version 6.0.0-beta2 (2011-03-18)
 --------------------------------
 

Modified: trunk/mapserver/mapserv.c
===================================================================
--- trunk/mapserver/mapserv.c	2011-03-22 21:37:43 UTC (rev 11304)
+++ trunk/mapserver/mapserv.c	2011-03-23 01:34:30 UTC (rev 11305)
@@ -1150,7 +1150,7 @@
             
       exit(0);
     } else if( strncmp(argv[iArg], "MS_ERRORFILE=", 13) == 0 ) {
-      msSetErrorFile( argv[iArg] + 13 );
+        msSetErrorFile( argv[iArg] + 13, NULL );
     } else if( strncmp(argv[iArg], "MS_DEBUGLEVEL=", 14) == 0) {
       msSetGlobalDebugLevel( atoi(argv[iArg] + 14) );
     }