[Inteproxy-commits] r255 - in trunk: . inteproxy

[scm-commit@wald.intevation.org]

Author: iweinzierl
Date: 2010-05-21 15:59:24 +0200 (Fri, 21 May 2010)
New Revision: 255

Modified:
   trunk/ChangeLog
   trunk/inteproxy/feesdialog.py
Log:
Improved the GetCapabilities URL checking so that 'REQUEST=GetCapabilities' strings without uppercase 'REQUEST' are detected as GetCapabilities requests as well.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-05-11 12:54:34 UTC (rev 254)
+++ trunk/ChangeLog	2010-05-21 13:59:24 UTC (rev 255)
@@ -1,3 +1,12 @@
+2010-05-20  Ingo Weinzierl <ingo.weinzierl at intevation.de>
+
+	* inteproxy/feesdialog.py: Improved the GetCapabilites URL checking. The
+	  parameters of a WMS request might be case insensitive according to the
+	  WMS spec. A GetCapabilities request without uppercase 'REQUEST' will
+	  now be detected as GetCapabilites request as well.
+	  (see issue1217 at http://wald.intevation.org/projects/inteproxy for the
+	  bug report)
+
 2010-05-11  Bjoern Schilberg <bjoern.schilberg at intevation.de>
 
 	* website/index.htm4, website/index-de.htm4:

Modified: trunk/inteproxy/feesdialog.py
===================================================================
--- trunk/inteproxy/feesdialog.py	2010-05-11 12:54:34 UTC (rev 254)
+++ trunk/inteproxy/feesdialog.py	2010-05-21 13:59:24 UTC (rev 255)
@@ -24,8 +24,10 @@
 
     if query:
         split_query = query.split("&")
-        if "REQUEST=GetCapabilities" in split_query:
-            return True
+        for params in split_query:
+            parts = params.split("=")
+            if parts[0].upper() == "REQUEST" and parts[1] == "GetCapabilities":
+                return True
 
     return False