[mapserver-commits] r12427 - trunk/mapserver/mapcache/src

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:24:50 -0700 (Fri, 26 Aug 2011)
New Revision: 12427

Modified:
   trunk/mapserver/mapcache/src/service_wms.c
Log:
add possible yaml config file
thomas.bonfort | 2011-08-15 11:28:23 +0200 (Mon, 15 Aug 2011)

Modified: trunk/mapserver/mapcache/src/service_wms.c
===================================================================
--- trunk/mapserver/mapcache/src/service_wms.c	2011-08-26 11:24:45 UTC (rev 12426)
+++ trunk/mapserver/mapcache/src/service_wms.c	2011-08-26 11:24:50 UTC (rev 12427)
@@ -700,7 +700,8 @@
          for(j=0;j<rule->match_params->nelts;j++) {
             geocache_dimension *match_param = APR_ARRAY_IDX(rule->match_params,j,geocache_dimension*);
             const char *value = apr_table_get(params,match_param->name);
-            if(match_param->validate(ctx,match_param,(char**)&value) == GEOCACHE_FAILURE) {
+            if(!value || match_param->validate(ctx,match_param,(char**)&value) == GEOCACHE_FAILURE) {
+               /* the parameter was not supplied, or did not validate: we don't apply this rule */
                got_a_match = 0;
                break;
             }