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

[svn at osgeo.org]

Author: sdlime
Date: 2009-07-22 23:36:47 -0400 (Wed, 22 Jul 2009)
New Revision: 9201

Modified:
   branches/branch-5-2/mapserver/HISTORY.TXT
   branches/branch-5-2/mapserver/maplexer.l
Log:
Changing imagepath and imageurl no longer allowed via URL (#1836)

Modified: branches/branch-5-2/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-2/mapserver/HISTORY.TXT	2009-07-22 04:20:44 UTC (rev 9200)
+++ branches/branch-5-2/mapserver/HISTORY.TXT	2009-07-23 03:36:47 UTC (rev 9201)
@@ -12,6 +12,8 @@
 Current Version:
 ----------------
 
+- Changing imagepath and imageurl no longer allowed via URL (#1836)
+
 - New fix for incomplete CVE-2009-0840 security fix made in 5.2.2 (#2943)
 
 - Fixed seg fault if font not found with label ANGLE FOLLOW (#2973)

Modified: branches/branch-5-2/mapserver/maplexer.l
===================================================================
--- branches/branch-5-2/mapserver/maplexer.l	2009-07-22 04:20:44 UTC (rev 9200)
+++ branches/branch-5-2/mapserver/maplexer.l	2009-07-23 03:36:47 UTC (rev 9201)
@@ -191,8 +191,8 @@
 <INITIAL,URL_VARIABLE>imagetype                { return(IMAGETYPE); }
 <INITIAL>imagequality                          { return(IMAGEQUALITY); }
 <INITIAL>imagemode                             { return(IMAGEMODE); }
-<INITIAL,URL_STRING>imagepath                  { return(IMAGEPATH); }
-<INITIAL,URL_STRING>imageurl                   { return(IMAGEURL); }
+<INITIAL>imagepath                             { return(IMAGEPATH); }
+<INITIAL>imageurl                              { return(IMAGEURL); }
 <INITIAL>include                               { BEGIN(INCLUDE); }
 <INITIAL>index                                 { return(INDEX); }
 <INITIAL>interlace                             { return(INTERLACE); }