[mapserver-commits] r7851 - branches/branch-5-2/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2008-08-14 14:08:16 -0400 (Thu, 14 Aug 2008)
New Revision: 7851

Modified:
   branches/branch-5-2/mapserver/HISTORY.TXT
   branches/branch-5-2/mapserver/mapwms.c
Log:
Accept WMS requests in which the optional SERVICE param is missing (#2737)

Modified: branches/branch-5-2/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-2/mapserver/HISTORY.TXT	2008-08-14 18:01:10 UTC (rev 7850)
+++ branches/branch-5-2/mapserver/HISTORY.TXT	2008-08-14 18:08:16 UTC (rev 7851)
@@ -13,6 +13,12 @@
 Current Version (SVN branch-5-2)
 --------------------------------
 
+- Accept WMS requests in which the optional SERVICE param is missing. 
+  A new test was incorrectly added in 5.2.0 that resulted in the error 
+  "Incomplete WFS request: SERVICE parameter missing" when the SERVICE 
+  parameter was missing in WMS requests in which the SERVICE param is 
+  optional (#2737)
+
 - SLD: when creating well known symbols on the fly the pen-up value
   used should be -99.
      

Modified: branches/branch-5-2/mapserver/mapwms.c
===================================================================
--- branches/branch-5-2/mapserver/mapwms.c	2008-08-14 18:01:10 UTC (rev 7850)
+++ branches/branch-5-2/mapserver/mapwms.c	2008-08-14 18:08:16 UTC (rev 7851)
@@ -2953,10 +2953,6 @@
         format = req->ParamValues[i];
   }
 
-  /* if SERVICE is not specified, this is not a WMS request */
-  if (service == NULL)
-    return MS_DONE;
-
   /* If SERVICE is specified then it MUST be "WMS" */
   if (service != NULL && strcasecmp(service, "WMS") != 0)
       return MS_DONE;  /* Not a WMS request */