[mapserver-commits] r10138 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: pramsey
Date: 2010-05-06 11:09:22 -0400 (Thu, 06 May 2010)
New Revision: 10138

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



Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-05-04 17:00:17 UTC (rev 10137)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-05-06 15:09:22 UTC (rev 10138)
@@ -15,6 +15,8 @@
 Version 5.6.4 (????-??-??):
 ---------------------------
 
+- 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: branches/branch-5-6/mapserver/mapwmslayer.c
===================================================================
--- branches/branch-5-6/mapserver/mapwmslayer.c	2010-05-04 17:00:17 UTC (rev 10137)
+++ branches/branch-5-6/mapserver/mapwmslayer.c	2010-05-06 15:09:22 UTC (rev 10138)
@@ -1346,6 +1346,10 @@
         msOWSLookupMetadata(&(lp->metadata), "MO", "sld_url"))        
       lp->numclasses = 0;
 
+    /* ensure the file connection is closed right away after the layer */ 
+    /* is rendered */ 
+    msLayerSetProcessingKey( lp, "CLOSE_CONNECTION", "NORMAL");
+
     if (lp->data) free(lp->data);
     lp->data =  strdup(pasReqInfo[iReq].pszOutputFile);