REST: don't return a 302 unless explicitely configured to

tbonfort · tbonfort · commit 4069d68fe3dd · 2015-06-19T12:56:09.000+02:00
diff --git a/lib/cache_rest.c b/lib/cache_rest.c
@@ -804,7 +804,7 @@ static int _mapcache_cache_rest_get(mapcache_context *ctx, mapcache_cache *pcach
   char *url;
   apr_table_t *headers;
   _mapcache_cache_rest_tile_url(ctx, tile, &rcache->rest, &rcache->rest.get_tile, &url);
-  if(tile->allow_redirect) {
+  if(tile->allow_redirect && rcache->use_redirects) {
     tile->redirect = url;
     return MAPCACHE_SUCCESS;
   }

Original file line number	Diff line number	Diff line change
`@@ -804,7 +804,7 @@ static int _mapcache_cache_rest_get(mapcache_context ctx, mapcache_cache pcach`
`804`	`804`	`char *url;`
`805`	`805`	`apr_table_t *headers;`
`806`	`806`	`_mapcache_cache_rest_tile_url(ctx, tile, &rcache->rest, &rcache->rest.get_tile, &url);`
`807`		`- if(tile->allow_redirect) {`
	`807`	`+ if(tile->allow_redirect && rcache->use_redirects) {`
`808`	`808`	`tile->redirect = url;`
`809`	`809`	`return MAPCACHE_SUCCESS;`
`810`	`810`	`}`