[mapserver-commits] r9258 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2009-08-17 12:22:53 -0400 (Mon, 17 Aug 2009)
New Revision: 9258

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapgdal.c
Log:
avoid CPLFreeConfig call - triggers other leakage in modern GDAL

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-08-17 03:26:36 UTC (rev 9257)
+++ trunk/mapserver/HISTORY.TXT	2009-08-17 16:22:53 UTC (rev 9258)
@@ -14,6 +14,9 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Modern GDALs clear the config when destroying driver manager.  Skip this
+  call to avoid TLS leakage on cleanup (mapgdal.c).
+
 - Fixed msMSSQL2008LayerGetShape to retrieve proper wkb geometries (#3082)
 
 - Fixed the shape index for the inline layers (#3074)

Modified: trunk/mapserver/mapgdal.c
===================================================================
--- trunk/mapserver/mapgdal.c	2009-08-17 03:26:36 UTC (rev 9257)
+++ trunk/mapserver/mapgdal.c	2009-08-17 16:22:53 UTC (rev 9258)
@@ -82,10 +82,6 @@
         GDALDestroyDriverManager();
 #endif
 
-#if GDAL_RELEASE_DATE > 20040101
-        CPLFreeConfig();
-#endif
-
         msReleaseLock( TLOCK_GDAL );
 
         bGDALInitialized = 0;