[mapserver-commits] r9204 - branches/branch-4-10/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2009-07-22 23:48:15 -0400 (Wed, 22 Jul 2009)
New Revision: 9204

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

Modified: branches/branch-4-10/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-4-10/mapserver/HISTORY.TXT	2009-07-23 03:41:18 UTC (rev 9203)
+++ branches/branch-4-10/mapserver/HISTORY.TXT	2009-07-23 03:48:15 UTC (rev 9204)
@@ -13,6 +13,8 @@
 Current Version (SVN branch, may never be released):
 ----------------------------------------------------
 
+- Changing imagepath and imageurl no longer allowed via URL (#1836)
+
 - New fix for incomplete CVE-2009-0840 security fix made in 4.10.4 (#2943)
 
 Version 4.10.4 (2009-03-26)

Modified: branches/branch-4-10/mapserver/mapfile.c
===================================================================
--- branches/branch-4-10/mapserver/mapfile.c	2009-07-23 03:41:18 UTC (rev 9203)
+++ branches/branch-4-10/mapserver/mapfile.c	2009-07-23 03:48:15 UTC (rev 9204)
@@ -4275,14 +4275,6 @@
     msFree(web->header);
     web->header = strdup(value);
     break;
-  case(IMAGEPATH):
-    msFree(web->imagepath);
-    web->imagepath = strdup(value);
-    break;
-  case(IMAGEURL):
-    msFree(web->imageurl);
-    web->imageurl = strdup(value);
-    break;
   case(LEGENDFORMAT):
     msFree(web->legendformat);
     web->legendformat = strdup(value);

Modified: branches/branch-4-10/mapserver/maplexer.l
===================================================================
--- branches/branch-4-10/mapserver/maplexer.l	2009-07-23 03:41:18 UTC (rev 9203)
+++ branches/branch-4-10/mapserver/maplexer.l	2009-07-23 03:48:15 UTC (rev 9204)
@@ -184,8 +184,8 @@
 <INITIAL,OBJECT_STRING>imagetype	       { return(IMAGETYPE); }
 <INITIAL,OBJECT_STRING>imagequality	       { return(IMAGEQUALITY); }
 <INITIAL,OBJECT_STRING>imagemode	       { return(IMAGEMODE); }
-<INITIAL,OBJECT_STRING>imagepath	       { return(IMAGEPATH); }
-<INITIAL,OBJECT_STRING>imageurl		       { return(IMAGEURL); }
+<INITIAL>imagepath	                       { return(IMAGEPATH); }
+<INITIAL>imageurl          		       { return(IMAGEURL); }
 <INITIAL>include                               { BEGIN(INCLUDE); }
 <INITIAL,OBJECT_STRING>index                   { return(INDEX); }
 <INITIAL,OBJECT_STRING>interlace               { return(INTERLACE); }