[mapserver-commits] r12494 - in trunk/mapserver/mapcache: . src

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:32:05 -0700 (Fri, 26 Aug 2011)
New Revision: 12494

Modified:
   trunk/mapserver/mapcache/geocache.xml
   trunk/mapserver/mapcache/src/services.c
Log:


Modified: trunk/mapserver/mapcache/geocache.xml
===================================================================
--- trunk/mapserver/mapcache/geocache.xml	2011-08-26 11:32:01 UTC (rev 12493)
+++ trunk/mapserver/mapcache/geocache.xml	2011-08-26 11:32:05 UTC (rev 12494)
@@ -767,13 +767,13 @@
            It will intercept wms getmap requests that can be treated from configured
            tilesets, and can optionally forward all the rest to (an)other server(s)
            TODO: this needs way more documenting
-      -->
       <forwarding_rule name="foo rule">
             <append_pathinfo>true</append_pathinfo>
             <http>
-               <url>http://server/geocacheproxy</url>
+               <url>http://localhost/geocacheproxy</url>
             </http>
       </forwarding_rule>
+      -->
       <!-- full_wms
            configure response to wms requests that are not aligned to a tileset's grids.
            responding to requests that are not in the SRS of a configured grid is not supported, but

Modified: trunk/mapserver/mapcache/src/services.c
===================================================================
--- trunk/mapserver/mapcache/src/services.c	2011-08-26 11:32:01 UTC (rev 12493)
+++ trunk/mapserver/mapcache/src/services.c	2011-08-26 11:32:05 UTC (rev 12494)
@@ -46,7 +46,8 @@
       //if(*(pathinfo+prefixlen)!='/' && *(pathinfo+prefixlen)!='\0') continue; /*we matched the prefix but there are trailing characters*/
       pathinfo += prefixlen; /* advance pathinfo to after the service prefix */
       service->parse_request(ctx,service,request,pathinfo,params,config);
-      (*request)->service = service;
+      if(*request)
+         (*request)->service = service;
       
       /* stop looping on services */
       return;