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

[svn at osgeo.org]

Author: dmorissette
Date: 2008-08-22 11:26:14 -0400 (Fri, 22 Aug 2008)
New Revision: 7877

Modified:
   branches/branch-5-2/mapserver/HISTORY.TXT
   branches/branch-5-2/mapserver/mapserv.c
Log:
Got rid of misleading errors about OWS SERVICE not being compiled in
when a OWS is sent that includes mode=map (or other mode value 
different from ows)(#2747)


Modified: branches/branch-5-2/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-2/mapserver/HISTORY.TXT	2008-08-21 20:48:27 UTC (rev 7876)
+++ branches/branch-5-2/mapserver/HISTORY.TXT	2008-08-22 15:26:14 UTC (rev 7877)
@@ -13,6 +13,10 @@
 Current Version (SVN branch-5-2)
 --------------------------------
 
+- Got rid of misleading errors about OWS SERVICE not being compiled in
+  when a OWS is sent that includes mode=map (or other mode value 
+  different from ows)(#2747)
+
 - Fixed a memory leak associated with not deleting the lexer buffer 
   before parsing certain types of strings. (#2729)
 

Modified: branches/branch-5-2/mapserver/mapserv.c
===================================================================
--- branches/branch-5-2/mapserver/mapserv.c	2008-08-21 20:48:27 UTC (rev 7876)
+++ branches/branch-5-2/mapserver/mapserv.c	2008-08-22 15:26:14 UTC (rev 7877)
@@ -1298,31 +1298,6 @@
     } /* done OGC/OWS case */
 
     /*
-    ** Try to report a meaningful message if we had an OGC request but
-    ** we couldn't handle it because we don't have support compiled in.
-    */
-    {
-      const char *service = NULL;
-
-      for(i=0; i<mapserv->request->NumParams; i++) {
-        if(strcasecmp(mapserv->request->ParamNames[i], "SERVICE") == 0)
-          service = mapserv->request->ParamValues[i];
-      }
-
-      if( service != NULL 
-          && (strcasecmp(service,"WMS") == 0 
-          || strcasecmp(service,"WCS") == 0 
-          || strcasecmp(service,"WFS") == 0 
-          || strcasecmp(service,"SOS") == 0) ) {
-        msSetError(MS_WEBERR, 
-                   "SERVICE=%s requested, but that OGC web service is not enabled in this build.  Please rebuild MapServer with appropriate options.", 
-                   "mapserv() ",
-                   service );
-        writeError();
-      }
-    }
-
-    /*
     ** Do "traditional" mode processing.
     */
     if (mapserv->Mode == -1)