[mapserver-commits] r7157 - branches/branch-5-0/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2007-12-07 15:33:09 -0500 (Fri, 07 Dec 2007)
New Revision: 7157

Modified:
   branches/branch-5-0/mapserver/HISTORY.TXT
   branches/branch-5-0/mapserver/mapwms.c
Log:
Make STYLES optional in WMS GetMap - restore 4.10 behavior (#2427)

Modified: branches/branch-5-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-0/mapserver/HISTORY.TXT	2007-12-07 20:11:10 UTC (rev 7156)
+++ branches/branch-5-0/mapserver/HISTORY.TXT	2007-12-07 20:33:09 UTC (rev 7157)
@@ -13,6 +13,9 @@
 Current Version (SVN branch-5-0)
 --------------------------------
 
+- Restored behavior of MS 4.10 and made WMS STYLES parameter optional
+  again in GetMap and GetFeatureInfo requests (#2427)
+
 - fixed symbolsetObj not to set the SWIG immutable flag permanently
   don't expose refcount and the symbol attributes (Ticket #2407)
 

Modified: branches/branch-5-0/mapserver/mapwms.c
===================================================================
--- branches/branch-5-0/mapserver/mapwms.c	2007-12-07 20:11:10 UTC (rev 7156)
+++ branches/branch-5-0/mapserver/mapwms.c	2007-12-07 20:33:09 UTC (rev 7157)
@@ -366,8 +366,6 @@
   int formatfound = 0;
   int widthfound = 0;
   int heightfound = 0;
-  int stylesfound = 0;
-  int sldfound = 0;
 
   char *request = NULL;
 
@@ -392,7 +390,6 @@
     /* check if SLD is passed.  If yes, check for OGR support */
     if (strcasecmp(names[i], "SLD") == 0 || strcasecmp(names[i], "SLD_BODY") == 0)
     {
-      sldfound = 1;
       if (ogrEnabled == 0)
       {
         msSetError(MS_WMSERR, "OGR support is not available.", "msWMSLoadGetMapParams()");
@@ -464,7 +461,6 @@
       msFreeCharArray(layers, numlayers);
     }
     else if (strcasecmp(names[i], "STYLES") == 0) {
-        stylesfound = 1;
         styles = values[i];
 
     }
@@ -883,11 +879,6 @@
       return msWMSException(map, nVersion, "MissingParameterValue");
     }
   
-    if (stylesfound == 0 && sldfound == 0)
-    {
-      msSetError(MS_WMSERR, "Missing required parameter STYLES", "msWMSLoadGetMapParams()");
-      return msWMSException(map, nVersion, "MissingParameterValue");
-    }
   }
 
   return MS_SUCCESS;