[mapguide-commits] r1352 - trunk/MgDev/Web/src/HttpHandler

[svn_mapguide at osgeo.org]

Author: waltweltonlair
Date: 2007-03-22 20:43:55 -0400 (Thu, 22 Mar 2007)
New Revision: 1352

Modified:
   trunk/MgDev/Web/src/HttpHandler/HttpGetTileImage.cpp
   trunk/MgDev/Web/src/HttpHandler/HttpRequestResponseHandler.cpp
Log:
MgHttpRequestResponseHandler::ValidateOperationVersion() was checking if the
version was "1.0.0".  This breaks DWF Viewer, since it still sets the GetMap
and GetMapUpdate request versions to "1.0".

The operation version has the form major.minor.phase, and the correct behavior
is to only check the major.minor portion.


Modified: trunk/MgDev/Web/src/HttpHandler/HttpGetTileImage.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpGetTileImage.cpp	2007-03-22 20:39:46 UTC (rev 1351)
+++ trunk/MgDev/Web/src/HttpHandler/HttpGetTileImage.cpp	2007-03-23 00:43:55 UTC (rev 1352)
@@ -140,8 +140,9 @@
     MG_HTTP_HANDLER_TRY()
 
     // There are multiple supported versions
-    if ((m_version != L"1.0.0") &&
-        (m_version != L"1.2.0"))
+    STRING versionNoPhase = m_version.substr(0, 3);
+    if ((versionNoPhase != L"1.0") &&
+        (versionNoPhase != L"1.2"))
     {
         throw new MgInvalidOperationVersionException(
         L"MgHttpGetTileImage.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);

Modified: trunk/MgDev/Web/src/HttpHandler/HttpRequestResponseHandler.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpRequestResponseHandler.cpp	2007-03-22 20:39:46 UTC (rev 1351)
+++ trunk/MgDev/Web/src/HttpHandler/HttpRequestResponseHandler.cpp	2007-03-23 00:43:55 UTC (rev 1352)
@@ -164,7 +164,8 @@
 {
     MG_HTTP_HANDLER_TRY()
 
-    if (m_version != L"1.0.0")
+    STRING versionNoPhase = m_version.substr(0, 3);
+    if (versionNoPhase != L"1.0")
     {
         throw new MgInvalidOperationVersionException(
         L"MgHttpRequestResponseHandler.ValidateOperationVersion", __LINE__, __WFILE__, NULL, L"", NULL);