[mapserver-commits] r10139 - trunk/mapserver

[svn at osgeo.org]

Author: pramsey
Date: 2010-05-06 11:12:03 -0400 (Thu, 06 May 2010)
New Revision: 10139

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwmslayer.c
Log:
Ensure mapwmslayer.c does not unlink file before closing connection on it (#3451)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-05-06 15:09:22 UTC (rev 10138)
+++ trunk/mapserver/HISTORY.TXT	2010-05-06 15:12:03 UTC (rev 10139)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Ensure mapwmslayer.c does not unlink file before closing connection on it (#3451)
+
 - Fix security exception issue in C# with MSVC2010 (#3438)
 
 - Write out join CONNECTIONTYPE when saving a mapfile. (#3435)

Modified: trunk/mapserver/mapwmslayer.c
===================================================================
--- trunk/mapserver/mapwmslayer.c	2010-05-06 15:09:22 UTC (rev 10138)
+++ trunk/mapserver/mapwmslayer.c	2010-05-06 15:12:03 UTC (rev 10139)
@@ -1412,6 +1412,11 @@
     /* set the classes to 0 so that It won't do client side */
     /* classification if an sld was set. */
     numclasses = lp->numclasses;
+
+    /* ensure the file connection is closed right away after the layer */ 
+    /* is rendered */ 
+    msLayerSetProcessingKey( lp, "CLOSE_CONNECTION", "NORMAL");
+
     if (msOWSLookupMetadata(&(lp->metadata), "MO", "sld_body") ||
         msOWSLookupMetadata(&(lp->metadata), "MO", "sld_url"))        
       lp->numclasses = 0;