[mapserver-commits] r9445 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2009-10-13 09:37:33 -0400 (Tue, 13 Oct 2009)
New Revision: 9445

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwms.c
Log:
Return WMS GetCapabilities v1.3.0 by default as required by spec (#3169)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-12 19:56:11 UTC (rev 9444)
+++ trunk/mapserver/HISTORY.TXT	2009-10-13 13:37:33 UTC (rev 9445)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Return WMS GetCapabilities v1.3.0 by default as required by spec (#3169)
+
 - Fixed mapObj.zoomScale() and mapobj.zoomRectangle() scaling problem in
   Mapscript (#3131)
 

Modified: trunk/mapserver/mapwms.c
===================================================================
--- trunk/mapserver/mapwms.c	2009-10-12 19:56:11 UTC (rev 9444)
+++ trunk/mapserver/mapwms.c	2009-10-13 13:37:33 UTC (rev 9445)
@@ -1944,7 +1944,7 @@
   schemalocation = msEncodeHTMLEntities( msOWSGetSchemasLocation(map) );
 
   if (nVersion < 0)
-      nVersion = OWS_1_1_1;     /* Default to 1.1.1 */
+      nVersion = OWS_1_3_0;     /* Default to 1.3.0 */
 
   /* Decide which version we're going to return. */
   if (nVersion < OWS_1_0_7) {
@@ -3607,7 +3607,7 @@
                   strcasecmp(request, "GetCapabilities") == 0) )
   {
       if (nVersion == OWS_VERSION_NOTSET)
-          nVersion = OWS_1_1_1;/* VERSION is optional with getCapabilities only */
+          nVersion = OWS_1_3_0;/* VERSION is optional with getCapabilities only */
       if ((status = msOWSMakeAllLayersUnique(map)) != MS_SUCCESS)
           return msWMSException(map, nVersion, NULL);
       return msWMSGetCapabilities(map, nVersion, req, updatesequence);