[mapserver-commits] r10542 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-09-30 02:59:44 +0000 (Thu, 30 Sep 2010)
New Revision: 10542

Modified:
   trunk/mapserver/mapwmslayer.c
Log:
only require WEB.IMAGEPATH if we are using temporary files (#3555)

Modified: trunk/mapserver/mapwmslayer.c
===================================================================
--- trunk/mapserver/mapwmslayer.c	2010-09-30 02:44:54 UTC (rev 10541)
+++ trunk/mapserver/mapwmslayer.c	2010-09-30 02:59:44 UTC (rev 10542)
@@ -1154,6 +1154,18 @@
     else
         bCacheToDisk = MS_FALSE;
 
+    if( bCacheToDisk )
+    {
+        /* We'll store the remote server's response to a tmp file. */
+        if (map->web.imagepath == NULL || strlen(map->web.imagepath) == 0)
+        {
+            msSetError(MS_WMSERR, 
+                       "WEB.IMAGEPATH must be set to use WMS client connections.",
+                       "msPrepareWMSLayerRequest()");
+            return MS_FAILURE;
+        }
+    }
+
 /* ------------------------------------------------------------------
  * Check if layer can be merged with previous WMS layer requests
  * Metadata wms_force_separate_request can be set to 1 to prevent this
@@ -1310,14 +1322,6 @@
         pasReqInfo[(*numRequests)].nLayerId = nLayerId;
         pasReqInfo[(*numRequests)].pszGetUrl = pszURL;
         pszURL = NULL;
-        /* We'll store the remote server's response to a tmp file. */
-        if (map->web.imagepath == NULL || strlen(map->web.imagepath) == 0)
-        {
-            msSetError(MS_WMSERR, 
-                  "WEB.IMAGEPATH must be set to use WMS client connections.",
-                       "msPrepareWMSLayerRequest()");
-            return MS_FAILURE;
-        }
         pasReqInfo[(*numRequests)].pszHTTPCookieData = pszHTTPCookieData;
         pszHTTPCookieData = NULL;
         if( bCacheToDisk )