From 3a36ec55e0aaa30322bc0d73034a846bfb7143be Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Mon, 19 May 2025 14:01:28 +0200 Subject: [PATCH 01/24] add etag handling to all non-critical endpoints --- Cargo.lock | 21 +++++++++++++++++++++ Cargo.toml | 1 + martin/Cargo.toml | 1 + martin/src/srv/fonts.rs | 3 ++- martin/src/srv/server.rs | 6 +++--- martin/src/srv/sprites.rs | 22 ++++++++++++++-------- martin/src/srv/styles.rs | 3 ++- martin/src/srv/tiles_info.rs | 6 +++--- 8 files changed, 47 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1855f8995..1baa5531e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -83,6 +83,20 @@ dependencies = [ "syn 2.0.100", ] +[[package]] +name = "actix-middleware-etag" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf947271526f363aba604e2a735fb2792f63768c6ebdd06a30bf6df74a5ba06c" +dependencies = [ + "actix-service", + "actix-web", + "base64 0.22.1", + "futures", + "str-buf", + "xxhash-rust", +] + [[package]] name = "actix-router" version = "0.5.3" @@ -2771,6 +2785,7 @@ version = "0.16.0" dependencies = [ "actix-cors", "actix-http", + "actix-middleware-etag", "actix-rt", "actix-web", "actix-web-static-files", @@ -4878,6 +4893,12 @@ dependencies = [ "path-slash", ] +[[package]] +name = "str-buf" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ceb97b7225c713c2fd4db0153cb6b3cab244eb37900c3f634ed4d43310d8c34" + [[package]] name = "str_stack" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index e7027a518..804393dfb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,6 +31,7 @@ actix-http = "3" actix-rt = "2" actix-web = "4" actix-web-static-files = "4" +actix-middleware-etag = "0.4.4" anyhow = "1.0" approx = "0.5.1" async-trait = "0.1" diff --git a/martin/Cargo.toml b/martin/Cargo.toml index 30118d320..f81fa6fca 100644 --- a/martin/Cargo.toml +++ b/martin/Cargo.toml @@ -70,6 +70,7 @@ actix-http.workspace = true actix-rt.workspace = true actix-web-static-files = { workspace = true, optional = true } actix-web.workspace = true +actix-middleware-etag.workspace = true async-trait.workspace = true bit-set = { workspace = true, optional = true } clap.workspace = true diff --git a/martin/src/srv/fonts.rs b/martin/src/srv/fonts.rs index 8056be1a9..5e8d05af2 100644 --- a/martin/src/srv/fonts.rs +++ b/martin/src/srv/fonts.rs @@ -18,7 +18,8 @@ struct FontRequest { #[route( "/font/{fontstack}/{start}-{end}", method = "GET", - wrap = "middleware::Compress::default()" + wrap = "middleware::Compress::default()", + wrap = "actix_middleware_etag::Etag::default()" )] #[allow(clippy::unused_async)] async fn get_font(path: Path, fonts: Data) -> ActixResult { diff --git a/martin/src/srv/server.rs b/martin/src/srv/server.rs index acb977fe2..fe8a929ee 100644 --- a/martin/src/srv/server.rs +++ b/martin/src/srv/server.rs @@ -103,9 +103,9 @@ async fn get_health() -> impl Responder { #[route( "/catalog", - method = "GET", - method = "HEAD", - wrap = "middleware::Compress::default()" + method = "GET", method = "HEAD", + wrap = "middleware::Compress::default()", + wrap = "actix_middleware_etag::Etag::default()" )] #[allow(clippy::unused_async)] async fn get_catalog(catalog: Data) -> impl Responder { diff --git a/martin/src/srv/sprites.rs b/martin/src/srv/sprites.rs index a8cb32564..ca7f5a90c 100644 --- a/martin/src/srv/sprites.rs +++ b/martin/src/srv/sprites.rs @@ -10,7 +10,10 @@ use crate::sprites::{SpriteError, SpriteSources}; use crate::srv::SourceIDsRequest; use crate::srv::server::map_internal_error; -#[route("/sprite/{source_ids}.png", method = "GET", method = "HEAD")] +#[route("/sprite/{source_ids}.png", + method = "GET", method = "HEAD", + wrap = "actix_middleware_etag::Etag::default()" +)] async fn get_sprite_png( path: Path, sprites: Data, @@ -21,7 +24,10 @@ async fn get_sprite_png( .body(sheet.encode_png().map_err(map_internal_error)?)) } -#[route("/sdf_sprite/{source_ids}.png", method = "GET", method = "HEAD")] +#[route("/sdf_sprite/{source_ids}.png", + method = "GET", method = "HEAD", + wrap = "actix_middleware_etag::Etag::default()" +)] async fn get_sprite_sdf_png( path: Path, sprites: Data, @@ -34,9 +40,9 @@ async fn get_sprite_sdf_png( #[route( "/sprite/{source_ids}.json", - method = "GET", - method = "HEAD", - wrap = "middleware::Compress::default()" + method = "GET", method = "HEAD", + wrap = "middleware::Compress::default()", + wrap = "actix_middleware_etag::Etag::default()" )] async fn get_sprite_json( path: Path, @@ -48,9 +54,9 @@ async fn get_sprite_json( #[route( "/sdf_sprite/{source_ids}.json", - method = "GET", - method = "HEAD", - wrap = "middleware::Compress::default()" + method = "GET", method = "HEAD", + wrap = "middleware::Compress::default()", + wrap = "actix_middleware_etag::Etag::default()" )] async fn get_sprite_sdf_json( path: Path, diff --git a/martin/src/srv/styles.rs b/martin/src/srv/styles.rs index 0db7f9908..d499c5314 100644 --- a/martin/src/srv/styles.rs +++ b/martin/src/srv/styles.rs @@ -14,7 +14,8 @@ struct StyleRequest { #[route( "/style/{style_id}", method = "GET", - wrap = "middleware::Compress::default()" + wrap = "middleware::Compress::default()", + wrap = "actix_middleware_etag::Etag::default()" )] async fn get_style_json(path: Path, styles: Data) -> HttpResponse { let style_id = &path.style_id; diff --git a/martin/src/srv/tiles_info.rs b/martin/src/srv/tiles_info.rs index 9d0d97ae9..d3b766c03 100644 --- a/martin/src/srv/tiles_info.rs +++ b/martin/src/srv/tiles_info.rs @@ -18,9 +18,9 @@ pub struct SourceIDsRequest { #[route( "/{source_ids}", - method = "GET", - method = "HEAD", - wrap = "middleware::Compress::default()" + method = "GET", method = "HEAD", + wrap = "middleware::Compress::default()", + wrap = "actix_middleware_etag::Etag::default()" )] #[allow(clippy::unused_async)] async fn get_source_info( From 9af57bd127ec3d441212165ac85b0adefa70db45 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Mon, 19 May 2025 14:04:04 +0200 Subject: [PATCH 02/24] run cargo fmt --- martin/src/srv/server.rs | 3 ++- martin/src/srv/sprites.rs | 18 ++++++++++++------ martin/src/srv/tiles_info.rs | 3 ++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/martin/src/srv/server.rs b/martin/src/srv/server.rs index fe8a929ee..106f9da67 100644 --- a/martin/src/srv/server.rs +++ b/martin/src/srv/server.rs @@ -103,7 +103,8 @@ async fn get_health() -> impl Responder { #[route( "/catalog", - method = "GET", method = "HEAD", + method = "GET", + method = "HEAD", wrap = "middleware::Compress::default()", wrap = "actix_middleware_etag::Etag::default()" )] diff --git a/martin/src/srv/sprites.rs b/martin/src/srv/sprites.rs index ca7f5a90c..773b8ec22 100644 --- a/martin/src/srv/sprites.rs +++ b/martin/src/srv/sprites.rs @@ -10,8 +10,10 @@ use crate::sprites::{SpriteError, SpriteSources}; use crate::srv::SourceIDsRequest; use crate::srv::server::map_internal_error; -#[route("/sprite/{source_ids}.png", - method = "GET", method = "HEAD", +#[route( + "/sprite/{source_ids}.png", + method = "GET", + method = "HEAD", wrap = "actix_middleware_etag::Etag::default()" )] async fn get_sprite_png( @@ -24,8 +26,10 @@ async fn get_sprite_png( .body(sheet.encode_png().map_err(map_internal_error)?)) } -#[route("/sdf_sprite/{source_ids}.png", - method = "GET", method = "HEAD", +#[route( + "/sdf_sprite/{source_ids}.png", + method = "GET", + method = "HEAD", wrap = "actix_middleware_etag::Etag::default()" )] async fn get_sprite_sdf_png( @@ -40,7 +44,8 @@ async fn get_sprite_sdf_png( #[route( "/sprite/{source_ids}.json", - method = "GET", method = "HEAD", + method = "GET", + method = "HEAD", wrap = "middleware::Compress::default()", wrap = "actix_middleware_etag::Etag::default()" )] @@ -54,7 +59,8 @@ async fn get_sprite_json( #[route( "/sdf_sprite/{source_ids}.json", - method = "GET", method = "HEAD", + method = "GET", + method = "HEAD", wrap = "middleware::Compress::default()", wrap = "actix_middleware_etag::Etag::default()" )] diff --git a/martin/src/srv/tiles_info.rs b/martin/src/srv/tiles_info.rs index d3b766c03..a5c551dfd 100644 --- a/martin/src/srv/tiles_info.rs +++ b/martin/src/srv/tiles_info.rs @@ -18,7 +18,8 @@ pub struct SourceIDsRequest { #[route( "/{source_ids}", - method = "GET", method = "HEAD", + method = "GET", + method = "HEAD", wrap = "middleware::Compress::default()", wrap = "actix_middleware_etag::Etag::default()" )] From 664e5a63683dd253ec79fcdcc17de1d7a29be22e Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Mon, 19 May 2025 14:09:03 +0200 Subject: [PATCH 03/24] resort dependencys --- Cargo.toml | 2 +- martin/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 804393dfb..41834e478 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,10 +28,10 @@ struct_field_names = "allow" [workspace.dependencies] actix-cors = "0.7" actix-http = "3" +actix-middleware-etag = "0.4.4" actix-rt = "2" actix-web = "4" actix-web-static-files = "4" -actix-middleware-etag = "0.4.4" anyhow = "1.0" approx = "0.5.1" async-trait = "0.1" diff --git a/martin/Cargo.toml b/martin/Cargo.toml index f81fa6fca..6e1f68580 100644 --- a/martin/Cargo.toml +++ b/martin/Cargo.toml @@ -67,10 +67,10 @@ bless-tests = [] [dependencies] actix-cors.workspace = true actix-http.workspace = true +actix-middleware-etag.workspace = true actix-rt.workspace = true actix-web-static-files = { workspace = true, optional = true } actix-web.workspace = true -actix-middleware-etag.workspace = true async-trait.workspace = true bit-set = { workspace = true, optional = true } clap.workspace = true From 630324702e8fcdbcbf6f03046e323331d16d4056 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Mon, 19 May 2025 14:27:48 +0200 Subject: [PATCH 04/24] use imports instea of direct referencing --- martin/src/srv/fonts.rs | 3 ++- martin/src/srv/server.rs | 3 ++- martin/src/srv/sprites.rs | 9 +++++---- martin/src/srv/styles.rs | 4 ++-- martin/src/srv/tiles_info.rs | 3 ++- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/martin/src/srv/fonts.rs b/martin/src/srv/fonts.rs index 5e8d05af2..dab6fbc01 100644 --- a/martin/src/srv/fonts.rs +++ b/martin/src/srv/fonts.rs @@ -1,5 +1,6 @@ use std::string::ToString; +use actix_middleware_etag::Etag; use actix_web::error::{ErrorBadRequest, ErrorNotFound}; use actix_web::web::{Data, Path}; use actix_web::{HttpResponse, Result as ActixResult, middleware, route}; @@ -19,7 +20,7 @@ struct FontRequest { "/font/{fontstack}/{start}-{end}", method = "GET", wrap = "middleware::Compress::default()", - wrap = "actix_middleware_etag::Etag::default()" + wrap = "Etag::default()" )] #[allow(clippy::unused_async)] async fn get_font(path: Path, fonts: Data) -> ActixResult { diff --git a/martin/src/srv/server.rs b/martin/src/srv/server.rs index 106f9da67..cc61958e7 100644 --- a/martin/src/srv/server.rs +++ b/martin/src/srv/server.rs @@ -24,6 +24,7 @@ use crate::source::TileCatalog; use crate::srv::config::{KEEP_ALIVE_DEFAULT, LISTEN_ADDRESSES_DEFAULT, SrvConfig}; use crate::srv::tiles::get_tile; use crate::srv::tiles_info::get_source_info; +use actix_middleware_etag::Etag; #[cfg(feature = "webui")] mod webui { @@ -106,7 +107,7 @@ async fn get_health() -> impl Responder { method = "GET", method = "HEAD", wrap = "middleware::Compress::default()", - wrap = "actix_middleware_etag::Etag::default()" + wrap = "Etag::default()" )] #[allow(clippy::unused_async)] async fn get_catalog(catalog: Data) -> impl Responder { diff --git a/martin/src/srv/sprites.rs b/martin/src/srv/sprites.rs index 773b8ec22..3cfd576fc 100644 --- a/martin/src/srv/sprites.rs +++ b/martin/src/srv/sprites.rs @@ -1,5 +1,6 @@ use std::string::ToString; +use actix_middleware_etag::Etag; use actix_web::error::ErrorNotFound; use actix_web::http::header::ContentType; use actix_web::web::{Data, Path}; @@ -14,7 +15,7 @@ use crate::srv::server::map_internal_error; "/sprite/{source_ids}.png", method = "GET", method = "HEAD", - wrap = "actix_middleware_etag::Etag::default()" + wrap = "Etag::default()" )] async fn get_sprite_png( path: Path, @@ -30,7 +31,7 @@ async fn get_sprite_png( "/sdf_sprite/{source_ids}.png", method = "GET", method = "HEAD", - wrap = "actix_middleware_etag::Etag::default()" + wrap = "Etag::default()" )] async fn get_sprite_sdf_png( path: Path, @@ -47,7 +48,7 @@ async fn get_sprite_sdf_png( method = "GET", method = "HEAD", wrap = "middleware::Compress::default()", - wrap = "actix_middleware_etag::Etag::default()" + wrap = "Etag::default()" )] async fn get_sprite_json( path: Path, @@ -62,7 +63,7 @@ async fn get_sprite_json( method = "GET", method = "HEAD", wrap = "middleware::Compress::default()", - wrap = "actix_middleware_etag::Etag::default()" + wrap = "Etag::default()" )] async fn get_sprite_sdf_json( path: Path, diff --git a/martin/src/srv/styles.rs b/martin/src/srv/styles.rs index d499c5314..8dcb7e2b6 100644 --- a/martin/src/srv/styles.rs +++ b/martin/src/srv/styles.rs @@ -1,11 +1,11 @@ use crate::styles::StyleSources; +use actix_middleware_etag::Etag; use actix_web::http::header::ContentType; use actix_web::middleware; use actix_web::web::{Data, Path}; use actix_web::{HttpResponse, route}; use log::error; use serde::Deserialize; - #[derive(Deserialize, Debug)] struct StyleRequest { style_id: String, @@ -15,7 +15,7 @@ struct StyleRequest { "/style/{style_id}", method = "GET", wrap = "middleware::Compress::default()", - wrap = "actix_middleware_etag::Etag::default()" + wrap = "Etag::default()" )] async fn get_style_json(path: Path, styles: Data) -> HttpResponse { let style_id = &path.style_id; diff --git a/martin/src/srv/tiles_info.rs b/martin/src/srv/tiles_info.rs index a5c551dfd..cfa441a39 100644 --- a/martin/src/srv/tiles_info.rs +++ b/martin/src/srv/tiles_info.rs @@ -1,5 +1,6 @@ use std::string::ToString; +use actix_middleware_etag::Etag; use actix_web::error::ErrorBadRequest; use actix_web::http::Uri; use actix_web::web::{Data, Path}; @@ -21,7 +22,7 @@ pub struct SourceIDsRequest { method = "GET", method = "HEAD", wrap = "middleware::Compress::default()", - wrap = "actix_middleware_etag::Etag::default()" + wrap = "Etag::default()" )] #[allow(clippy::unused_async)] async fn get_source_info( From f39bf8cfe68485a0bc82d5286f890ebc7d3142f4 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Mon, 19 May 2025 14:34:38 +0200 Subject: [PATCH 05/24] fix accidental whitespace change --- martin/src/srv/styles.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/martin/src/srv/styles.rs b/martin/src/srv/styles.rs index 8dcb7e2b6..2dfbc1ac5 100644 --- a/martin/src/srv/styles.rs +++ b/martin/src/srv/styles.rs @@ -6,6 +6,7 @@ use actix_web::web::{Data, Path}; use actix_web::{HttpResponse, route}; use log::error; use serde::Deserialize; + #[derive(Deserialize, Debug)] struct StyleRequest { style_id: String, From a711616f77a07a59b0d5d48382b9195206ecf792 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Mon, 19 May 2025 14:45:26 +0200 Subject: [PATCH 06/24] fix clippy lints --- martin/src/srv/fonts.rs | 2 +- martin/src/srv/server.rs | 2 +- martin/src/srv/sprites.rs | 8 ++++---- martin/src/srv/styles.rs | 2 +- martin/src/srv/tiles_info.rs | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/martin/src/srv/fonts.rs b/martin/src/srv/fonts.rs index dab6fbc01..edaf9b59b 100644 --- a/martin/src/srv/fonts.rs +++ b/martin/src/srv/fonts.rs @@ -20,7 +20,7 @@ struct FontRequest { "/font/{fontstack}/{start}-{end}", method = "GET", wrap = "middleware::Compress::default()", - wrap = "Etag::default()" + wrap = "Etag" )] #[allow(clippy::unused_async)] async fn get_font(path: Path, fonts: Data) -> ActixResult { diff --git a/martin/src/srv/server.rs b/martin/src/srv/server.rs index cc61958e7..ec7cdb726 100644 --- a/martin/src/srv/server.rs +++ b/martin/src/srv/server.rs @@ -107,7 +107,7 @@ async fn get_health() -> impl Responder { method = "GET", method = "HEAD", wrap = "middleware::Compress::default()", - wrap = "Etag::default()" + wrap = "Etag" )] #[allow(clippy::unused_async)] async fn get_catalog(catalog: Data) -> impl Responder { diff --git a/martin/src/srv/sprites.rs b/martin/src/srv/sprites.rs index 3cfd576fc..500d3f889 100644 --- a/martin/src/srv/sprites.rs +++ b/martin/src/srv/sprites.rs @@ -15,7 +15,7 @@ use crate::srv::server::map_internal_error; "/sprite/{source_ids}.png", method = "GET", method = "HEAD", - wrap = "Etag::default()" + wrap = "Etag" )] async fn get_sprite_png( path: Path, @@ -31,7 +31,7 @@ async fn get_sprite_png( "/sdf_sprite/{source_ids}.png", method = "GET", method = "HEAD", - wrap = "Etag::default()" + wrap = "Etag" )] async fn get_sprite_sdf_png( path: Path, @@ -48,7 +48,7 @@ async fn get_sprite_sdf_png( method = "GET", method = "HEAD", wrap = "middleware::Compress::default()", - wrap = "Etag::default()" + wrap = "Etag" )] async fn get_sprite_json( path: Path, @@ -63,7 +63,7 @@ async fn get_sprite_json( method = "GET", method = "HEAD", wrap = "middleware::Compress::default()", - wrap = "Etag::default()" + wrap = "Etag" )] async fn get_sprite_sdf_json( path: Path, diff --git a/martin/src/srv/styles.rs b/martin/src/srv/styles.rs index 2dfbc1ac5..6624e4ad1 100644 --- a/martin/src/srv/styles.rs +++ b/martin/src/srv/styles.rs @@ -16,7 +16,7 @@ struct StyleRequest { "/style/{style_id}", method = "GET", wrap = "middleware::Compress::default()", - wrap = "Etag::default()" + wrap = "Etag" )] async fn get_style_json(path: Path, styles: Data) -> HttpResponse { let style_id = &path.style_id; diff --git a/martin/src/srv/tiles_info.rs b/martin/src/srv/tiles_info.rs index cfa441a39..150cd428b 100644 --- a/martin/src/srv/tiles_info.rs +++ b/martin/src/srv/tiles_info.rs @@ -22,7 +22,7 @@ pub struct SourceIDsRequest { method = "GET", method = "HEAD", wrap = "middleware::Compress::default()", - wrap = "Etag::default()" + wrap = "Etag" )] #[allow(clippy::unused_async)] async fn get_source_info( From 43bdd4ed89ab0a64d31443da1ee60ac149155ec0 Mon Sep 17 00:00:00 2001 From: sharkAndshark Date: Wed, 21 May 2025 15:59:51 +0800 Subject: [PATCH 07/24] fmt and clippy --- martin/src/cog/source.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/martin/src/cog/source.rs b/martin/src/cog/source.rs index 48362e587..4cc5357d6 100644 --- a/martin/src/cog/source.rs +++ b/martin/src/cog/source.rs @@ -598,7 +598,7 @@ mod tests { // Both are None, which is expected } _ => { - panic!("Origin {:?} does not match expected {:?}", origin, expected); + panic!("Origin {origin:?} does not match expected {expected:?}"); } } } From 1cb751cc6956f60c8f47aae98319f9cfe0f17510 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Wed, 21 May 2025 10:43:34 +0200 Subject: [PATCH 08/24] change the import as requested --- martin/src/srv/fonts.rs | 4 ++-- martin/src/srv/server.rs | 10 +++++----- martin/src/srv/sprites.rs | 6 +++--- martin/src/srv/styles.rs | 4 ++-- martin/src/srv/tiles_info.rs | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/martin/src/srv/fonts.rs b/martin/src/srv/fonts.rs index edaf9b59b..495f8377d 100644 --- a/martin/src/srv/fonts.rs +++ b/martin/src/srv/fonts.rs @@ -3,7 +3,7 @@ use std::string::ToString; use actix_middleware_etag::Etag; use actix_web::error::{ErrorBadRequest, ErrorNotFound}; use actix_web::web::{Data, Path}; -use actix_web::{HttpResponse, Result as ActixResult, middleware, route}; +use actix_web::{HttpResponse, Result as ActixResult, middleware::Compress, route}; use serde::Deserialize; use crate::fonts::{FontError, FontSources}; @@ -19,7 +19,7 @@ struct FontRequest { #[route( "/font/{fontstack}/{start}-{end}", method = "GET", - wrap = "middleware::Compress::default()", + wrap = "Compress::default()", wrap = "Etag" )] #[allow(clippy::unused_async)] diff --git a/martin/src/srv/server.rs b/martin/src/srv/server.rs index ec7cdb726..d793686be 100644 --- a/martin/src/srv/server.rs +++ b/martin/src/srv/server.rs @@ -6,9 +6,9 @@ use std::time::Duration; use actix_cors::Cors; use actix_web::error::ErrorInternalServerError; use actix_web::http::header::CACHE_CONTROL; -use actix_web::middleware::TrailingSlash; +use actix_web::middleware::{Compress, Logger, NormalizePath, TrailingSlash}; use actix_web::web::Data; -use actix_web::{App, HttpResponse, HttpServer, Responder, middleware, route, web}; +use actix_web::{App, HttpResponse, HttpServer, Responder, route, web}; use futures::TryFutureExt; #[cfg(feature = "lambda")] use lambda_web::{is_running_on_lambda, run_actix_on_lambda}; @@ -106,7 +106,7 @@ async fn get_health() -> impl Responder { "/catalog", method = "GET", method = "HEAD", - wrap = "middleware::Compress::default()", + wrap = "Compress::default()", wrap = "Etag" )] #[allow(clippy::unused_async)] @@ -184,8 +184,8 @@ pub fn new_server(config: SrvConfig, state: ServerState) -> MartinResult<(Server app.app_data(Data::new(catalog.clone())) .app_data(Data::new(config.clone())) .wrap(cors_middleware) - .wrap(middleware::NormalizePath::new(TrailingSlash::MergeOnly)) - .wrap(middleware::Logger::default()) + .wrap(NormalizePath::new(TrailingSlash::MergeOnly)) + .wrap(Logger::default()) .configure(|c| router(c, &config)) }; diff --git a/martin/src/srv/sprites.rs b/martin/src/srv/sprites.rs index 500d3f889..55dc502d2 100644 --- a/martin/src/srv/sprites.rs +++ b/martin/src/srv/sprites.rs @@ -4,7 +4,7 @@ use actix_middleware_etag::Etag; use actix_web::error::ErrorNotFound; use actix_web::http::header::ContentType; use actix_web::web::{Data, Path}; -use actix_web::{HttpResponse, Result as ActixResult, middleware, route}; +use actix_web::{HttpResponse, Result as ActixResult, middleware::Compress, route}; use spreet::Spritesheet; use crate::sprites::{SpriteError, SpriteSources}; @@ -47,7 +47,7 @@ async fn get_sprite_sdf_png( "/sprite/{source_ids}.json", method = "GET", method = "HEAD", - wrap = "middleware::Compress::default()", + wrap = "Compress::default()", wrap = "Etag" )] async fn get_sprite_json( @@ -62,7 +62,7 @@ async fn get_sprite_json( "/sdf_sprite/{source_ids}.json", method = "GET", method = "HEAD", - wrap = "middleware::Compress::default()", + wrap = "Compress::default()", wrap = "Etag" )] async fn get_sprite_sdf_json( diff --git a/martin/src/srv/styles.rs b/martin/src/srv/styles.rs index 6624e4ad1..ac7e46d5b 100644 --- a/martin/src/srv/styles.rs +++ b/martin/src/srv/styles.rs @@ -1,7 +1,7 @@ use crate::styles::StyleSources; use actix_middleware_etag::Etag; use actix_web::http::header::ContentType; -use actix_web::middleware; +use actix_web::middleware::Compress; use actix_web::web::{Data, Path}; use actix_web::{HttpResponse, route}; use log::error; @@ -15,7 +15,7 @@ struct StyleRequest { #[route( "/style/{style_id}", method = "GET", - wrap = "middleware::Compress::default()", + wrap = "Compress::default()", wrap = "Etag" )] async fn get_style_json(path: Path, styles: Data) -> HttpResponse { diff --git a/martin/src/srv/tiles_info.rs b/martin/src/srv/tiles_info.rs index 150cd428b..84aa48ea2 100644 --- a/martin/src/srv/tiles_info.rs +++ b/martin/src/srv/tiles_info.rs @@ -4,7 +4,7 @@ use actix_middleware_etag::Etag; use actix_web::error::ErrorBadRequest; use actix_web::http::Uri; use actix_web::web::{Data, Path}; -use actix_web::{HttpRequest, HttpResponse, Result as ActixResult, middleware, route}; +use actix_web::{HttpRequest, HttpResponse, Result as ActixResult, middleware::Compress, route}; use itertools::Itertools as _; use serde::Deserialize; use tilejson::{TileJSON, tilejson}; @@ -21,7 +21,7 @@ pub struct SourceIDsRequest { "/{source_ids}", method = "GET", method = "HEAD", - wrap = "middleware::Compress::default()", + wrap = "Compress::default()", wrap = "Etag" )] #[allow(clippy::unused_async)] From d934616afa68b0a63aceb9632eb894bfbe4e84b0 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Wed, 21 May 2025 11:24:28 +0200 Subject: [PATCH 09/24] asserted that headers don't change --- tests/expected/configured/pmt2_0_0_0.png.txt | 2 +- tests/test.sh | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/expected/configured/pmt2_0_0_0.png.txt b/tests/expected/configured/pmt2_0_0_0.png.txt index 1587845ee..ef543da60 100644 --- a/tests/expected/configured/pmt2_0_0_0.png.txt +++ b/tests/expected/configured/pmt2_0_0_0.png.txt @@ -1 +1 @@ -tests/output/configured/pmt2_0_0_0.png: RIFF (little-endian) data, Web/P image +tests/output/configured/pmt2_0_0_0.png: RIFF (little-endian) data, Web/P image, with alpha, 511+1x511+1 diff --git a/tests/test.sh b/tests/test.sh index 8f97d5e32..3e019f5ff 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -94,7 +94,7 @@ test_jsn() { echo "Testing $(basename "$FILENAME") from $URL" # jq before 1.6 had a different float->int behavior, so trying to make it consistent in all - $CURL "$URL" | jq --sort-keys -e 'walk(if type == "number" then .+0.0 else . end)' > "$FILENAME" + $CURL --dump-header "$FILENAME.headers" "$URL" | jq --sort-keys -e 'walk(if type == "number" then .+0.0 else . end)' > "$FILENAME" } test_pbf() { @@ -102,7 +102,7 @@ test_pbf() { URL="$MARTIN_URL/$2" echo "Testing $(basename "$FILENAME") from $URL" - $CURL "$URL" > "$FILENAME" + $CURL --dump-header "$FILENAME.headers" "$URL" > "$FILENAME" if [[ $OSTYPE == linux* ]]; then ./tests/fixtures/vtzero-check "$FILENAME" @@ -119,7 +119,7 @@ test_png() { URL="$MARTIN_URL/$2" echo "Testing $(basename "$FILENAME") from $URL" - $CURL "$URL" > "$FILENAME" + $CURL --dump-header "$FILENAME.headers" "$URL" > "$FILENAME" if [[ $OSTYPE == linux* ]]; then file "$FILENAME" > "$FILENAME.txt" @@ -136,7 +136,7 @@ test_font() { URL="$MARTIN_URL/$2" echo "Testing $(basename "$FILENAME") from $URL" - $CURL "$URL" > "$FILENAME" + $CURL --dump-header "$FILENAME.headers" "$URL" > "$FILENAME" } # Delete a line from a file $1 that matches parameter $2 @@ -613,4 +613,9 @@ fi rm -rf "$TEST_TEMP_DIR" +# now we need to strip the date header as it is undeterministic +find -type f -name "*.headers" -exec sed --regexp-extended --in-place "s/date: .+//" {} \; +# this is defintively not an header +find -type f -name "*.headers" -exec sed --regexp-extended --in-place "s/HTTP.+//" {} \; + >&2 echo "All integration tests have passed" From 267c5ddca5f2fbc879c6d497623f793dd65fc9ed Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Wed, 21 May 2025 11:24:53 +0200 Subject: [PATCH 10/24] asserted that headers don't change --- tests/expected/auto/catalog_auto.json.headers | 7 +++++++ tests/expected/auto/cmp.json.headers | 7 +++++++ tests/expected/auto/cmp_0_0_0.pbf.headers | 8 ++++++++ tests/expected/auto/cmp_12_3673_1911.pbf.headers | 8 ++++++++ tests/expected/auto/cmp_13_7346_3822.pbf.headers | 8 ++++++++ tests/expected/auto/cmp_14_14692_7645.pbf.headers | 8 ++++++++ tests/expected/auto/cmp_17_117542_61161.pbf.headers | 8 ++++++++ tests/expected/auto/cmp_18_235085_122323.pbf.headers | 8 ++++++++ tests/expected/auto/cmp_6_57_29.pbf.headers | 8 ++++++++ tests/expected/auto/fnc.json.headers | 7 +++++++ tests/expected/auto/fnc_0_0_0.pbf.headers | 8 ++++++++ tests/expected/auto/fnc_12_3673_1911.pbf.headers | 8 ++++++++ tests/expected/auto/fnc_13_7346_3822.pbf.headers | 8 ++++++++ tests/expected/auto/fnc_14_14692_7645.pbf.headers | 8 ++++++++ tests/expected/auto/fnc_17_117542_61161.pbf.headers | 8 ++++++++ tests/expected/auto/fnc_18_235085_122323.pbf.headers | 8 ++++++++ tests/expected/auto/fnc_6_57_29.pbf.headers | 8 ++++++++ tests/expected/auto/fnc_b.json.headers | 7 +++++++ tests/expected/auto/fnc_b_6_38_20.pbf.headers | 8 ++++++++ tests/expected/auto/fnc_comment.json.headers | 7 +++++++ tests/expected/auto/fnc_token.json.headers | 7 +++++++ tests/expected/auto/fnc_token_0_0_0.pbf.headers | 8 ++++++++ tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers | 8 ++++++++ tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers | 8 ++++++++ tests/expected/auto/fnc_zxy_6_57_29.pbf.headers | 8 ++++++++ tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers | 8 ++++++++ tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers | 8 ++++++++ tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers | 8 ++++++++ tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers | 8 ++++++++ tests/expected/auto/mb_jpg.json.headers | 7 +++++++ tests/expected/auto/mb_jpg_0_0_0.jpg.headers | 7 +++++++ tests/expected/auto/mb_mvt.json.headers | 7 +++++++ tests/expected/auto/mb_mvt_2_3_1.pbf.headers | 8 ++++++++ tests/expected/auto/mb_png.json.headers | 7 +++++++ tests/expected/auto/mb_png_0_0_0.png.headers | 7 +++++++ tests/expected/auto/pmt.json.headers | 7 +++++++ tests/expected/auto/pmt_3_4_2.png.headers | 7 +++++++ tests/expected/auto/points3857_srid.json.headers | 7 +++++++ tests/expected/auto/points3857_srid_0_0_0.pbf.headers | 8 ++++++++ tests/expected/auto/points_empty_srid_0_0_0.pbf.headers | 8 ++++++++ tests/expected/auto/rgb_u8.json.headers | 7 +++++++ tests/expected/auto/rgb_u8_0_0_0.png.headers | 8 ++++++++ tests/expected/auto/rgb_u8_3_0_0.png.headers | 8 ++++++++ tests/expected/auto/rgb_u8_3_1_1.png.headers | 8 ++++++++ tests/expected/auto/rgba_u8.json.headers | 7 +++++++ tests/expected/auto/rgba_u8_0_0_0.png.headers | 8 ++++++++ tests/expected/auto/rgba_u8_3_0_0.png.headers | 8 ++++++++ tests/expected/auto/rgba_u8_3_1_1.png.headers | 8 ++++++++ tests/expected/auto/rgba_u8_nodata.json.headers | 7 +++++++ tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers | 8 ++++++++ tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers | 8 ++++++++ tests/expected/auto/table_source.json.headers | 7 +++++++ tests/expected/auto/tbl_0_0_0.pbf.headers | 8 ++++++++ tests/expected/auto/tbl_12_3673_1911.pbf.headers | 8 ++++++++ tests/expected/auto/tbl_13_7346_3822.pbf.headers | 8 ++++++++ tests/expected/auto/tbl_14_14692_7645.pbf.headers | 8 ++++++++ tests/expected/auto/tbl_17_117542_61161.pbf.headers | 8 ++++++++ tests/expected/auto/tbl_18_235085_122323.pbf.headers | 8 ++++++++ tests/expected/auto/tbl_6_57_29.pbf.headers | 8 ++++++++ tests/expected/auto/tbl_comment.json.headers | 7 +++++++ tests/expected/auto/webp2_1_0_0.png.headers | 7 +++++++ tests/expected/auto_mini/catalog_auto.json.headers | 7 +++++++ tests/expected/configured/catalog_cfg.json.headers | 7 +++++++ tests/expected/configured/cmp.json.headers | 7 +++++++ tests/expected/configured/cmp_0_0_0.pbf.headers | 8 ++++++++ tests/expected/configured/fnc2_0_0_0.pbf.headers | 8 ++++++++ tests/expected/configured/fnc_0_0_0.pbf.headers | 8 ++++++++ tests/expected/configured/fnc_comment_cfg.json.headers | 7 +++++++ tests/expected/configured/font_1.pbf.headers | 7 +++++++ tests/expected/configured/font_2.pbf.headers | 7 +++++++ tests/expected/configured/font_3.pbf.headers | 7 +++++++ tests/expected/configured/pmt2_0_0_0.png.headers | 7 +++++++ tests/expected/configured/pmt_0_0_0.png.headers | 7 +++++++ tests/expected/configured/sdf_spr_cmp.json.headers | 7 +++++++ tests/expected/configured/sdf_spr_cmp.png.headers | 7 +++++++ tests/expected/configured/sdf_spr_cmp_2.json.headers | 7 +++++++ tests/expected/configured/sdf_spr_cmp_2.png.headers | 7 +++++++ tests/expected/configured/sdf_spr_mysrc.json.headers | 7 +++++++ tests/expected/configured/sdf_spr_mysrc.png.headers | 7 +++++++ tests/expected/configured/sdf_spr_src1.json.headers | 7 +++++++ tests/expected/configured/sdf_spr_src1.png.headers | 7 +++++++ tests/expected/configured/sdf_spr_src1_.json.headers | 7 +++++++ tests/expected/configured/sdf_spr_src1_.png.headers | 7 +++++++ tests/expected/configured/spr_cmp.json.headers | 7 +++++++ tests/expected/configured/spr_cmp.png.headers | 7 +++++++ tests/expected/configured/spr_cmp_2x.json.headers | 7 +++++++ tests/expected/configured/spr_cmp_2x.png.headers | 7 +++++++ tests/expected/configured/spr_mysrc.json.headers | 7 +++++++ tests/expected/configured/spr_mysrc.png.headers | 7 +++++++ tests/expected/configured/spr_mysrc_2x.json.headers | 7 +++++++ tests/expected/configured/spr_mysrc_2x.png.headers | 7 +++++++ tests/expected/configured/spr_src1.json.headers | 7 +++++++ tests/expected/configured/spr_src1.png.headers | 7 +++++++ tests/expected/configured/spr_src1_2x.json.headers | 7 +++++++ tests/expected/configured/spr_src1_2x.png.headers | 7 +++++++ .../configured/style_maplibre_demo.1.json.headers | 7 +++++++ .../expected/configured/style_maplibre_demo.json.headers | 7 +++++++ .../configured/style_src2_maptiler_basic.1.json.headers | 7 +++++++ .../configured/style_src2_maptiler_basic.json.headers | 7 +++++++ tests/expected/configured/tbl_0_0_0.pbf.headers | 8 ++++++++ tests/expected/configured/tbl_comment_cfg.json.headers | 7 +++++++ 101 files changed, 752 insertions(+) create mode 100644 tests/expected/auto/catalog_auto.json.headers create mode 100644 tests/expected/auto/cmp.json.headers create mode 100644 tests/expected/auto/cmp_0_0_0.pbf.headers create mode 100644 tests/expected/auto/cmp_12_3673_1911.pbf.headers create mode 100644 tests/expected/auto/cmp_13_7346_3822.pbf.headers create mode 100644 tests/expected/auto/cmp_14_14692_7645.pbf.headers create mode 100644 tests/expected/auto/cmp_17_117542_61161.pbf.headers create mode 100644 tests/expected/auto/cmp_18_235085_122323.pbf.headers create mode 100644 tests/expected/auto/cmp_6_57_29.pbf.headers create mode 100644 tests/expected/auto/fnc.json.headers create mode 100644 tests/expected/auto/fnc_0_0_0.pbf.headers create mode 100644 tests/expected/auto/fnc_12_3673_1911.pbf.headers create mode 100644 tests/expected/auto/fnc_13_7346_3822.pbf.headers create mode 100644 tests/expected/auto/fnc_14_14692_7645.pbf.headers create mode 100644 tests/expected/auto/fnc_17_117542_61161.pbf.headers create mode 100644 tests/expected/auto/fnc_18_235085_122323.pbf.headers create mode 100644 tests/expected/auto/fnc_6_57_29.pbf.headers create mode 100644 tests/expected/auto/fnc_b.json.headers create mode 100644 tests/expected/auto/fnc_b_6_38_20.pbf.headers create mode 100644 tests/expected/auto/fnc_comment.json.headers create mode 100644 tests/expected/auto/fnc_token.json.headers create mode 100644 tests/expected/auto/fnc_token_0_0_0.pbf.headers create mode 100644 tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers create mode 100644 tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers create mode 100644 tests/expected/auto/fnc_zxy_6_57_29.pbf.headers create mode 100644 tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers create mode 100644 tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers create mode 100644 tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers create mode 100644 tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers create mode 100644 tests/expected/auto/mb_jpg.json.headers create mode 100644 tests/expected/auto/mb_jpg_0_0_0.jpg.headers create mode 100644 tests/expected/auto/mb_mvt.json.headers create mode 100644 tests/expected/auto/mb_mvt_2_3_1.pbf.headers create mode 100644 tests/expected/auto/mb_png.json.headers create mode 100644 tests/expected/auto/mb_png_0_0_0.png.headers create mode 100644 tests/expected/auto/pmt.json.headers create mode 100644 tests/expected/auto/pmt_3_4_2.png.headers create mode 100644 tests/expected/auto/points3857_srid.json.headers create mode 100644 tests/expected/auto/points3857_srid_0_0_0.pbf.headers create mode 100644 tests/expected/auto/points_empty_srid_0_0_0.pbf.headers create mode 100644 tests/expected/auto/rgb_u8.json.headers create mode 100644 tests/expected/auto/rgb_u8_0_0_0.png.headers create mode 100644 tests/expected/auto/rgb_u8_3_0_0.png.headers create mode 100644 tests/expected/auto/rgb_u8_3_1_1.png.headers create mode 100644 tests/expected/auto/rgba_u8.json.headers create mode 100644 tests/expected/auto/rgba_u8_0_0_0.png.headers create mode 100644 tests/expected/auto/rgba_u8_3_0_0.png.headers create mode 100644 tests/expected/auto/rgba_u8_3_1_1.png.headers create mode 100644 tests/expected/auto/rgba_u8_nodata.json.headers create mode 100644 tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers create mode 100644 tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers create mode 100644 tests/expected/auto/table_source.json.headers create mode 100644 tests/expected/auto/tbl_0_0_0.pbf.headers create mode 100644 tests/expected/auto/tbl_12_3673_1911.pbf.headers create mode 100644 tests/expected/auto/tbl_13_7346_3822.pbf.headers create mode 100644 tests/expected/auto/tbl_14_14692_7645.pbf.headers create mode 100644 tests/expected/auto/tbl_17_117542_61161.pbf.headers create mode 100644 tests/expected/auto/tbl_18_235085_122323.pbf.headers create mode 100644 tests/expected/auto/tbl_6_57_29.pbf.headers create mode 100644 tests/expected/auto/tbl_comment.json.headers create mode 100644 tests/expected/auto/webp2_1_0_0.png.headers create mode 100644 tests/expected/auto_mini/catalog_auto.json.headers create mode 100644 tests/expected/configured/catalog_cfg.json.headers create mode 100644 tests/expected/configured/cmp.json.headers create mode 100644 tests/expected/configured/cmp_0_0_0.pbf.headers create mode 100644 tests/expected/configured/fnc2_0_0_0.pbf.headers create mode 100644 tests/expected/configured/fnc_0_0_0.pbf.headers create mode 100644 tests/expected/configured/fnc_comment_cfg.json.headers create mode 100644 tests/expected/configured/font_1.pbf.headers create mode 100644 tests/expected/configured/font_2.pbf.headers create mode 100644 tests/expected/configured/font_3.pbf.headers create mode 100644 tests/expected/configured/pmt2_0_0_0.png.headers create mode 100644 tests/expected/configured/pmt_0_0_0.png.headers create mode 100644 tests/expected/configured/sdf_spr_cmp.json.headers create mode 100644 tests/expected/configured/sdf_spr_cmp.png.headers create mode 100644 tests/expected/configured/sdf_spr_cmp_2.json.headers create mode 100644 tests/expected/configured/sdf_spr_cmp_2.png.headers create mode 100644 tests/expected/configured/sdf_spr_mysrc.json.headers create mode 100644 tests/expected/configured/sdf_spr_mysrc.png.headers create mode 100644 tests/expected/configured/sdf_spr_src1.json.headers create mode 100644 tests/expected/configured/sdf_spr_src1.png.headers create mode 100644 tests/expected/configured/sdf_spr_src1_.json.headers create mode 100644 tests/expected/configured/sdf_spr_src1_.png.headers create mode 100644 tests/expected/configured/spr_cmp.json.headers create mode 100644 tests/expected/configured/spr_cmp.png.headers create mode 100644 tests/expected/configured/spr_cmp_2x.json.headers create mode 100644 tests/expected/configured/spr_cmp_2x.png.headers create mode 100644 tests/expected/configured/spr_mysrc.json.headers create mode 100644 tests/expected/configured/spr_mysrc.png.headers create mode 100644 tests/expected/configured/spr_mysrc_2x.json.headers create mode 100644 tests/expected/configured/spr_mysrc_2x.png.headers create mode 100644 tests/expected/configured/spr_src1.json.headers create mode 100644 tests/expected/configured/spr_src1.png.headers create mode 100644 tests/expected/configured/spr_src1_2x.json.headers create mode 100644 tests/expected/configured/spr_src1_2x.png.headers create mode 100644 tests/expected/configured/style_maplibre_demo.1.json.headers create mode 100644 tests/expected/configured/style_maplibre_demo.json.headers create mode 100644 tests/expected/configured/style_src2_maptiler_basic.1.json.headers create mode 100644 tests/expected/configured/style_src2_maptiler_basic.json.headers create mode 100644 tests/expected/configured/tbl_0_0_0.pbf.headers create mode 100644 tests/expected/configured/tbl_comment_cfg.json.headers diff --git a/tests/expected/auto/catalog_auto.json.headers b/tests/expected/auto/catalog_auto.json.headers new file mode 100644 index 000000000..cbf0673fb --- /dev/null +++ b/tests/expected/auto/catalog_auto.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +content-encoding: br +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/cmp.json.headers b/tests/expected/auto/cmp.json.headers new file mode 100644 index 000000000..cbf0673fb --- /dev/null +++ b/tests/expected/auto/cmp.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +content-encoding: br +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/cmp_0_0_0.pbf.headers b/tests/expected/auto/cmp_0_0_0.pbf.headers new file mode 100644 index 000000000..f3bfb1865 --- /dev/null +++ b/tests/expected/auto/cmp_0_0_0.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 1150 +etag: "293815559851244067215006259112061301509" +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/x-protobuf + + diff --git a/tests/expected/auto/cmp_12_3673_1911.pbf.headers b/tests/expected/auto/cmp_12_3673_1911.pbf.headers new file mode 100644 index 000000000..d09e13c7d --- /dev/null +++ b/tests/expected/auto/cmp_12_3673_1911.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 228 +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/x-protobuf +etag: "65126464844181472926168475650420052208" + + diff --git a/tests/expected/auto/cmp_13_7346_3822.pbf.headers b/tests/expected/auto/cmp_13_7346_3822.pbf.headers new file mode 100644 index 000000000..68d36e06a --- /dev/null +++ b/tests/expected/auto/cmp_13_7346_3822.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 229 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/x-protobuf +content-encoding: gzip +etag: "285993515030094388663176915274199952144" + + diff --git a/tests/expected/auto/cmp_14_14692_7645.pbf.headers b/tests/expected/auto/cmp_14_14692_7645.pbf.headers new file mode 100644 index 000000000..3aaf1e109 --- /dev/null +++ b/tests/expected/auto/cmp_14_14692_7645.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 241 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: gzip +etag: "311485364959417352099842717473316722909" +content-type: application/x-protobuf + + diff --git a/tests/expected/auto/cmp_17_117542_61161.pbf.headers b/tests/expected/auto/cmp_17_117542_61161.pbf.headers new file mode 100644 index 000000000..3af82813f --- /dev/null +++ b/tests/expected/auto/cmp_17_117542_61161.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 253 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: "45271956850074002467276433108641392681" +content-type: application/x-protobuf +content-encoding: gzip + + diff --git a/tests/expected/auto/cmp_18_235085_122323.pbf.headers b/tests/expected/auto/cmp_18_235085_122323.pbf.headers new file mode 100644 index 000000000..5781dcfa4 --- /dev/null +++ b/tests/expected/auto/cmp_18_235085_122323.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 255 +etag: "27476821680655535149048155649476331810" +content-type: application/x-protobuf +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/cmp_6_57_29.pbf.headers b/tests/expected/auto/cmp_6_57_29.pbf.headers new file mode 100644 index 000000000..15f74e464 --- /dev/null +++ b/tests/expected/auto/cmp_6_57_29.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 181 +content-type: application/x-protobuf +content-encoding: gzip +etag: "318858893996331708671731244488057597244" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/fnc.json.headers b/tests/expected/auto/fnc.json.headers new file mode 100644 index 000000000..cbf0673fb --- /dev/null +++ b/tests/expected/auto/fnc.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +content-encoding: br +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/fnc_0_0_0.pbf.headers b/tests/expected/auto/fnc_0_0_0.pbf.headers new file mode 100644 index 000000000..d3edccc6a --- /dev/null +++ b/tests/expected/auto/fnc_0_0_0.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 546 +etag: "50104397035412006126955407492289337352" +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/x-protobuf + + diff --git a/tests/expected/auto/fnc_12_3673_1911.pbf.headers b/tests/expected/auto/fnc_12_3673_1911.pbf.headers new file mode 100644 index 000000000..28ea96512 --- /dev/null +++ b/tests/expected/auto/fnc_12_3673_1911.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 131 +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/x-protobuf +etag: "316036929976559733097913904358871580694" + + diff --git a/tests/expected/auto/fnc_13_7346_3822.pbf.headers b/tests/expected/auto/fnc_13_7346_3822.pbf.headers new file mode 100644 index 000000000..02b1f5784 --- /dev/null +++ b/tests/expected/auto/fnc_13_7346_3822.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 133 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/x-protobuf +content-encoding: gzip +etag: "186991199734742473829029472341770943562" + + diff --git a/tests/expected/auto/fnc_14_14692_7645.pbf.headers b/tests/expected/auto/fnc_14_14692_7645.pbf.headers new file mode 100644 index 000000000..f4d47ff99 --- /dev/null +++ b/tests/expected/auto/fnc_14_14692_7645.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 141 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: gzip +etag: "270799230191288586610033918771820004719" +content-type: application/x-protobuf + + diff --git a/tests/expected/auto/fnc_17_117542_61161.pbf.headers b/tests/expected/auto/fnc_17_117542_61161.pbf.headers new file mode 100644 index 000000000..ea08af289 --- /dev/null +++ b/tests/expected/auto/fnc_17_117542_61161.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 146 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: "59732876737746661838673831051212271461" +content-type: application/x-protobuf +content-encoding: gzip + + diff --git a/tests/expected/auto/fnc_18_235085_122323.pbf.headers b/tests/expected/auto/fnc_18_235085_122323.pbf.headers new file mode 100644 index 000000000..0c9f1b547 --- /dev/null +++ b/tests/expected/auto/fnc_18_235085_122323.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 150 +etag: "188910840057561700607644193135209710567" +content-type: application/x-protobuf +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/fnc_6_57_29.pbf.headers b/tests/expected/auto/fnc_6_57_29.pbf.headers new file mode 100644 index 000000000..d6eec1c13 --- /dev/null +++ b/tests/expected/auto/fnc_6_57_29.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 106 +content-type: application/x-protobuf +content-encoding: gzip +etag: "148595474743525054411317108796671227677" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/fnc_b.json.headers b/tests/expected/auto/fnc_b.json.headers new file mode 100644 index 000000000..cbf0673fb --- /dev/null +++ b/tests/expected/auto/fnc_b.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +content-encoding: br +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/fnc_b_6_38_20.pbf.headers b/tests/expected/auto/fnc_b_6_38_20.pbf.headers new file mode 100644 index 000000000..aa43509e8 --- /dev/null +++ b/tests/expected/auto/fnc_b_6_38_20.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 110 +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/x-protobuf +etag: "339404027429166108039741083243940146201" + + diff --git a/tests/expected/auto/fnc_comment.json.headers b/tests/expected/auto/fnc_comment.json.headers new file mode 100644 index 000000000..56911f6df --- /dev/null +++ b/tests/expected/auto/fnc_comment.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-encoding: br +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/json + + diff --git a/tests/expected/auto/fnc_token.json.headers b/tests/expected/auto/fnc_token.json.headers new file mode 100644 index 000000000..cbf0673fb --- /dev/null +++ b/tests/expected/auto/fnc_token.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +content-encoding: br +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/fnc_token_0_0_0.pbf.headers b/tests/expected/auto/fnc_token_0_0_0.pbf.headers new file mode 100644 index 000000000..e6eee0052 --- /dev/null +++ b/tests/expected/auto/fnc_token_0_0_0.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 551 +etag: "197420765542523001088152476290493617488" +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/x-protobuf + + diff --git a/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers b/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers new file mode 100644 index 000000000..cfb9aef1f --- /dev/null +++ b/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 104 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/x-protobuf +content-encoding: gzip +etag: "313925108765747031844863332687426553785" + + diff --git a/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers new file mode 100644 index 000000000..4fdc0b1e4 --- /dev/null +++ b/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 103 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: "134723745777099237261560614323384911032" +content-type: application/x-protobuf +content-encoding: gzip + + diff --git a/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers new file mode 100644 index 000000000..0a66302e6 --- /dev/null +++ b/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 101 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: gzip +etag: "234076532504863321998415269051837419664" +content-type: application/x-protobuf + + diff --git a/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers new file mode 100644 index 000000000..3e96bfe68 --- /dev/null +++ b/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 106 +etag: "148595474743525054411317108796671227677" +content-type: application/x-protobuf +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers new file mode 100644 index 000000000..fcf7fe86b --- /dev/null +++ b/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 115 +etag: "205494963574970857606832668009198552781" +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/x-protobuf + + diff --git a/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers new file mode 100644 index 000000000..98083492b --- /dev/null +++ b/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 107 +content-type: application/x-protobuf +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: "133204562788894152562072143322114701432" + + diff --git a/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers new file mode 100644 index 000000000..117cf4c1d --- /dev/null +++ b/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 107 +content-type: application/x-protobuf +content-encoding: gzip +etag: "18077437226671957325453576147625224838" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/mb_jpg.json.headers b/tests/expected/auto/mb_jpg.json.headers new file mode 100644 index 000000000..cbf0673fb --- /dev/null +++ b/tests/expected/auto/mb_jpg.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +content-encoding: br +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/mb_jpg_0_0_0.jpg.headers b/tests/expected/auto/mb_jpg_0_0_0.jpg.headers new file mode 100644 index 000000000..9e170b24c --- /dev/null +++ b/tests/expected/auto/mb_jpg_0_0_0.jpg.headers @@ -0,0 +1,7 @@ + +content-length: 22142 +etag: "80104354369725283657331287868672010947" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: image/jpeg + + diff --git a/tests/expected/auto/mb_mvt.json.headers b/tests/expected/auto/mb_mvt.json.headers new file mode 100644 index 000000000..d21963f6f --- /dev/null +++ b/tests/expected/auto/mb_mvt.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/json +content-encoding: br + + diff --git a/tests/expected/auto/mb_mvt_2_3_1.pbf.headers b/tests/expected/auto/mb_mvt_2_3_1.pbf.headers new file mode 100644 index 000000000..aed067f75 --- /dev/null +++ b/tests/expected/auto/mb_mvt_2_3_1.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 263 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: gzip +etag: "271488406274339672223474380565368146077" +content-type: application/x-protobuf + + diff --git a/tests/expected/auto/mb_png.json.headers b/tests/expected/auto/mb_png.json.headers new file mode 100644 index 000000000..cbf0673fb --- /dev/null +++ b/tests/expected/auto/mb_png.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +content-encoding: br +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/mb_png_0_0_0.png.headers b/tests/expected/auto/mb_png_0_0_0.png.headers new file mode 100644 index 000000000..d8b2e09b2 --- /dev/null +++ b/tests/expected/auto/mb_png_0_0_0.png.headers @@ -0,0 +1,7 @@ + +content-length: 21246 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: image/png +etag: "198224485858177844679225803711953162005" + + diff --git a/tests/expected/auto/pmt.json.headers b/tests/expected/auto/pmt.json.headers new file mode 100644 index 000000000..14fd52f8b --- /dev/null +++ b/tests/expected/auto/pmt.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br +content-type: application/json + + diff --git a/tests/expected/auto/pmt_3_4_2.png.headers b/tests/expected/auto/pmt_3_4_2.png.headers new file mode 100644 index 000000000..f4456c9d0 --- /dev/null +++ b/tests/expected/auto/pmt_3_4_2.png.headers @@ -0,0 +1,7 @@ + +content-length: 24475 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: "183528903823100539089486478518670939939" +content-type: image/png + + diff --git a/tests/expected/auto/points3857_srid.json.headers b/tests/expected/auto/points3857_srid.json.headers new file mode 100644 index 000000000..56911f6df --- /dev/null +++ b/tests/expected/auto/points3857_srid.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-encoding: br +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/json + + diff --git a/tests/expected/auto/points3857_srid_0_0_0.pbf.headers b/tests/expected/auto/points3857_srid_0_0_0.pbf.headers new file mode 100644 index 000000000..9b732ed65 --- /dev/null +++ b/tests/expected/auto/points3857_srid_0_0_0.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 339 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/x-protobuf +content-encoding: gzip +etag: "335534992707089786783362253468276926462" + + diff --git a/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers b/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers new file mode 100644 index 000000000..8176f1e33 --- /dev/null +++ b/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 351 +etag: "90067240564968210473015739826054346984" +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/x-protobuf + + diff --git a/tests/expected/auto/rgb_u8.json.headers b/tests/expected/auto/rgb_u8.json.headers new file mode 100644 index 000000000..d21963f6f --- /dev/null +++ b/tests/expected/auto/rgb_u8.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/json +content-encoding: br + + diff --git a/tests/expected/auto/rgb_u8_0_0_0.png.headers b/tests/expected/auto/rgb_u8_0_0_0.png.headers new file mode 100644 index 000000000..040974627 --- /dev/null +++ b/tests/expected/auto/rgb_u8_0_0_0.png.headers @@ -0,0 +1,8 @@ + +content-length: 1465 +etag: "91976870190390495135239397880759423411" +content-type: image/png +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/rgb_u8_3_0_0.png.headers b/tests/expected/auto/rgb_u8_3_0_0.png.headers new file mode 100644 index 000000000..54a6c9fa2 --- /dev/null +++ b/tests/expected/auto/rgb_u8_3_0_0.png.headers @@ -0,0 +1,8 @@ + +content-length: 26676 +content-type: image/png +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: "152292509766006539164689338463649870217" + + diff --git a/tests/expected/auto/rgb_u8_3_1_1.png.headers b/tests/expected/auto/rgb_u8_3_1_1.png.headers new file mode 100644 index 000000000..76a52f0b4 --- /dev/null +++ b/tests/expected/auto/rgb_u8_3_1_1.png.headers @@ -0,0 +1,8 @@ + +content-length: 294 +etag: "183196322924765665630178019653551670231" +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: image/png + + diff --git a/tests/expected/auto/rgba_u8.json.headers b/tests/expected/auto/rgba_u8.json.headers new file mode 100644 index 000000000..cbf0673fb --- /dev/null +++ b/tests/expected/auto/rgba_u8.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +content-encoding: br +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/rgba_u8_0_0_0.png.headers b/tests/expected/auto/rgba_u8_0_0_0.png.headers new file mode 100644 index 000000000..682784aa4 --- /dev/null +++ b/tests/expected/auto/rgba_u8_0_0_0.png.headers @@ -0,0 +1,8 @@ + +content-length: 1465 +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: image/png +etag: "91976870190390495135239397880759423411" + + diff --git a/tests/expected/auto/rgba_u8_3_0_0.png.headers b/tests/expected/auto/rgba_u8_3_0_0.png.headers new file mode 100644 index 000000000..90ca400a2 --- /dev/null +++ b/tests/expected/auto/rgba_u8_3_0_0.png.headers @@ -0,0 +1,8 @@ + +content-length: 26676 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: image/png +content-encoding: gzip +etag: "152292509766006539164689338463649870217" + + diff --git a/tests/expected/auto/rgba_u8_3_1_1.png.headers b/tests/expected/auto/rgba_u8_3_1_1.png.headers new file mode 100644 index 000000000..13b592fed --- /dev/null +++ b/tests/expected/auto/rgba_u8_3_1_1.png.headers @@ -0,0 +1,8 @@ + +content-length: 294 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: gzip +etag: "183196322924765665630178019653551670231" +content-type: image/png + + diff --git a/tests/expected/auto/rgba_u8_nodata.json.headers b/tests/expected/auto/rgba_u8_nodata.json.headers new file mode 100644 index 000000000..d21963f6f --- /dev/null +++ b/tests/expected/auto/rgba_u8_nodata.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/json +content-encoding: br + + diff --git a/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers b/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers new file mode 100644 index 000000000..273c38f55 --- /dev/null +++ b/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers @@ -0,0 +1,8 @@ + +content-length: 4183 +etag: "175670914983401421558985743183658650265" +content-type: image/png +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers b/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers new file mode 100644 index 000000000..9eedee2fc --- /dev/null +++ b/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers @@ -0,0 +1,8 @@ + +content-length: 12297 +content-type: image/png +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: "275838721038394963229380057336169680030" + + diff --git a/tests/expected/auto/table_source.json.headers b/tests/expected/auto/table_source.json.headers new file mode 100644 index 000000000..cbf0673fb --- /dev/null +++ b/tests/expected/auto/table_source.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +content-encoding: br +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/tbl_0_0_0.pbf.headers b/tests/expected/auto/tbl_0_0_0.pbf.headers new file mode 100644 index 000000000..d265ef56d --- /dev/null +++ b/tests/expected/auto/tbl_0_0_0.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 643 +etag: "318577514554804226527507038699986111507" +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/x-protobuf + + diff --git a/tests/expected/auto/tbl_12_3673_1911.pbf.headers b/tests/expected/auto/tbl_12_3673_1911.pbf.headers new file mode 100644 index 000000000..437c77892 --- /dev/null +++ b/tests/expected/auto/tbl_12_3673_1911.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 166 +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/x-protobuf +etag: "165500331794974714696813048024659138693" + + diff --git a/tests/expected/auto/tbl_13_7346_3822.pbf.headers b/tests/expected/auto/tbl_13_7346_3822.pbf.headers new file mode 100644 index 000000000..46fc0999e --- /dev/null +++ b/tests/expected/auto/tbl_13_7346_3822.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 171 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-type: application/x-protobuf +content-encoding: gzip +etag: "182700208357754381587588584330146829039" + + diff --git a/tests/expected/auto/tbl_14_14692_7645.pbf.headers b/tests/expected/auto/tbl_14_14692_7645.pbf.headers new file mode 100644 index 000000000..15051a5cf --- /dev/null +++ b/tests/expected/auto/tbl_14_14692_7645.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 178 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: gzip +etag: "117583176155265660497702615009162345318" +content-type: application/x-protobuf + + diff --git a/tests/expected/auto/tbl_17_117542_61161.pbf.headers b/tests/expected/auto/tbl_17_117542_61161.pbf.headers new file mode 100644 index 000000000..d8590e5bb --- /dev/null +++ b/tests/expected/auto/tbl_17_117542_61161.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 182 +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: "23665348455771460600771393648920396528" +content-type: application/x-protobuf +content-encoding: gzip + + diff --git a/tests/expected/auto/tbl_18_235085_122323.pbf.headers b/tests/expected/auto/tbl_18_235085_122323.pbf.headers new file mode 100644 index 000000000..7c0fa55b8 --- /dev/null +++ b/tests/expected/auto/tbl_18_235085_122323.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 181 +etag: "33647617359663494862827377733789484216" +content-type: application/x-protobuf +content-encoding: gzip +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/tbl_6_57_29.pbf.headers b/tests/expected/auto/tbl_6_57_29.pbf.headers new file mode 100644 index 000000000..8f31053a3 --- /dev/null +++ b/tests/expected/auto/tbl_6_57_29.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 138 +content-type: application/x-protobuf +content-encoding: gzip +etag: "198829004322648368710297325251207900127" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/tbl_comment.json.headers b/tests/expected/auto/tbl_comment.json.headers new file mode 100644 index 000000000..cbf0673fb --- /dev/null +++ b/tests/expected/auto/tbl_comment.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +content-encoding: br +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto/webp2_1_0_0.png.headers b/tests/expected/auto/webp2_1_0_0.png.headers new file mode 100644 index 000000000..af0597575 --- /dev/null +++ b/tests/expected/auto/webp2_1_0_0.png.headers @@ -0,0 +1,7 @@ + +content-length: 10658 +etag: "13022905490801985056512160688182263905" +content-type: image/webp +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/auto_mini/catalog_auto.json.headers b/tests/expected/auto_mini/catalog_auto.json.headers new file mode 100644 index 000000000..d990ab6e6 --- /dev/null +++ b/tests/expected/auto_mini/catalog_auto.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-encoding: br +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers + + diff --git a/tests/expected/configured/catalog_cfg.json.headers b/tests/expected/configured/catalog_cfg.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/catalog_cfg.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/cmp.json.headers b/tests/expected/configured/cmp.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/cmp.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/cmp_0_0_0.pbf.headers b/tests/expected/configured/cmp_0_0_0.pbf.headers new file mode 100644 index 000000000..4b66c60d1 --- /dev/null +++ b/tests/expected/configured/cmp_0_0_0.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 576 +content-type: application/x-protobuf +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: gzip +etag: "176859989575845169917449959758474492937" + + diff --git a/tests/expected/configured/fnc2_0_0_0.pbf.headers b/tests/expected/configured/fnc2_0_0_0.pbf.headers new file mode 100644 index 000000000..38f30b7b9 --- /dev/null +++ b/tests/expected/configured/fnc2_0_0_0.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 551 +content-type: application/x-protobuf +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: gzip +etag: "197420765542523001088152476290493617488" + + diff --git a/tests/expected/configured/fnc_0_0_0.pbf.headers b/tests/expected/configured/fnc_0_0_0.pbf.headers new file mode 100644 index 000000000..21e023696 --- /dev/null +++ b/tests/expected/configured/fnc_0_0_0.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 546 +content-type: application/x-protobuf +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: gzip +etag: "50104397035412006126955407492289337352" + + diff --git a/tests/expected/configured/fnc_comment_cfg.json.headers b/tests/expected/configured/fnc_comment_cfg.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/fnc_comment_cfg.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/font_1.pbf.headers b/tests/expected/configured/font_1.pbf.headers new file mode 100644 index 000000000..eabd9e3ee --- /dev/null +++ b/tests/expected/configured/font_1.pbf.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/x-protobuf +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/font_2.pbf.headers b/tests/expected/configured/font_2.pbf.headers new file mode 100644 index 000000000..eabd9e3ee --- /dev/null +++ b/tests/expected/configured/font_2.pbf.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/x-protobuf +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/font_3.pbf.headers b/tests/expected/configured/font_3.pbf.headers new file mode 100644 index 000000000..eabd9e3ee --- /dev/null +++ b/tests/expected/configured/font_3.pbf.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/x-protobuf +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/pmt2_0_0_0.png.headers b/tests/expected/configured/pmt2_0_0_0.png.headers new file mode 100644 index 000000000..c630e954d --- /dev/null +++ b/tests/expected/configured/pmt2_0_0_0.png.headers @@ -0,0 +1,7 @@ + +content-length: 11586 +content-type: image/webp +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: "319069140686520200453324848169489853378" + + diff --git a/tests/expected/configured/pmt_0_0_0.png.headers b/tests/expected/configured/pmt_0_0_0.png.headers new file mode 100644 index 000000000..a9c752b8d --- /dev/null +++ b/tests/expected/configured/pmt_0_0_0.png.headers @@ -0,0 +1,7 @@ + +content-length: 18404 +content-type: image/png +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: "109615783887137800409763947330857640552" + + diff --git a/tests/expected/configured/sdf_spr_cmp.json.headers b/tests/expected/configured/sdf_spr_cmp.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/sdf_spr_cmp.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/sdf_spr_cmp.png.headers b/tests/expected/configured/sdf_spr_cmp.png.headers new file mode 100644 index 000000000..9a4cd81d4 --- /dev/null +++ b/tests/expected/configured/sdf_spr_cmp.png.headers @@ -0,0 +1,7 @@ + +content-length: 945 +content-type: image/png +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: W/"3b1-qyh8Bev0R5Z2fLn83grsPw==" + + diff --git a/tests/expected/configured/sdf_spr_cmp_2.json.headers b/tests/expected/configured/sdf_spr_cmp_2.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/sdf_spr_cmp_2.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/sdf_spr_cmp_2.png.headers b/tests/expected/configured/sdf_spr_cmp_2.png.headers new file mode 100644 index 000000000..ac501e044 --- /dev/null +++ b/tests/expected/configured/sdf_spr_cmp_2.png.headers @@ -0,0 +1,7 @@ + +content-length: 1863 +content-type: image/png +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: W/"747-uY5SJOmaA0qgk9TmFw54yw==" + + diff --git a/tests/expected/configured/sdf_spr_mysrc.json.headers b/tests/expected/configured/sdf_spr_mysrc.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/sdf_spr_mysrc.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/sdf_spr_mysrc.png.headers b/tests/expected/configured/sdf_spr_mysrc.png.headers new file mode 100644 index 000000000..b325bd031 --- /dev/null +++ b/tests/expected/configured/sdf_spr_mysrc.png.headers @@ -0,0 +1,7 @@ + +content-length: 675 +content-type: image/png +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: W/"2a3-ju0zA7FbYbeaqMM_Qg1Iqg==" + + diff --git a/tests/expected/configured/sdf_spr_src1.json.headers b/tests/expected/configured/sdf_spr_src1.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/sdf_spr_src1.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/sdf_spr_src1.png.headers b/tests/expected/configured/sdf_spr_src1.png.headers new file mode 100644 index 000000000..5c8cde23d --- /dev/null +++ b/tests/expected/configured/sdf_spr_src1.png.headers @@ -0,0 +1,7 @@ + +content-length: 900 +content-type: image/png +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: W/"384-m3iOSdyLqIRO-1uu8tzIcw==" + + diff --git a/tests/expected/configured/sdf_spr_src1_.json.headers b/tests/expected/configured/sdf_spr_src1_.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/sdf_spr_src1_.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/sdf_spr_src1_.png.headers b/tests/expected/configured/sdf_spr_src1_.png.headers new file mode 100644 index 000000000..98ce7595d --- /dev/null +++ b/tests/expected/configured/sdf_spr_src1_.png.headers @@ -0,0 +1,7 @@ + +content-length: 1699 +content-type: image/png +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: W/"6a3-NdhmitklvJKSk_7phaxquw==" + + diff --git a/tests/expected/configured/spr_cmp.json.headers b/tests/expected/configured/spr_cmp.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/spr_cmp.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/spr_cmp.png.headers b/tests/expected/configured/spr_cmp.png.headers new file mode 100644 index 000000000..6c5db47b0 --- /dev/null +++ b/tests/expected/configured/spr_cmp.png.headers @@ -0,0 +1,7 @@ + +content-length: 785 +content-type: image/png +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: W/"311-u7NFzzhK-VdpDMgsJ-SjaQ==" + + diff --git a/tests/expected/configured/spr_cmp_2x.json.headers b/tests/expected/configured/spr_cmp_2x.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/spr_cmp_2x.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/spr_cmp_2x.png.headers b/tests/expected/configured/spr_cmp_2x.png.headers new file mode 100644 index 000000000..7abedf6e0 --- /dev/null +++ b/tests/expected/configured/spr_cmp_2x.png.headers @@ -0,0 +1,7 @@ + +content-length: 1755 +content-type: image/png +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: W/"6db-u2j270aTAu4aTfvEwg9iRA==" + + diff --git a/tests/expected/configured/spr_mysrc.json.headers b/tests/expected/configured/spr_mysrc.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/spr_mysrc.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/spr_mysrc.png.headers b/tests/expected/configured/spr_mysrc.png.headers new file mode 100644 index 000000000..335fc7e7d --- /dev/null +++ b/tests/expected/configured/spr_mysrc.png.headers @@ -0,0 +1,7 @@ + +content-length: 189 +content-type: image/png +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: W/"bd-wRhFV2xvMbGQOJkdFxyNyg==" + + diff --git a/tests/expected/configured/spr_mysrc_2x.json.headers b/tests/expected/configured/spr_mysrc_2x.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/spr_mysrc_2x.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/spr_mysrc_2x.png.headers b/tests/expected/configured/spr_mysrc_2x.png.headers new file mode 100644 index 000000000..633dcfd23 --- /dev/null +++ b/tests/expected/configured/spr_mysrc_2x.png.headers @@ -0,0 +1,7 @@ + +content-length: 344 +content-type: image/png +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: W/"158-ZSYNoWLreCScoiFLriGD6Q==" + + diff --git a/tests/expected/configured/spr_src1.json.headers b/tests/expected/configured/spr_src1.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/spr_src1.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/spr_src1.png.headers b/tests/expected/configured/spr_src1.png.headers new file mode 100644 index 000000000..bff70c64e --- /dev/null +++ b/tests/expected/configured/spr_src1.png.headers @@ -0,0 +1,7 @@ + +content-length: 758 +content-type: image/png +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: W/"2f6-PZaBSgIOiVTrPDnRiX0hYg==" + + diff --git a/tests/expected/configured/spr_src1_2x.json.headers b/tests/expected/configured/spr_src1_2x.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/spr_src1_2x.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/spr_src1_2x.png.headers b/tests/expected/configured/spr_src1_2x.png.headers new file mode 100644 index 000000000..777c7d97c --- /dev/null +++ b/tests/expected/configured/spr_src1_2x.png.headers @@ -0,0 +1,7 @@ + +content-length: 1699 +content-type: image/png +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +etag: W/"6a3--J74WPHes8bNZx23r-Ru4w==" + + diff --git a/tests/expected/configured/style_maplibre_demo.1.json.headers b/tests/expected/configured/style_maplibre_demo.1.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/style_maplibre_demo.1.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/style_maplibre_demo.json.headers b/tests/expected/configured/style_maplibre_demo.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/style_maplibre_demo.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/style_src2_maptiler_basic.1.json.headers b/tests/expected/configured/style_src2_maptiler_basic.1.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/style_src2_maptiler_basic.1.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/style_src2_maptiler_basic.json.headers b/tests/expected/configured/style_src2_maptiler_basic.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/style_src2_maptiler_basic.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + diff --git a/tests/expected/configured/tbl_0_0_0.pbf.headers b/tests/expected/configured/tbl_0_0_0.pbf.headers new file mode 100644 index 000000000..2bdd85270 --- /dev/null +++ b/tests/expected/configured/tbl_0_0_0.pbf.headers @@ -0,0 +1,8 @@ + +content-length: 643 +content-type: application/x-protobuf +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: gzip +etag: "318577514554804226527507038699986111507" + + diff --git a/tests/expected/configured/tbl_comment_cfg.json.headers b/tests/expected/configured/tbl_comment_cfg.json.headers new file mode 100644 index 000000000..ea860cdc1 --- /dev/null +++ b/tests/expected/configured/tbl_comment_cfg.json.headers @@ -0,0 +1,7 @@ + +transfer-encoding: chunked +content-type: application/json +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br + + From 36d81272a1ea0c6a2e2add8ee3075630934b4ab2 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Wed, 21 May 2025 11:41:34 +0200 Subject: [PATCH 11/24] apply sorting to the headers --- tests/expected/auto/catalog_auto.json.headers | 8 ++++---- tests/expected/auto/cmp.json.headers | 8 ++++---- tests/expected/auto/cmp_0_0_0.pbf.headers | 8 ++++---- tests/expected/auto/cmp_12_3673_1911.pbf.headers | 8 ++++---- tests/expected/auto/cmp_13_7346_3822.pbf.headers | 8 ++++---- tests/expected/auto/cmp_14_14692_7645.pbf.headers | 10 +++++----- tests/expected/auto/cmp_17_117542_61161.pbf.headers | 10 +++++----- tests/expected/auto/cmp_18_235085_122323.pbf.headers | 8 ++++---- tests/expected/auto/cmp_6_57_29.pbf.headers | 6 +++--- tests/expected/auto/fnc.json.headers | 8 ++++---- tests/expected/auto/fnc_0_0_0.pbf.headers | 8 ++++---- tests/expected/auto/fnc_12_3673_1911.pbf.headers | 8 ++++---- tests/expected/auto/fnc_13_7346_3822.pbf.headers | 8 ++++---- tests/expected/auto/fnc_14_14692_7645.pbf.headers | 10 +++++----- tests/expected/auto/fnc_17_117542_61161.pbf.headers | 10 +++++----- tests/expected/auto/fnc_18_235085_122323.pbf.headers | 8 ++++---- tests/expected/auto/fnc_6_57_29.pbf.headers | 6 +++--- tests/expected/auto/fnc_b.json.headers | 8 ++++---- tests/expected/auto/fnc_b_6_38_20.pbf.headers | 8 ++++---- tests/expected/auto/fnc_comment.json.headers | 8 ++++---- tests/expected/auto/fnc_token.json.headers | 8 ++++---- tests/expected/auto/fnc_token_0_0_0.pbf.headers | 8 ++++---- tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers | 8 ++++---- tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers | 10 +++++----- tests/expected/auto/fnc_zxy_6_57_29.pbf.headers | 10 +++++----- tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers | 8 ++++---- tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers | 8 ++++---- tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers | 8 ++++---- .../expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers | 6 +++--- tests/expected/auto/mb_jpg.json.headers | 8 ++++---- tests/expected/auto/mb_jpg_0_0_0.jpg.headers | 6 +++--- tests/expected/auto/mb_mvt.json.headers | 8 ++++---- tests/expected/auto/mb_mvt_2_3_1.pbf.headers | 10 +++++----- tests/expected/auto/mb_png.json.headers | 8 ++++---- tests/expected/auto/mb_png_0_0_0.png.headers | 6 +++--- tests/expected/auto/pmt.json.headers | 8 ++++---- tests/expected/auto/pmt_3_4_2.png.headers | 8 ++++---- tests/expected/auto/points3857_srid.json.headers | 8 ++++---- tests/expected/auto/points3857_srid_0_0_0.pbf.headers | 8 ++++---- .../expected/auto/points_empty_srid_0_0_0.pbf.headers | 8 ++++---- tests/expected/auto/rgb_u8.json.headers | 8 ++++---- tests/expected/auto/rgb_u8_0_0_0.png.headers | 8 ++++---- tests/expected/auto/rgb_u8_3_0_0.png.headers | 8 ++++---- tests/expected/auto/rgb_u8_3_1_1.png.headers | 8 ++++---- tests/expected/auto/rgba_u8.json.headers | 8 ++++---- tests/expected/auto/rgba_u8_0_0_0.png.headers | 8 ++++---- tests/expected/auto/rgba_u8_3_0_0.png.headers | 8 ++++---- tests/expected/auto/rgba_u8_3_1_1.png.headers | 10 +++++----- tests/expected/auto/rgba_u8_nodata.json.headers | 8 ++++---- tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers | 8 ++++---- tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers | 8 ++++---- tests/expected/auto/table_source.json.headers | 8 ++++---- tests/expected/auto/tbl_0_0_0.pbf.headers | 8 ++++---- tests/expected/auto/tbl_12_3673_1911.pbf.headers | 8 ++++---- tests/expected/auto/tbl_13_7346_3822.pbf.headers | 8 ++++---- tests/expected/auto/tbl_14_14692_7645.pbf.headers | 10 +++++----- tests/expected/auto/tbl_17_117542_61161.pbf.headers | 10 +++++----- tests/expected/auto/tbl_18_235085_122323.pbf.headers | 8 ++++---- tests/expected/auto/tbl_6_57_29.pbf.headers | 6 +++--- tests/expected/auto/tbl_comment.json.headers | 8 ++++---- tests/expected/auto/webp2_1_0_0.png.headers | 6 +++--- tests/expected/auto_mini/catalog_auto.json.headers | 6 +++--- tests/expected/configured/catalog_cfg.json.headers | 7 ++----- tests/expected/configured/cmp.json.headers | 8 ++++---- tests/expected/configured/cmp_0_0_0.pbf.headers | 8 ++++---- tests/expected/configured/fnc2_0_0_0.pbf.headers | 8 ++++---- tests/expected/configured/fnc_0_0_0.pbf.headers | 8 ++++---- tests/expected/configured/fnc_comment_cfg.json.headers | 8 ++++---- tests/expected/configured/font_1.pbf.headers | 8 ++++---- tests/expected/configured/font_2.pbf.headers | 8 ++++---- tests/expected/configured/font_3.pbf.headers | 8 ++++---- tests/expected/configured/pmt2_0_0_0.png.headers | 6 +++--- tests/expected/configured/pmt_0_0_0.png.headers | 6 +++--- tests/expected/configured/sdf_spr_cmp.json.headers | 8 ++++---- tests/expected/configured/sdf_spr_cmp.png.headers | 6 +++--- tests/expected/configured/sdf_spr_cmp_2.json.headers | 8 ++++---- tests/expected/configured/sdf_spr_cmp_2.png.headers | 6 +++--- tests/expected/configured/sdf_spr_mysrc.json.headers | 8 ++++---- tests/expected/configured/sdf_spr_mysrc.png.headers | 6 +++--- tests/expected/configured/sdf_spr_src1.json.headers | 8 ++++---- tests/expected/configured/sdf_spr_src1.png.headers | 6 +++--- tests/expected/configured/sdf_spr_src1_.json.headers | 8 ++++---- tests/expected/configured/sdf_spr_src1_.png.headers | 6 +++--- tests/expected/configured/spr_cmp.json.headers | 8 ++++---- tests/expected/configured/spr_cmp.png.headers | 6 +++--- tests/expected/configured/spr_cmp_2x.json.headers | 8 ++++---- tests/expected/configured/spr_cmp_2x.png.headers | 6 +++--- tests/expected/configured/spr_mysrc.json.headers | 8 ++++---- tests/expected/configured/spr_mysrc.png.headers | 6 +++--- tests/expected/configured/spr_mysrc_2x.json.headers | 8 ++++---- tests/expected/configured/spr_mysrc_2x.png.headers | 6 +++--- tests/expected/configured/spr_src1.json.headers | 8 ++++---- tests/expected/configured/spr_src1.png.headers | 6 +++--- tests/expected/configured/spr_src1_2x.json.headers | 8 ++++---- tests/expected/configured/spr_src1_2x.png.headers | 6 +++--- .../configured/style_maplibre_demo.1.json.headers | 8 ++++---- .../configured/style_maplibre_demo.json.headers | 8 ++++---- .../style_src2_maptiler_basic.1.json.headers | 8 ++++---- .../configured/style_src2_maptiler_basic.json.headers | 8 ++++---- tests/expected/configured/tbl_0_0_0.pbf.headers | 8 ++++---- tests/expected/configured/tbl_comment_cfg.json.headers | 8 ++++---- tests/test.sh | 2 ++ 102 files changed, 393 insertions(+), 394 deletions(-) diff --git a/tests/expected/auto/catalog_auto.json.headers b/tests/expected/auto/catalog_auto.json.headers index cbf0673fb..225a0ae3c 100644 --- a/tests/expected/auto/catalog_auto.json.headers +++ b/tests/expected/auto/catalog_auto.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -content-encoding: br -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/cmp.json.headers b/tests/expected/auto/cmp.json.headers index cbf0673fb..225a0ae3c 100644 --- a/tests/expected/auto/cmp.json.headers +++ b/tests/expected/auto/cmp.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -content-encoding: br -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/cmp_0_0_0.pbf.headers b/tests/expected/auto/cmp_0_0_0.pbf.headers index f3bfb1865..f1947d7d5 100644 --- a/tests/expected/auto/cmp_0_0_0.pbf.headers +++ b/tests/expected/auto/cmp_0_0_0.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 1150 +content-type: application/x-protobuf etag: "293815559851244067215006259112061301509" -content-encoding: gzip vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-type: application/x-protobuf - - diff --git a/tests/expected/auto/cmp_12_3673_1911.pbf.headers b/tests/expected/auto/cmp_12_3673_1911.pbf.headers index d09e13c7d..84a8814ba 100644 --- a/tests/expected/auto/cmp_12_3673_1911.pbf.headers +++ b/tests/expected/auto/cmp_12_3673_1911.pbf.headers @@ -1,8 +1,8 @@ -content-length: 228 + + content-encoding: gzip -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-length: 228 content-type: application/x-protobuf etag: "65126464844181472926168475650420052208" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/cmp_13_7346_3822.pbf.headers b/tests/expected/auto/cmp_13_7346_3822.pbf.headers index 68d36e06a..cf33c50f7 100644 --- a/tests/expected/auto/cmp_13_7346_3822.pbf.headers +++ b/tests/expected/auto/cmp_13_7346_3822.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 229 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers content-type: application/x-protobuf -content-encoding: gzip etag: "285993515030094388663176915274199952144" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/cmp_14_14692_7645.pbf.headers b/tests/expected/auto/cmp_14_14692_7645.pbf.headers index 3aaf1e109..89352dd31 100644 --- a/tests/expected/auto/cmp_14_14692_7645.pbf.headers +++ b/tests/expected/auto/cmp_14_14692_7645.pbf.headers @@ -1,8 +1,8 @@ -content-length: 241 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: gzip -etag: "311485364959417352099842717473316722909" -content-type: application/x-protobuf +content-encoding: gzip +content-length: 241 +content-type: application/x-protobuf +etag: "311485364959417352099842717473316722909" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/cmp_17_117542_61161.pbf.headers b/tests/expected/auto/cmp_17_117542_61161.pbf.headers index 3af82813f..da685b600 100644 --- a/tests/expected/auto/cmp_17_117542_61161.pbf.headers +++ b/tests/expected/auto/cmp_17_117542_61161.pbf.headers @@ -1,8 +1,8 @@ -content-length: 253 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -etag: "45271956850074002467276433108641392681" -content-type: application/x-protobuf -content-encoding: gzip +content-encoding: gzip +content-length: 253 +content-type: application/x-protobuf +etag: "45271956850074002467276433108641392681" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/cmp_18_235085_122323.pbf.headers b/tests/expected/auto/cmp_18_235085_122323.pbf.headers index 5781dcfa4..2280a5263 100644 --- a/tests/expected/auto/cmp_18_235085_122323.pbf.headers +++ b/tests/expected/auto/cmp_18_235085_122323.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 255 -etag: "27476821680655535149048155649476331810" content-type: application/x-protobuf -content-encoding: gzip +etag: "27476821680655535149048155649476331810" vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers - - diff --git a/tests/expected/auto/cmp_6_57_29.pbf.headers b/tests/expected/auto/cmp_6_57_29.pbf.headers index 15f74e464..667ccd5fa 100644 --- a/tests/expected/auto/cmp_6_57_29.pbf.headers +++ b/tests/expected/auto/cmp_6_57_29.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 181 content-type: application/x-protobuf -content-encoding: gzip etag: "318858893996331708671731244488057597244" vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers - - diff --git a/tests/expected/auto/fnc.json.headers b/tests/expected/auto/fnc.json.headers index cbf0673fb..225a0ae3c 100644 --- a/tests/expected/auto/fnc.json.headers +++ b/tests/expected/auto/fnc.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -content-encoding: br -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_0_0_0.pbf.headers b/tests/expected/auto/fnc_0_0_0.pbf.headers index d3edccc6a..52cad5f4b 100644 --- a/tests/expected/auto/fnc_0_0_0.pbf.headers +++ b/tests/expected/auto/fnc_0_0_0.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 546 +content-type: application/x-protobuf etag: "50104397035412006126955407492289337352" -content-encoding: gzip vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-type: application/x-protobuf - - diff --git a/tests/expected/auto/fnc_12_3673_1911.pbf.headers b/tests/expected/auto/fnc_12_3673_1911.pbf.headers index 28ea96512..1122c0396 100644 --- a/tests/expected/auto/fnc_12_3673_1911.pbf.headers +++ b/tests/expected/auto/fnc_12_3673_1911.pbf.headers @@ -1,8 +1,8 @@ -content-length: 131 + + content-encoding: gzip -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-length: 131 content-type: application/x-protobuf etag: "316036929976559733097913904358871580694" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_13_7346_3822.pbf.headers b/tests/expected/auto/fnc_13_7346_3822.pbf.headers index 02b1f5784..577e61687 100644 --- a/tests/expected/auto/fnc_13_7346_3822.pbf.headers +++ b/tests/expected/auto/fnc_13_7346_3822.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 133 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers content-type: application/x-protobuf -content-encoding: gzip etag: "186991199734742473829029472341770943562" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_14_14692_7645.pbf.headers b/tests/expected/auto/fnc_14_14692_7645.pbf.headers index f4d47ff99..b26d818c3 100644 --- a/tests/expected/auto/fnc_14_14692_7645.pbf.headers +++ b/tests/expected/auto/fnc_14_14692_7645.pbf.headers @@ -1,8 +1,8 @@ -content-length: 141 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: gzip -etag: "270799230191288586610033918771820004719" -content-type: application/x-protobuf +content-encoding: gzip +content-length: 141 +content-type: application/x-protobuf +etag: "270799230191288586610033918771820004719" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_17_117542_61161.pbf.headers b/tests/expected/auto/fnc_17_117542_61161.pbf.headers index ea08af289..8e17fca34 100644 --- a/tests/expected/auto/fnc_17_117542_61161.pbf.headers +++ b/tests/expected/auto/fnc_17_117542_61161.pbf.headers @@ -1,8 +1,8 @@ -content-length: 146 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -etag: "59732876737746661838673831051212271461" -content-type: application/x-protobuf -content-encoding: gzip +content-encoding: gzip +content-length: 146 +content-type: application/x-protobuf +etag: "59732876737746661838673831051212271461" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_18_235085_122323.pbf.headers b/tests/expected/auto/fnc_18_235085_122323.pbf.headers index 0c9f1b547..6edb7717b 100644 --- a/tests/expected/auto/fnc_18_235085_122323.pbf.headers +++ b/tests/expected/auto/fnc_18_235085_122323.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 150 -etag: "188910840057561700607644193135209710567" content-type: application/x-protobuf -content-encoding: gzip +etag: "188910840057561700607644193135209710567" vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers - - diff --git a/tests/expected/auto/fnc_6_57_29.pbf.headers b/tests/expected/auto/fnc_6_57_29.pbf.headers index d6eec1c13..244ec5730 100644 --- a/tests/expected/auto/fnc_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_6_57_29.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 106 content-type: application/x-protobuf -content-encoding: gzip etag: "148595474743525054411317108796671227677" vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers - - diff --git a/tests/expected/auto/fnc_b.json.headers b/tests/expected/auto/fnc_b.json.headers index cbf0673fb..225a0ae3c 100644 --- a/tests/expected/auto/fnc_b.json.headers +++ b/tests/expected/auto/fnc_b.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -content-encoding: br -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_b_6_38_20.pbf.headers b/tests/expected/auto/fnc_b_6_38_20.pbf.headers index aa43509e8..be44cf8d4 100644 --- a/tests/expected/auto/fnc_b_6_38_20.pbf.headers +++ b/tests/expected/auto/fnc_b_6_38_20.pbf.headers @@ -1,8 +1,8 @@ -content-length: 110 + + content-encoding: gzip -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-length: 110 content-type: application/x-protobuf etag: "339404027429166108039741083243940146201" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_comment.json.headers b/tests/expected/auto/fnc_comment.json.headers index 56911f6df..225a0ae3c 100644 --- a/tests/expected/auto/fnc_comment.json.headers +++ b/tests/expected/auto/fnc_comment.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-encoding: br -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-type: application/json +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_token.json.headers b/tests/expected/auto/fnc_token.json.headers index cbf0673fb..225a0ae3c 100644 --- a/tests/expected/auto/fnc_token.json.headers +++ b/tests/expected/auto/fnc_token.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -content-encoding: br -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_token_0_0_0.pbf.headers b/tests/expected/auto/fnc_token_0_0_0.pbf.headers index e6eee0052..ffae5ffdd 100644 --- a/tests/expected/auto/fnc_token_0_0_0.pbf.headers +++ b/tests/expected/auto/fnc_token_0_0_0.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 551 +content-type: application/x-protobuf etag: "197420765542523001088152476290493617488" -content-encoding: gzip vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-type: application/x-protobuf - - diff --git a/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers b/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers index cfb9aef1f..24d3a3a00 100644 --- a/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 104 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers content-type: application/x-protobuf -content-encoding: gzip etag: "313925108765747031844863332687426553785" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers index 4fdc0b1e4..109b292ba 100644 --- a/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers @@ -1,8 +1,8 @@ -content-length: 103 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -etag: "134723745777099237261560614323384911032" -content-type: application/x-protobuf -content-encoding: gzip +content-encoding: gzip +content-length: 103 +content-type: application/x-protobuf +etag: "134723745777099237261560614323384911032" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers index 0a66302e6..8b9134a1d 100644 --- a/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers @@ -1,8 +1,8 @@ -content-length: 101 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: gzip -etag: "234076532504863321998415269051837419664" -content-type: application/x-protobuf +content-encoding: gzip +content-length: 101 +content-type: application/x-protobuf +etag: "234076532504863321998415269051837419664" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers index 3e96bfe68..244ec5730 100644 --- a/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 106 -etag: "148595474743525054411317108796671227677" content-type: application/x-protobuf -content-encoding: gzip +etag: "148595474743525054411317108796671227677" vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers - - diff --git a/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers index fcf7fe86b..e80e70993 100644 --- a/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 115 +content-type: application/x-protobuf etag: "205494963574970857606832668009198552781" -content-encoding: gzip vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-type: application/x-protobuf - - diff --git a/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers index 98083492b..51b303bdf 100644 --- a/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 107 content-type: application/x-protobuf -content-encoding: gzip -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: "133204562788894152562072143322114701432" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers index 117cf4c1d..652050777 100644 --- a/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 107 content-type: application/x-protobuf -content-encoding: gzip etag: "18077437226671957325453576147625224838" vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers - - diff --git a/tests/expected/auto/mb_jpg.json.headers b/tests/expected/auto/mb_jpg.json.headers index cbf0673fb..225a0ae3c 100644 --- a/tests/expected/auto/mb_jpg.json.headers +++ b/tests/expected/auto/mb_jpg.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -content-encoding: br -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/mb_jpg_0_0_0.jpg.headers b/tests/expected/auto/mb_jpg_0_0_0.jpg.headers index 9e170b24c..60a10a7bb 100644 --- a/tests/expected/auto/mb_jpg_0_0_0.jpg.headers +++ b/tests/expected/auto/mb_jpg_0_0_0.jpg.headers @@ -1,7 +1,7 @@ + + content-length: 22142 +content-type: image/jpeg etag: "80104354369725283657331287868672010947" vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-type: image/jpeg - - diff --git a/tests/expected/auto/mb_mvt.json.headers b/tests/expected/auto/mb_mvt.json.headers index d21963f6f..225a0ae3c 100644 --- a/tests/expected/auto/mb_mvt.json.headers +++ b/tests/expected/auto/mb_mvt.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-type: application/json -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/mb_mvt_2_3_1.pbf.headers b/tests/expected/auto/mb_mvt_2_3_1.pbf.headers index aed067f75..8e06edfe3 100644 --- a/tests/expected/auto/mb_mvt_2_3_1.pbf.headers +++ b/tests/expected/auto/mb_mvt_2_3_1.pbf.headers @@ -1,8 +1,8 @@ -content-length: 263 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: gzip -etag: "271488406274339672223474380565368146077" -content-type: application/x-protobuf +content-encoding: gzip +content-length: 263 +content-type: application/x-protobuf +etag: "271488406274339672223474380565368146077" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/mb_png.json.headers b/tests/expected/auto/mb_png.json.headers index cbf0673fb..225a0ae3c 100644 --- a/tests/expected/auto/mb_png.json.headers +++ b/tests/expected/auto/mb_png.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -content-encoding: br -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/mb_png_0_0_0.png.headers b/tests/expected/auto/mb_png_0_0_0.png.headers index d8b2e09b2..be80c9b08 100644 --- a/tests/expected/auto/mb_png_0_0_0.png.headers +++ b/tests/expected/auto/mb_png_0_0_0.png.headers @@ -1,7 +1,7 @@ + + content-length: 21246 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers content-type: image/png etag: "198224485858177844679225803711953162005" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/pmt.json.headers b/tests/expected/auto/pmt.json.headers index 14fd52f8b..225a0ae3c 100644 --- a/tests/expected/auto/pmt.json.headers +++ b/tests/expected/auto/pmt.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br -content-type: application/json +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/pmt_3_4_2.png.headers b/tests/expected/auto/pmt_3_4_2.png.headers index f4456c9d0..5399c80e6 100644 --- a/tests/expected/auto/pmt_3_4_2.png.headers +++ b/tests/expected/auto/pmt_3_4_2.png.headers @@ -1,7 +1,7 @@ -content-length: 24475 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -etag: "183528903823100539089486478518670939939" -content-type: image/png +content-length: 24475 +content-type: image/png +etag: "183528903823100539089486478518670939939" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/points3857_srid.json.headers b/tests/expected/auto/points3857_srid.json.headers index 56911f6df..225a0ae3c 100644 --- a/tests/expected/auto/points3857_srid.json.headers +++ b/tests/expected/auto/points3857_srid.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-encoding: br -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-type: application/json +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/points3857_srid_0_0_0.pbf.headers b/tests/expected/auto/points3857_srid_0_0_0.pbf.headers index 9b732ed65..6ff9a1c7b 100644 --- a/tests/expected/auto/points3857_srid_0_0_0.pbf.headers +++ b/tests/expected/auto/points3857_srid_0_0_0.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 339 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers content-type: application/x-protobuf -content-encoding: gzip etag: "335534992707089786783362253468276926462" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers b/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers index 8176f1e33..9d10be873 100644 --- a/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers +++ b/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 351 +content-type: application/x-protobuf etag: "90067240564968210473015739826054346984" -content-encoding: gzip vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-type: application/x-protobuf - - diff --git a/tests/expected/auto/rgb_u8.json.headers b/tests/expected/auto/rgb_u8.json.headers index d21963f6f..225a0ae3c 100644 --- a/tests/expected/auto/rgb_u8.json.headers +++ b/tests/expected/auto/rgb_u8.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-type: application/json -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/rgb_u8_0_0_0.png.headers b/tests/expected/auto/rgb_u8_0_0_0.png.headers index 040974627..06c3b98c1 100644 --- a/tests/expected/auto/rgb_u8_0_0_0.png.headers +++ b/tests/expected/auto/rgb_u8_0_0_0.png.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 1465 -etag: "91976870190390495135239397880759423411" content-type: image/png -content-encoding: gzip +etag: "91976870190390495135239397880759423411" vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers - - diff --git a/tests/expected/auto/rgb_u8_3_0_0.png.headers b/tests/expected/auto/rgb_u8_3_0_0.png.headers index 54a6c9fa2..d83be7de3 100644 --- a/tests/expected/auto/rgb_u8_3_0_0.png.headers +++ b/tests/expected/auto/rgb_u8_3_0_0.png.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 26676 content-type: image/png -content-encoding: gzip -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: "152292509766006539164689338463649870217" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/rgb_u8_3_1_1.png.headers b/tests/expected/auto/rgb_u8_3_1_1.png.headers index 76a52f0b4..f5e081caa 100644 --- a/tests/expected/auto/rgb_u8_3_1_1.png.headers +++ b/tests/expected/auto/rgb_u8_3_1_1.png.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 294 +content-type: image/png etag: "183196322924765665630178019653551670231" -content-encoding: gzip vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-type: image/png - - diff --git a/tests/expected/auto/rgba_u8.json.headers b/tests/expected/auto/rgba_u8.json.headers index cbf0673fb..225a0ae3c 100644 --- a/tests/expected/auto/rgba_u8.json.headers +++ b/tests/expected/auto/rgba_u8.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -content-encoding: br -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/rgba_u8_0_0_0.png.headers b/tests/expected/auto/rgba_u8_0_0_0.png.headers index 682784aa4..06c3b98c1 100644 --- a/tests/expected/auto/rgba_u8_0_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_0_0_0.png.headers @@ -1,8 +1,8 @@ -content-length: 1465 + + content-encoding: gzip -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-length: 1465 content-type: image/png etag: "91976870190390495135239397880759423411" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/rgba_u8_3_0_0.png.headers b/tests/expected/auto/rgba_u8_3_0_0.png.headers index 90ca400a2..d83be7de3 100644 --- a/tests/expected/auto/rgba_u8_3_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_3_0_0.png.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 26676 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers content-type: image/png -content-encoding: gzip etag: "152292509766006539164689338463649870217" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/rgba_u8_3_1_1.png.headers b/tests/expected/auto/rgba_u8_3_1_1.png.headers index 13b592fed..f5e081caa 100644 --- a/tests/expected/auto/rgba_u8_3_1_1.png.headers +++ b/tests/expected/auto/rgba_u8_3_1_1.png.headers @@ -1,8 +1,8 @@ -content-length: 294 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: gzip -etag: "183196322924765665630178019653551670231" -content-type: image/png +content-encoding: gzip +content-length: 294 +content-type: image/png +etag: "183196322924765665630178019653551670231" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/rgba_u8_nodata.json.headers b/tests/expected/auto/rgba_u8_nodata.json.headers index d21963f6f..225a0ae3c 100644 --- a/tests/expected/auto/rgba_u8_nodata.json.headers +++ b/tests/expected/auto/rgba_u8_nodata.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-type: application/json -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers b/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers index 273c38f55..e733dc981 100644 --- a/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 4183 -etag: "175670914983401421558985743183658650265" content-type: image/png -content-encoding: gzip +etag: "175670914983401421558985743183658650265" vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers - - diff --git a/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers b/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers index 9eedee2fc..e215016a4 100644 --- a/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 12297 content-type: image/png -content-encoding: gzip -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: "275838721038394963229380057336169680030" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/table_source.json.headers b/tests/expected/auto/table_source.json.headers index cbf0673fb..225a0ae3c 100644 --- a/tests/expected/auto/table_source.json.headers +++ b/tests/expected/auto/table_source.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -content-encoding: br -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/tbl_0_0_0.pbf.headers b/tests/expected/auto/tbl_0_0_0.pbf.headers index d265ef56d..3d7068b73 100644 --- a/tests/expected/auto/tbl_0_0_0.pbf.headers +++ b/tests/expected/auto/tbl_0_0_0.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 643 +content-type: application/x-protobuf etag: "318577514554804226527507038699986111507" -content-encoding: gzip vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-type: application/x-protobuf - - diff --git a/tests/expected/auto/tbl_12_3673_1911.pbf.headers b/tests/expected/auto/tbl_12_3673_1911.pbf.headers index 437c77892..12523d580 100644 --- a/tests/expected/auto/tbl_12_3673_1911.pbf.headers +++ b/tests/expected/auto/tbl_12_3673_1911.pbf.headers @@ -1,8 +1,8 @@ -content-length: 166 + + content-encoding: gzip -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-length: 166 content-type: application/x-protobuf etag: "165500331794974714696813048024659138693" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/tbl_13_7346_3822.pbf.headers b/tests/expected/auto/tbl_13_7346_3822.pbf.headers index 46fc0999e..9adc6d1b8 100644 --- a/tests/expected/auto/tbl_13_7346_3822.pbf.headers +++ b/tests/expected/auto/tbl_13_7346_3822.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 171 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers content-type: application/x-protobuf -content-encoding: gzip etag: "182700208357754381587588584330146829039" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/tbl_14_14692_7645.pbf.headers b/tests/expected/auto/tbl_14_14692_7645.pbf.headers index 15051a5cf..0ac6f0935 100644 --- a/tests/expected/auto/tbl_14_14692_7645.pbf.headers +++ b/tests/expected/auto/tbl_14_14692_7645.pbf.headers @@ -1,8 +1,8 @@ -content-length: 178 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: gzip -etag: "117583176155265660497702615009162345318" -content-type: application/x-protobuf +content-encoding: gzip +content-length: 178 +content-type: application/x-protobuf +etag: "117583176155265660497702615009162345318" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/tbl_17_117542_61161.pbf.headers b/tests/expected/auto/tbl_17_117542_61161.pbf.headers index d8590e5bb..afbb4f236 100644 --- a/tests/expected/auto/tbl_17_117542_61161.pbf.headers +++ b/tests/expected/auto/tbl_17_117542_61161.pbf.headers @@ -1,8 +1,8 @@ -content-length: 182 -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -etag: "23665348455771460600771393648920396528" -content-type: application/x-protobuf -content-encoding: gzip +content-encoding: gzip +content-length: 182 +content-type: application/x-protobuf +etag: "23665348455771460600771393648920396528" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/tbl_18_235085_122323.pbf.headers b/tests/expected/auto/tbl_18_235085_122323.pbf.headers index 7c0fa55b8..f38448ca0 100644 --- a/tests/expected/auto/tbl_18_235085_122323.pbf.headers +++ b/tests/expected/auto/tbl_18_235085_122323.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 181 -etag: "33647617359663494862827377733789484216" content-type: application/x-protobuf -content-encoding: gzip +etag: "33647617359663494862827377733789484216" vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers - - diff --git a/tests/expected/auto/tbl_6_57_29.pbf.headers b/tests/expected/auto/tbl_6_57_29.pbf.headers index 8f31053a3..5d72cd42a 100644 --- a/tests/expected/auto/tbl_6_57_29.pbf.headers +++ b/tests/expected/auto/tbl_6_57_29.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 138 content-type: application/x-protobuf -content-encoding: gzip etag: "198829004322648368710297325251207900127" vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers - - diff --git a/tests/expected/auto/tbl_comment.json.headers b/tests/expected/auto/tbl_comment.json.headers index cbf0673fb..225a0ae3c 100644 --- a/tests/expected/auto/tbl_comment.json.headers +++ b/tests/expected/auto/tbl_comment.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -content-encoding: br -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/webp2_1_0_0.png.headers b/tests/expected/auto/webp2_1_0_0.png.headers index af0597575..d3d5d0af3 100644 --- a/tests/expected/auto/webp2_1_0_0.png.headers +++ b/tests/expected/auto/webp2_1_0_0.png.headers @@ -1,7 +1,7 @@ + + content-length: 10658 -etag: "13022905490801985056512160688182263905" content-type: image/webp +etag: "13022905490801985056512160688182263905" vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers - - diff --git a/tests/expected/auto_mini/catalog_auto.json.headers b/tests/expected/auto_mini/catalog_auto.json.headers index d990ab6e6..225a0ae3c 100644 --- a/tests/expected/auto_mini/catalog_auto.json.headers +++ b/tests/expected/auto_mini/catalog_auto.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked + + content-encoding: br content-type: application/json +transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers - - diff --git a/tests/expected/configured/catalog_cfg.json.headers b/tests/expected/configured/catalog_cfg.json.headers index ea860cdc1..4be482306 100644 --- a/tests/expected/configured/catalog_cfg.json.headers +++ b/tests/expected/configured/catalog_cfg.json.headers @@ -1,7 +1,4 @@ - -transfer-encoding: chunked +content-encoding: br content-type: application/json +transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br - - diff --git a/tests/expected/configured/cmp.json.headers b/tests/expected/configured/cmp.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/cmp.json.headers +++ b/tests/expected/configured/cmp.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/cmp_0_0_0.pbf.headers b/tests/expected/configured/cmp_0_0_0.pbf.headers index 4b66c60d1..5a3f3a952 100644 --- a/tests/expected/configured/cmp_0_0_0.pbf.headers +++ b/tests/expected/configured/cmp_0_0_0.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 576 content-type: application/x-protobuf -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: gzip etag: "176859989575845169917449959758474492937" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/fnc2_0_0_0.pbf.headers b/tests/expected/configured/fnc2_0_0_0.pbf.headers index 38f30b7b9..ffae5ffdd 100644 --- a/tests/expected/configured/fnc2_0_0_0.pbf.headers +++ b/tests/expected/configured/fnc2_0_0_0.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 551 content-type: application/x-protobuf -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: gzip etag: "197420765542523001088152476290493617488" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/fnc_0_0_0.pbf.headers b/tests/expected/configured/fnc_0_0_0.pbf.headers index 21e023696..52cad5f4b 100644 --- a/tests/expected/configured/fnc_0_0_0.pbf.headers +++ b/tests/expected/configured/fnc_0_0_0.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 546 content-type: application/x-protobuf -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: gzip etag: "50104397035412006126955407492289337352" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/fnc_comment_cfg.json.headers b/tests/expected/configured/fnc_comment_cfg.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/fnc_comment_cfg.json.headers +++ b/tests/expected/configured/fnc_comment_cfg.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/font_1.pbf.headers b/tests/expected/configured/font_1.pbf.headers index eabd9e3ee..7ecb1a67f 100644 --- a/tests/expected/configured/font_1.pbf.headers +++ b/tests/expected/configured/font_1.pbf.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/x-protobuf -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/x-protobuf +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/font_2.pbf.headers b/tests/expected/configured/font_2.pbf.headers index eabd9e3ee..7ecb1a67f 100644 --- a/tests/expected/configured/font_2.pbf.headers +++ b/tests/expected/configured/font_2.pbf.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/x-protobuf -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/x-protobuf +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/font_3.pbf.headers b/tests/expected/configured/font_3.pbf.headers index eabd9e3ee..7ecb1a67f 100644 --- a/tests/expected/configured/font_3.pbf.headers +++ b/tests/expected/configured/font_3.pbf.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/x-protobuf -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/x-protobuf +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/pmt2_0_0_0.png.headers b/tests/expected/configured/pmt2_0_0_0.png.headers index c630e954d..265e858f3 100644 --- a/tests/expected/configured/pmt2_0_0_0.png.headers +++ b/tests/expected/configured/pmt2_0_0_0.png.headers @@ -1,7 +1,7 @@ + + content-length: 11586 content-type: image/webp -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: "319069140686520200453324848169489853378" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/pmt_0_0_0.png.headers b/tests/expected/configured/pmt_0_0_0.png.headers index a9c752b8d..c2e1c3507 100644 --- a/tests/expected/configured/pmt_0_0_0.png.headers +++ b/tests/expected/configured/pmt_0_0_0.png.headers @@ -1,7 +1,7 @@ + + content-length: 18404 content-type: image/png -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: "109615783887137800409763947330857640552" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/sdf_spr_cmp.json.headers b/tests/expected/configured/sdf_spr_cmp.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/sdf_spr_cmp.json.headers +++ b/tests/expected/configured/sdf_spr_cmp.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/sdf_spr_cmp.png.headers b/tests/expected/configured/sdf_spr_cmp.png.headers index 9a4cd81d4..7b2f20f14 100644 --- a/tests/expected/configured/sdf_spr_cmp.png.headers +++ b/tests/expected/configured/sdf_spr_cmp.png.headers @@ -1,7 +1,7 @@ + + content-length: 945 content-type: image/png -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: W/"3b1-qyh8Bev0R5Z2fLn83grsPw==" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/sdf_spr_cmp_2.json.headers b/tests/expected/configured/sdf_spr_cmp_2.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/sdf_spr_cmp_2.json.headers +++ b/tests/expected/configured/sdf_spr_cmp_2.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/sdf_spr_cmp_2.png.headers b/tests/expected/configured/sdf_spr_cmp_2.png.headers index ac501e044..7ed6fcdcf 100644 --- a/tests/expected/configured/sdf_spr_cmp_2.png.headers +++ b/tests/expected/configured/sdf_spr_cmp_2.png.headers @@ -1,7 +1,7 @@ + + content-length: 1863 content-type: image/png -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: W/"747-uY5SJOmaA0qgk9TmFw54yw==" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/sdf_spr_mysrc.json.headers b/tests/expected/configured/sdf_spr_mysrc.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/sdf_spr_mysrc.json.headers +++ b/tests/expected/configured/sdf_spr_mysrc.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/sdf_spr_mysrc.png.headers b/tests/expected/configured/sdf_spr_mysrc.png.headers index b325bd031..507cee69b 100644 --- a/tests/expected/configured/sdf_spr_mysrc.png.headers +++ b/tests/expected/configured/sdf_spr_mysrc.png.headers @@ -1,7 +1,7 @@ + + content-length: 675 content-type: image/png -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: W/"2a3-ju0zA7FbYbeaqMM_Qg1Iqg==" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/sdf_spr_src1.json.headers b/tests/expected/configured/sdf_spr_src1.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/sdf_spr_src1.json.headers +++ b/tests/expected/configured/sdf_spr_src1.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/sdf_spr_src1.png.headers b/tests/expected/configured/sdf_spr_src1.png.headers index 5c8cde23d..fd944a395 100644 --- a/tests/expected/configured/sdf_spr_src1.png.headers +++ b/tests/expected/configured/sdf_spr_src1.png.headers @@ -1,7 +1,7 @@ + + content-length: 900 content-type: image/png -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: W/"384-m3iOSdyLqIRO-1uu8tzIcw==" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/sdf_spr_src1_.json.headers b/tests/expected/configured/sdf_spr_src1_.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/sdf_spr_src1_.json.headers +++ b/tests/expected/configured/sdf_spr_src1_.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/sdf_spr_src1_.png.headers b/tests/expected/configured/sdf_spr_src1_.png.headers index 98ce7595d..01a10e0f7 100644 --- a/tests/expected/configured/sdf_spr_src1_.png.headers +++ b/tests/expected/configured/sdf_spr_src1_.png.headers @@ -1,7 +1,7 @@ + + content-length: 1699 content-type: image/png -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: W/"6a3-NdhmitklvJKSk_7phaxquw==" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_cmp.json.headers b/tests/expected/configured/spr_cmp.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/spr_cmp.json.headers +++ b/tests/expected/configured/spr_cmp.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_cmp.png.headers b/tests/expected/configured/spr_cmp.png.headers index 6c5db47b0..00c6db1d2 100644 --- a/tests/expected/configured/spr_cmp.png.headers +++ b/tests/expected/configured/spr_cmp.png.headers @@ -1,7 +1,7 @@ + + content-length: 785 content-type: image/png -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: W/"311-u7NFzzhK-VdpDMgsJ-SjaQ==" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_cmp_2x.json.headers b/tests/expected/configured/spr_cmp_2x.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/spr_cmp_2x.json.headers +++ b/tests/expected/configured/spr_cmp_2x.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_cmp_2x.png.headers b/tests/expected/configured/spr_cmp_2x.png.headers index 7abedf6e0..6b7091979 100644 --- a/tests/expected/configured/spr_cmp_2x.png.headers +++ b/tests/expected/configured/spr_cmp_2x.png.headers @@ -1,7 +1,7 @@ + + content-length: 1755 content-type: image/png -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: W/"6db-u2j270aTAu4aTfvEwg9iRA==" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_mysrc.json.headers b/tests/expected/configured/spr_mysrc.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/spr_mysrc.json.headers +++ b/tests/expected/configured/spr_mysrc.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_mysrc.png.headers b/tests/expected/configured/spr_mysrc.png.headers index 335fc7e7d..359dea24c 100644 --- a/tests/expected/configured/spr_mysrc.png.headers +++ b/tests/expected/configured/spr_mysrc.png.headers @@ -1,7 +1,7 @@ + + content-length: 189 content-type: image/png -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: W/"bd-wRhFV2xvMbGQOJkdFxyNyg==" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_mysrc_2x.json.headers b/tests/expected/configured/spr_mysrc_2x.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/spr_mysrc_2x.json.headers +++ b/tests/expected/configured/spr_mysrc_2x.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_mysrc_2x.png.headers b/tests/expected/configured/spr_mysrc_2x.png.headers index 633dcfd23..442c9b7aa 100644 --- a/tests/expected/configured/spr_mysrc_2x.png.headers +++ b/tests/expected/configured/spr_mysrc_2x.png.headers @@ -1,7 +1,7 @@ + + content-length: 344 content-type: image/png -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: W/"158-ZSYNoWLreCScoiFLriGD6Q==" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_src1.json.headers b/tests/expected/configured/spr_src1.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/spr_src1.json.headers +++ b/tests/expected/configured/spr_src1.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_src1.png.headers b/tests/expected/configured/spr_src1.png.headers index bff70c64e..8dbf64509 100644 --- a/tests/expected/configured/spr_src1.png.headers +++ b/tests/expected/configured/spr_src1.png.headers @@ -1,7 +1,7 @@ + + content-length: 758 content-type: image/png -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: W/"2f6-PZaBSgIOiVTrPDnRiX0hYg==" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_src1_2x.json.headers b/tests/expected/configured/spr_src1_2x.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/spr_src1_2x.json.headers +++ b/tests/expected/configured/spr_src1_2x.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_src1_2x.png.headers b/tests/expected/configured/spr_src1_2x.png.headers index 777c7d97c..2a239de38 100644 --- a/tests/expected/configured/spr_src1_2x.png.headers +++ b/tests/expected/configured/spr_src1_2x.png.headers @@ -1,7 +1,7 @@ + + content-length: 1699 content-type: image/png -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers etag: W/"6a3--J74WPHes8bNZx23r-Ru4w==" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/style_maplibre_demo.1.json.headers b/tests/expected/configured/style_maplibre_demo.1.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/style_maplibre_demo.1.json.headers +++ b/tests/expected/configured/style_maplibre_demo.1.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/style_maplibre_demo.json.headers b/tests/expected/configured/style_maplibre_demo.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/style_maplibre_demo.json.headers +++ b/tests/expected/configured/style_maplibre_demo.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/style_src2_maptiler_basic.1.json.headers b/tests/expected/configured/style_src2_maptiler_basic.1.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/style_src2_maptiler_basic.1.json.headers +++ b/tests/expected/configured/style_src2_maptiler_basic.1.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/style_src2_maptiler_basic.json.headers b/tests/expected/configured/style_src2_maptiler_basic.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/style_src2_maptiler_basic.json.headers +++ b/tests/expected/configured/style_src2_maptiler_basic.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/tbl_0_0_0.pbf.headers b/tests/expected/configured/tbl_0_0_0.pbf.headers index 2bdd85270..3d7068b73 100644 --- a/tests/expected/configured/tbl_0_0_0.pbf.headers +++ b/tests/expected/configured/tbl_0_0_0.pbf.headers @@ -1,8 +1,8 @@ + + +content-encoding: gzip content-length: 643 content-type: application/x-protobuf -vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: gzip etag: "318577514554804226527507038699986111507" - - +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/tbl_comment_cfg.json.headers b/tests/expected/configured/tbl_comment_cfg.json.headers index ea860cdc1..225a0ae3c 100644 --- a/tests/expected/configured/tbl_comment_cfg.json.headers +++ b/tests/expected/configured/tbl_comment_cfg.json.headers @@ -1,7 +1,7 @@ -transfer-encoding: chunked -content-type: application/json -vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers -content-encoding: br +content-encoding: br +content-type: application/json +transfer-encoding: chunked +vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/test.sh b/tests/test.sh index 3e019f5ff..6c66c8797 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -617,5 +617,7 @@ rm -rf "$TEST_TEMP_DIR" find -type f -name "*.headers" -exec sed --regexp-extended --in-place "s/date: .+//" {} \; # this is defintively not an header find -type f -name "*.headers" -exec sed --regexp-extended --in-place "s/HTTP.+//" {} \; +# sorting is arbitrairy +find -type f -name "*.headers" -exec sort -o {} {} \; >&2 echo "All integration tests have passed" From 54728bd014a9580eedd8cb6e5c6c8ea72ff9587f Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Wed, 21 May 2025 12:04:56 +0200 Subject: [PATCH 12/24] reorder wraps to convey what we want --- martin/src/srv/fonts.rs | 2 +- martin/src/srv/server.rs | 4 ++-- martin/src/srv/sprites.rs | 6 +++--- martin/src/srv/styles.rs | 4 ++-- martin/src/srv/tiles_info.rs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/martin/src/srv/fonts.rs b/martin/src/srv/fonts.rs index 495f8377d..c7c306b61 100644 --- a/martin/src/srv/fonts.rs +++ b/martin/src/srv/fonts.rs @@ -19,8 +19,8 @@ struct FontRequest { #[route( "/font/{fontstack}/{start}-{end}", method = "GET", + wrap = "Etag", wrap = "Compress::default()", - wrap = "Etag" )] #[allow(clippy::unused_async)] async fn get_font(path: Path, fonts: Data) -> ActixResult { diff --git a/martin/src/srv/server.rs b/martin/src/srv/server.rs index d793686be..37e80f665 100644 --- a/martin/src/srv/server.rs +++ b/martin/src/srv/server.rs @@ -106,8 +106,8 @@ async fn get_health() -> impl Responder { "/catalog", method = "GET", method = "HEAD", - wrap = "Compress::default()", - wrap = "Etag" + wrap = "Etag", + wrap = "Compress::default()" )] #[allow(clippy::unused_async)] async fn get_catalog(catalog: Data) -> impl Responder { diff --git a/martin/src/srv/sprites.rs b/martin/src/srv/sprites.rs index 55dc502d2..2f854013b 100644 --- a/martin/src/srv/sprites.rs +++ b/martin/src/srv/sprites.rs @@ -47,8 +47,8 @@ async fn get_sprite_sdf_png( "/sprite/{source_ids}.json", method = "GET", method = "HEAD", + wrap = "Etag", wrap = "Compress::default()", - wrap = "Etag" )] async fn get_sprite_json( path: Path, @@ -62,8 +62,8 @@ async fn get_sprite_json( "/sdf_sprite/{source_ids}.json", method = "GET", method = "HEAD", - wrap = "Compress::default()", - wrap = "Etag" + wrap = "Etag", + wrap = "Compress::default()" )] async fn get_sprite_sdf_json( path: Path, diff --git a/martin/src/srv/styles.rs b/martin/src/srv/styles.rs index ac7e46d5b..35d78b31d 100644 --- a/martin/src/srv/styles.rs +++ b/martin/src/srv/styles.rs @@ -15,8 +15,8 @@ struct StyleRequest { #[route( "/style/{style_id}", method = "GET", - wrap = "Compress::default()", - wrap = "Etag" + wrap = "Etag", + wrap = "Compress::default()" )] async fn get_style_json(path: Path, styles: Data) -> HttpResponse { let style_id = &path.style_id; diff --git a/martin/src/srv/tiles_info.rs b/martin/src/srv/tiles_info.rs index 84aa48ea2..a9e655046 100644 --- a/martin/src/srv/tiles_info.rs +++ b/martin/src/srv/tiles_info.rs @@ -21,8 +21,8 @@ pub struct SourceIDsRequest { "/{source_ids}", method = "GET", method = "HEAD", - wrap = "Compress::default()", - wrap = "Etag" + wrap = "Etag", + wrap = "Compress::default()" )] #[allow(clippy::unused_async)] async fn get_source_info( From 98ade444053fe6973d602c964403309cbdbf4434 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 21 May 2025 10:07:09 +0000 Subject: [PATCH 13/24] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- martin/src/srv/fonts.rs | 2 +- martin/src/srv/sprites.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/martin/src/srv/fonts.rs b/martin/src/srv/fonts.rs index c7c306b61..a9b3f43ca 100644 --- a/martin/src/srv/fonts.rs +++ b/martin/src/srv/fonts.rs @@ -20,7 +20,7 @@ struct FontRequest { "/font/{fontstack}/{start}-{end}", method = "GET", wrap = "Etag", - wrap = "Compress::default()", + wrap = "Compress::default()" )] #[allow(clippy::unused_async)] async fn get_font(path: Path, fonts: Data) -> ActixResult { diff --git a/martin/src/srv/sprites.rs b/martin/src/srv/sprites.rs index 2f854013b..7a450b594 100644 --- a/martin/src/srv/sprites.rs +++ b/martin/src/srv/sprites.rs @@ -48,7 +48,7 @@ async fn get_sprite_sdf_png( method = "GET", method = "HEAD", wrap = "Etag", - wrap = "Compress::default()", + wrap = "Compress::default()" )] async fn get_sprite_json( path: Path, From 793c0fb08457a5bfbc38a114ba518be7789a41af Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Wed, 21 May 2025 13:23:51 +0200 Subject: [PATCH 14/24] strip leading and trailing whitespace from header files --- tests/expected/auto/catalog_auto.json.headers | 3 --- tests/expected/auto/cmp.json.headers | 3 --- tests/expected/auto/cmp_0_0_0.pbf.headers | 3 --- tests/expected/auto/cmp_12_3673_1911.pbf.headers | 3 --- tests/expected/auto/cmp_13_7346_3822.pbf.headers | 3 --- tests/expected/auto/cmp_14_14692_7645.pbf.headers | 3 --- tests/expected/auto/cmp_17_117542_61161.pbf.headers | 3 --- tests/expected/auto/cmp_18_235085_122323.pbf.headers | 3 --- tests/expected/auto/cmp_6_57_29.pbf.headers | 3 --- tests/expected/auto/fnc.json.headers | 3 --- tests/expected/auto/fnc_0_0_0.pbf.headers | 3 --- tests/expected/auto/fnc_12_3673_1911.pbf.headers | 3 --- tests/expected/auto/fnc_13_7346_3822.pbf.headers | 3 --- tests/expected/auto/fnc_14_14692_7645.pbf.headers | 3 --- tests/expected/auto/fnc_17_117542_61161.pbf.headers | 3 --- tests/expected/auto/fnc_18_235085_122323.pbf.headers | 3 --- tests/expected/auto/fnc_6_57_29.pbf.headers | 3 --- tests/expected/auto/fnc_b.json.headers | 3 --- tests/expected/auto/fnc_b_6_38_20.pbf.headers | 3 --- tests/expected/auto/fnc_comment.json.headers | 3 --- tests/expected/auto/fnc_token.json.headers | 3 --- tests/expected/auto/fnc_token_0_0_0.pbf.headers | 3 --- tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers | 3 --- tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers | 3 --- tests/expected/auto/fnc_zxy_6_57_29.pbf.headers | 3 --- tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers | 3 --- tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers | 3 --- tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers | 3 --- tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers | 3 --- tests/expected/auto/mb_jpg.json.headers | 3 --- tests/expected/auto/mb_jpg_0_0_0.jpg.headers | 3 --- tests/expected/auto/mb_mvt.json.headers | 3 --- tests/expected/auto/mb_mvt_2_3_1.pbf.headers | 3 --- tests/expected/auto/mb_png.json.headers | 3 --- tests/expected/auto/mb_png_0_0_0.png.headers | 3 --- tests/expected/auto/pmt.json.headers | 3 --- tests/expected/auto/pmt_3_4_2.png.headers | 3 --- tests/expected/auto/points3857_srid.json.headers | 3 --- tests/expected/auto/points3857_srid_0_0_0.pbf.headers | 3 --- tests/expected/auto/points_empty_srid_0_0_0.pbf.headers | 3 --- tests/expected/auto/rgb_u8.json.headers | 3 --- tests/expected/auto/rgb_u8_0_0_0.png.headers | 3 --- tests/expected/auto/rgb_u8_3_0_0.png.headers | 3 --- tests/expected/auto/rgb_u8_3_1_1.png.headers | 3 --- tests/expected/auto/rgba_u8.json.headers | 3 --- tests/expected/auto/rgba_u8_0_0_0.png.headers | 3 --- tests/expected/auto/rgba_u8_3_0_0.png.headers | 3 --- tests/expected/auto/rgba_u8_3_1_1.png.headers | 3 --- tests/expected/auto/rgba_u8_nodata.json.headers | 3 --- tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers | 3 --- tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers | 3 --- tests/expected/auto/table_source.json.headers | 3 --- tests/expected/auto/tbl_0_0_0.pbf.headers | 3 --- tests/expected/auto/tbl_12_3673_1911.pbf.headers | 3 --- tests/expected/auto/tbl_13_7346_3822.pbf.headers | 3 --- tests/expected/auto/tbl_14_14692_7645.pbf.headers | 3 --- tests/expected/auto/tbl_17_117542_61161.pbf.headers | 3 --- tests/expected/auto/tbl_18_235085_122323.pbf.headers | 3 --- tests/expected/auto/tbl_6_57_29.pbf.headers | 3 --- tests/expected/auto/tbl_comment.json.headers | 3 --- tests/expected/auto/webp2_1_0_0.png.headers | 3 --- tests/expected/auto_mini/catalog_auto.json.headers | 3 --- tests/expected/configured/cmp.json.headers | 3 --- tests/expected/configured/cmp_0_0_0.pbf.headers | 3 --- tests/expected/configured/fnc2_0_0_0.pbf.headers | 3 --- tests/expected/configured/fnc_0_0_0.pbf.headers | 3 --- tests/expected/configured/fnc_comment_cfg.json.headers | 3 --- tests/expected/configured/font_1.pbf.headers | 3 --- tests/expected/configured/font_2.pbf.headers | 3 --- tests/expected/configured/font_3.pbf.headers | 3 --- tests/expected/configured/pmt2_0_0_0.png.headers | 3 --- tests/expected/configured/pmt_0_0_0.png.headers | 3 --- tests/expected/configured/sdf_spr_cmp.json.headers | 3 --- tests/expected/configured/sdf_spr_cmp.png.headers | 3 --- tests/expected/configured/sdf_spr_cmp_2.json.headers | 3 --- tests/expected/configured/sdf_spr_cmp_2.png.headers | 3 --- tests/expected/configured/sdf_spr_mysrc.json.headers | 3 --- tests/expected/configured/sdf_spr_mysrc.png.headers | 3 --- tests/expected/configured/sdf_spr_src1.json.headers | 3 --- tests/expected/configured/sdf_spr_src1.png.headers | 3 --- tests/expected/configured/sdf_spr_src1_.json.headers | 3 --- tests/expected/configured/sdf_spr_src1_.png.headers | 3 --- tests/expected/configured/spr_cmp.json.headers | 3 --- tests/expected/configured/spr_cmp.png.headers | 3 --- tests/expected/configured/spr_cmp_2x.json.headers | 3 --- tests/expected/configured/spr_cmp_2x.png.headers | 3 --- tests/expected/configured/spr_mysrc.json.headers | 3 --- tests/expected/configured/spr_mysrc.png.headers | 3 --- tests/expected/configured/spr_mysrc_2x.json.headers | 3 --- tests/expected/configured/spr_mysrc_2x.png.headers | 3 --- tests/expected/configured/spr_src1.json.headers | 3 --- tests/expected/configured/spr_src1.png.headers | 3 --- tests/expected/configured/spr_src1_2x.json.headers | 3 --- tests/expected/configured/spr_src1_2x.png.headers | 3 --- tests/expected/configured/style_maplibre_demo.1.json.headers | 3 --- tests/expected/configured/style_maplibre_demo.json.headers | 3 --- .../configured/style_src2_maptiler_basic.1.json.headers | 3 --- .../expected/configured/style_src2_maptiler_basic.json.headers | 3 --- tests/expected/configured/tbl_0_0_0.pbf.headers | 3 --- tests/expected/configured/tbl_comment_cfg.json.headers | 3 --- tests/test.sh | 3 ++- {} | 0 102 files changed, 2 insertions(+), 301 deletions(-) create mode 100644 {} diff --git a/tests/expected/auto/catalog_auto.json.headers b/tests/expected/auto/catalog_auto.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/catalog_auto.json.headers +++ b/tests/expected/auto/catalog_auto.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/cmp.json.headers b/tests/expected/auto/cmp.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/cmp.json.headers +++ b/tests/expected/auto/cmp.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/cmp_0_0_0.pbf.headers b/tests/expected/auto/cmp_0_0_0.pbf.headers index f1947d7d5..29e2fde02 100644 --- a/tests/expected/auto/cmp_0_0_0.pbf.headers +++ b/tests/expected/auto/cmp_0_0_0.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 1150 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_12_3673_1911.pbf.headers b/tests/expected/auto/cmp_12_3673_1911.pbf.headers index 84a8814ba..099b66d9e 100644 --- a/tests/expected/auto/cmp_12_3673_1911.pbf.headers +++ b/tests/expected/auto/cmp_12_3673_1911.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 228 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_13_7346_3822.pbf.headers b/tests/expected/auto/cmp_13_7346_3822.pbf.headers index cf33c50f7..55d476c17 100644 --- a/tests/expected/auto/cmp_13_7346_3822.pbf.headers +++ b/tests/expected/auto/cmp_13_7346_3822.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 229 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_14_14692_7645.pbf.headers b/tests/expected/auto/cmp_14_14692_7645.pbf.headers index 89352dd31..a169ee81d 100644 --- a/tests/expected/auto/cmp_14_14692_7645.pbf.headers +++ b/tests/expected/auto/cmp_14_14692_7645.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 241 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_17_117542_61161.pbf.headers b/tests/expected/auto/cmp_17_117542_61161.pbf.headers index da685b600..bd690c065 100644 --- a/tests/expected/auto/cmp_17_117542_61161.pbf.headers +++ b/tests/expected/auto/cmp_17_117542_61161.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 253 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_18_235085_122323.pbf.headers b/tests/expected/auto/cmp_18_235085_122323.pbf.headers index 2280a5263..d4a545f8b 100644 --- a/tests/expected/auto/cmp_18_235085_122323.pbf.headers +++ b/tests/expected/auto/cmp_18_235085_122323.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 255 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_6_57_29.pbf.headers b/tests/expected/auto/cmp_6_57_29.pbf.headers index 667ccd5fa..5d9343490 100644 --- a/tests/expected/auto/cmp_6_57_29.pbf.headers +++ b/tests/expected/auto/cmp_6_57_29.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 181 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc.json.headers b/tests/expected/auto/fnc.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/fnc.json.headers +++ b/tests/expected/auto/fnc.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/fnc_0_0_0.pbf.headers b/tests/expected/auto/fnc_0_0_0.pbf.headers index 52cad5f4b..d2c86077a 100644 --- a/tests/expected/auto/fnc_0_0_0.pbf.headers +++ b/tests/expected/auto/fnc_0_0_0.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 546 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_12_3673_1911.pbf.headers b/tests/expected/auto/fnc_12_3673_1911.pbf.headers index 1122c0396..701fe1c91 100644 --- a/tests/expected/auto/fnc_12_3673_1911.pbf.headers +++ b/tests/expected/auto/fnc_12_3673_1911.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 131 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_13_7346_3822.pbf.headers b/tests/expected/auto/fnc_13_7346_3822.pbf.headers index 577e61687..24b02a0c8 100644 --- a/tests/expected/auto/fnc_13_7346_3822.pbf.headers +++ b/tests/expected/auto/fnc_13_7346_3822.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 133 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_14_14692_7645.pbf.headers b/tests/expected/auto/fnc_14_14692_7645.pbf.headers index b26d818c3..efddcf4ce 100644 --- a/tests/expected/auto/fnc_14_14692_7645.pbf.headers +++ b/tests/expected/auto/fnc_14_14692_7645.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 141 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_17_117542_61161.pbf.headers b/tests/expected/auto/fnc_17_117542_61161.pbf.headers index 8e17fca34..5b92d2df8 100644 --- a/tests/expected/auto/fnc_17_117542_61161.pbf.headers +++ b/tests/expected/auto/fnc_17_117542_61161.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 146 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_18_235085_122323.pbf.headers b/tests/expected/auto/fnc_18_235085_122323.pbf.headers index 6edb7717b..71a629bc0 100644 --- a/tests/expected/auto/fnc_18_235085_122323.pbf.headers +++ b/tests/expected/auto/fnc_18_235085_122323.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 150 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_6_57_29.pbf.headers b/tests/expected/auto/fnc_6_57_29.pbf.headers index 244ec5730..55efe6c9d 100644 --- a/tests/expected/auto/fnc_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_6_57_29.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 106 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_b.json.headers b/tests/expected/auto/fnc_b.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/fnc_b.json.headers +++ b/tests/expected/auto/fnc_b.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/fnc_b_6_38_20.pbf.headers b/tests/expected/auto/fnc_b_6_38_20.pbf.headers index be44cf8d4..ed0ddab5d 100644 --- a/tests/expected/auto/fnc_b_6_38_20.pbf.headers +++ b/tests/expected/auto/fnc_b_6_38_20.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 110 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_comment.json.headers b/tests/expected/auto/fnc_comment.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/fnc_comment.json.headers +++ b/tests/expected/auto/fnc_comment.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/fnc_token.json.headers b/tests/expected/auto/fnc_token.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/fnc_token.json.headers +++ b/tests/expected/auto/fnc_token.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/fnc_token_0_0_0.pbf.headers b/tests/expected/auto/fnc_token_0_0_0.pbf.headers index ffae5ffdd..5828a802e 100644 --- a/tests/expected/auto/fnc_token_0_0_0.pbf.headers +++ b/tests/expected/auto/fnc_token_0_0_0.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 551 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers b/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers index 24d3a3a00..31413f77c 100644 --- a/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 104 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers index 109b292ba..7c9d178df 100644 --- a/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 103 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers index 8b9134a1d..d1615e99a 100644 --- a/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 101 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers index 244ec5730..55efe6c9d 100644 --- a/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 106 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers index e80e70993..6c08c58ff 100644 --- a/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 115 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers index 51b303bdf..b6b409b38 100644 --- a/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 107 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers index 652050777..476a276eb 100644 --- a/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 107 content-type: application/x-protobuf diff --git a/tests/expected/auto/mb_jpg.json.headers b/tests/expected/auto/mb_jpg.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/mb_jpg.json.headers +++ b/tests/expected/auto/mb_jpg.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/mb_jpg_0_0_0.jpg.headers b/tests/expected/auto/mb_jpg_0_0_0.jpg.headers index 60a10a7bb..0a11eb80d 100644 --- a/tests/expected/auto/mb_jpg_0_0_0.jpg.headers +++ b/tests/expected/auto/mb_jpg_0_0_0.jpg.headers @@ -1,6 +1,3 @@ - - - content-length: 22142 content-type: image/jpeg etag: "80104354369725283657331287868672010947" diff --git a/tests/expected/auto/mb_mvt.json.headers b/tests/expected/auto/mb_mvt.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/mb_mvt.json.headers +++ b/tests/expected/auto/mb_mvt.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/mb_mvt_2_3_1.pbf.headers b/tests/expected/auto/mb_mvt_2_3_1.pbf.headers index 8e06edfe3..64544148a 100644 --- a/tests/expected/auto/mb_mvt_2_3_1.pbf.headers +++ b/tests/expected/auto/mb_mvt_2_3_1.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 263 content-type: application/x-protobuf diff --git a/tests/expected/auto/mb_png.json.headers b/tests/expected/auto/mb_png.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/mb_png.json.headers +++ b/tests/expected/auto/mb_png.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/mb_png_0_0_0.png.headers b/tests/expected/auto/mb_png_0_0_0.png.headers index be80c9b08..55026e76b 100644 --- a/tests/expected/auto/mb_png_0_0_0.png.headers +++ b/tests/expected/auto/mb_png_0_0_0.png.headers @@ -1,6 +1,3 @@ - - - content-length: 21246 content-type: image/png etag: "198224485858177844679225803711953162005" diff --git a/tests/expected/auto/pmt.json.headers b/tests/expected/auto/pmt.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/pmt.json.headers +++ b/tests/expected/auto/pmt.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/pmt_3_4_2.png.headers b/tests/expected/auto/pmt_3_4_2.png.headers index 5399c80e6..591af987e 100644 --- a/tests/expected/auto/pmt_3_4_2.png.headers +++ b/tests/expected/auto/pmt_3_4_2.png.headers @@ -1,6 +1,3 @@ - - - content-length: 24475 content-type: image/png etag: "183528903823100539089486478518670939939" diff --git a/tests/expected/auto/points3857_srid.json.headers b/tests/expected/auto/points3857_srid.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/points3857_srid.json.headers +++ b/tests/expected/auto/points3857_srid.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/points3857_srid_0_0_0.pbf.headers b/tests/expected/auto/points3857_srid_0_0_0.pbf.headers index 6ff9a1c7b..8adb1bf99 100644 --- a/tests/expected/auto/points3857_srid_0_0_0.pbf.headers +++ b/tests/expected/auto/points3857_srid_0_0_0.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 339 content-type: application/x-protobuf diff --git a/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers b/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers index 9d10be873..1c2ae0ae2 100644 --- a/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers +++ b/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 351 content-type: application/x-protobuf diff --git a/tests/expected/auto/rgb_u8.json.headers b/tests/expected/auto/rgb_u8.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/rgb_u8.json.headers +++ b/tests/expected/auto/rgb_u8.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/rgb_u8_0_0_0.png.headers b/tests/expected/auto/rgb_u8_0_0_0.png.headers index 06c3b98c1..99aa77a8a 100644 --- a/tests/expected/auto/rgb_u8_0_0_0.png.headers +++ b/tests/expected/auto/rgb_u8_0_0_0.png.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 1465 content-type: image/png diff --git a/tests/expected/auto/rgb_u8_3_0_0.png.headers b/tests/expected/auto/rgb_u8_3_0_0.png.headers index d83be7de3..764477152 100644 --- a/tests/expected/auto/rgb_u8_3_0_0.png.headers +++ b/tests/expected/auto/rgb_u8_3_0_0.png.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 26676 content-type: image/png diff --git a/tests/expected/auto/rgb_u8_3_1_1.png.headers b/tests/expected/auto/rgb_u8_3_1_1.png.headers index f5e081caa..da330a665 100644 --- a/tests/expected/auto/rgb_u8_3_1_1.png.headers +++ b/tests/expected/auto/rgb_u8_3_1_1.png.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 294 content-type: image/png diff --git a/tests/expected/auto/rgba_u8.json.headers b/tests/expected/auto/rgba_u8.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/rgba_u8.json.headers +++ b/tests/expected/auto/rgba_u8.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/rgba_u8_0_0_0.png.headers b/tests/expected/auto/rgba_u8_0_0_0.png.headers index 06c3b98c1..99aa77a8a 100644 --- a/tests/expected/auto/rgba_u8_0_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_0_0_0.png.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 1465 content-type: image/png diff --git a/tests/expected/auto/rgba_u8_3_0_0.png.headers b/tests/expected/auto/rgba_u8_3_0_0.png.headers index d83be7de3..764477152 100644 --- a/tests/expected/auto/rgba_u8_3_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_3_0_0.png.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 26676 content-type: image/png diff --git a/tests/expected/auto/rgba_u8_3_1_1.png.headers b/tests/expected/auto/rgba_u8_3_1_1.png.headers index f5e081caa..da330a665 100644 --- a/tests/expected/auto/rgba_u8_3_1_1.png.headers +++ b/tests/expected/auto/rgba_u8_3_1_1.png.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 294 content-type: image/png diff --git a/tests/expected/auto/rgba_u8_nodata.json.headers b/tests/expected/auto/rgba_u8_nodata.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/rgba_u8_nodata.json.headers +++ b/tests/expected/auto/rgba_u8_nodata.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers b/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers index e733dc981..367bc9d7d 100644 --- a/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 4183 content-type: image/png diff --git a/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers b/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers index e215016a4..7379f9081 100644 --- a/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 12297 content-type: image/png diff --git a/tests/expected/auto/table_source.json.headers b/tests/expected/auto/table_source.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/table_source.json.headers +++ b/tests/expected/auto/table_source.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/tbl_0_0_0.pbf.headers b/tests/expected/auto/tbl_0_0_0.pbf.headers index 3d7068b73..d25a9c019 100644 --- a/tests/expected/auto/tbl_0_0_0.pbf.headers +++ b/tests/expected/auto/tbl_0_0_0.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 643 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_12_3673_1911.pbf.headers b/tests/expected/auto/tbl_12_3673_1911.pbf.headers index 12523d580..b0002e8a4 100644 --- a/tests/expected/auto/tbl_12_3673_1911.pbf.headers +++ b/tests/expected/auto/tbl_12_3673_1911.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 166 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_13_7346_3822.pbf.headers b/tests/expected/auto/tbl_13_7346_3822.pbf.headers index 9adc6d1b8..51261abb3 100644 --- a/tests/expected/auto/tbl_13_7346_3822.pbf.headers +++ b/tests/expected/auto/tbl_13_7346_3822.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 171 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_14_14692_7645.pbf.headers b/tests/expected/auto/tbl_14_14692_7645.pbf.headers index 0ac6f0935..4a4279a0b 100644 --- a/tests/expected/auto/tbl_14_14692_7645.pbf.headers +++ b/tests/expected/auto/tbl_14_14692_7645.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 178 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_17_117542_61161.pbf.headers b/tests/expected/auto/tbl_17_117542_61161.pbf.headers index afbb4f236..af77188e9 100644 --- a/tests/expected/auto/tbl_17_117542_61161.pbf.headers +++ b/tests/expected/auto/tbl_17_117542_61161.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 182 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_18_235085_122323.pbf.headers b/tests/expected/auto/tbl_18_235085_122323.pbf.headers index f38448ca0..53e4f5359 100644 --- a/tests/expected/auto/tbl_18_235085_122323.pbf.headers +++ b/tests/expected/auto/tbl_18_235085_122323.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 181 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_6_57_29.pbf.headers b/tests/expected/auto/tbl_6_57_29.pbf.headers index 5d72cd42a..bb64cef77 100644 --- a/tests/expected/auto/tbl_6_57_29.pbf.headers +++ b/tests/expected/auto/tbl_6_57_29.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 138 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_comment.json.headers b/tests/expected/auto/tbl_comment.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto/tbl_comment.json.headers +++ b/tests/expected/auto/tbl_comment.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/auto/webp2_1_0_0.png.headers b/tests/expected/auto/webp2_1_0_0.png.headers index d3d5d0af3..8eca48cfd 100644 --- a/tests/expected/auto/webp2_1_0_0.png.headers +++ b/tests/expected/auto/webp2_1_0_0.png.headers @@ -1,6 +1,3 @@ - - - content-length: 10658 content-type: image/webp etag: "13022905490801985056512160688182263905" diff --git a/tests/expected/auto_mini/catalog_auto.json.headers b/tests/expected/auto_mini/catalog_auto.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/auto_mini/catalog_auto.json.headers +++ b/tests/expected/auto_mini/catalog_auto.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/cmp.json.headers b/tests/expected/configured/cmp.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/cmp.json.headers +++ b/tests/expected/configured/cmp.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/cmp_0_0_0.pbf.headers b/tests/expected/configured/cmp_0_0_0.pbf.headers index 5a3f3a952..2a625c0bd 100644 --- a/tests/expected/configured/cmp_0_0_0.pbf.headers +++ b/tests/expected/configured/cmp_0_0_0.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 576 content-type: application/x-protobuf diff --git a/tests/expected/configured/fnc2_0_0_0.pbf.headers b/tests/expected/configured/fnc2_0_0_0.pbf.headers index ffae5ffdd..5828a802e 100644 --- a/tests/expected/configured/fnc2_0_0_0.pbf.headers +++ b/tests/expected/configured/fnc2_0_0_0.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 551 content-type: application/x-protobuf diff --git a/tests/expected/configured/fnc_0_0_0.pbf.headers b/tests/expected/configured/fnc_0_0_0.pbf.headers index 52cad5f4b..d2c86077a 100644 --- a/tests/expected/configured/fnc_0_0_0.pbf.headers +++ b/tests/expected/configured/fnc_0_0_0.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 546 content-type: application/x-protobuf diff --git a/tests/expected/configured/fnc_comment_cfg.json.headers b/tests/expected/configured/fnc_comment_cfg.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/fnc_comment_cfg.json.headers +++ b/tests/expected/configured/fnc_comment_cfg.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/font_1.pbf.headers b/tests/expected/configured/font_1.pbf.headers index 7ecb1a67f..b481f4ee0 100644 --- a/tests/expected/configured/font_1.pbf.headers +++ b/tests/expected/configured/font_1.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/x-protobuf transfer-encoding: chunked diff --git a/tests/expected/configured/font_2.pbf.headers b/tests/expected/configured/font_2.pbf.headers index 7ecb1a67f..b481f4ee0 100644 --- a/tests/expected/configured/font_2.pbf.headers +++ b/tests/expected/configured/font_2.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/x-protobuf transfer-encoding: chunked diff --git a/tests/expected/configured/font_3.pbf.headers b/tests/expected/configured/font_3.pbf.headers index 7ecb1a67f..b481f4ee0 100644 --- a/tests/expected/configured/font_3.pbf.headers +++ b/tests/expected/configured/font_3.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/x-protobuf transfer-encoding: chunked diff --git a/tests/expected/configured/pmt2_0_0_0.png.headers b/tests/expected/configured/pmt2_0_0_0.png.headers index 265e858f3..7178577a0 100644 --- a/tests/expected/configured/pmt2_0_0_0.png.headers +++ b/tests/expected/configured/pmt2_0_0_0.png.headers @@ -1,6 +1,3 @@ - - - content-length: 11586 content-type: image/webp etag: "319069140686520200453324848169489853378" diff --git a/tests/expected/configured/pmt_0_0_0.png.headers b/tests/expected/configured/pmt_0_0_0.png.headers index c2e1c3507..ca3b40b80 100644 --- a/tests/expected/configured/pmt_0_0_0.png.headers +++ b/tests/expected/configured/pmt_0_0_0.png.headers @@ -1,6 +1,3 @@ - - - content-length: 18404 content-type: image/png etag: "109615783887137800409763947330857640552" diff --git a/tests/expected/configured/sdf_spr_cmp.json.headers b/tests/expected/configured/sdf_spr_cmp.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/sdf_spr_cmp.json.headers +++ b/tests/expected/configured/sdf_spr_cmp.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/sdf_spr_cmp.png.headers b/tests/expected/configured/sdf_spr_cmp.png.headers index 7b2f20f14..b515e6eac 100644 --- a/tests/expected/configured/sdf_spr_cmp.png.headers +++ b/tests/expected/configured/sdf_spr_cmp.png.headers @@ -1,6 +1,3 @@ - - - content-length: 945 content-type: image/png etag: W/"3b1-qyh8Bev0R5Z2fLn83grsPw==" diff --git a/tests/expected/configured/sdf_spr_cmp_2.json.headers b/tests/expected/configured/sdf_spr_cmp_2.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/sdf_spr_cmp_2.json.headers +++ b/tests/expected/configured/sdf_spr_cmp_2.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/sdf_spr_cmp_2.png.headers b/tests/expected/configured/sdf_spr_cmp_2.png.headers index 7ed6fcdcf..58e57f8c7 100644 --- a/tests/expected/configured/sdf_spr_cmp_2.png.headers +++ b/tests/expected/configured/sdf_spr_cmp_2.png.headers @@ -1,6 +1,3 @@ - - - content-length: 1863 content-type: image/png etag: W/"747-uY5SJOmaA0qgk9TmFw54yw==" diff --git a/tests/expected/configured/sdf_spr_mysrc.json.headers b/tests/expected/configured/sdf_spr_mysrc.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/sdf_spr_mysrc.json.headers +++ b/tests/expected/configured/sdf_spr_mysrc.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/sdf_spr_mysrc.png.headers b/tests/expected/configured/sdf_spr_mysrc.png.headers index 507cee69b..e3af18d38 100644 --- a/tests/expected/configured/sdf_spr_mysrc.png.headers +++ b/tests/expected/configured/sdf_spr_mysrc.png.headers @@ -1,6 +1,3 @@ - - - content-length: 675 content-type: image/png etag: W/"2a3-ju0zA7FbYbeaqMM_Qg1Iqg==" diff --git a/tests/expected/configured/sdf_spr_src1.json.headers b/tests/expected/configured/sdf_spr_src1.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/sdf_spr_src1.json.headers +++ b/tests/expected/configured/sdf_spr_src1.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/sdf_spr_src1.png.headers b/tests/expected/configured/sdf_spr_src1.png.headers index fd944a395..10b72ab21 100644 --- a/tests/expected/configured/sdf_spr_src1.png.headers +++ b/tests/expected/configured/sdf_spr_src1.png.headers @@ -1,6 +1,3 @@ - - - content-length: 900 content-type: image/png etag: W/"384-m3iOSdyLqIRO-1uu8tzIcw==" diff --git a/tests/expected/configured/sdf_spr_src1_.json.headers b/tests/expected/configured/sdf_spr_src1_.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/sdf_spr_src1_.json.headers +++ b/tests/expected/configured/sdf_spr_src1_.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/sdf_spr_src1_.png.headers b/tests/expected/configured/sdf_spr_src1_.png.headers index 01a10e0f7..778e00063 100644 --- a/tests/expected/configured/sdf_spr_src1_.png.headers +++ b/tests/expected/configured/sdf_spr_src1_.png.headers @@ -1,6 +1,3 @@ - - - content-length: 1699 content-type: image/png etag: W/"6a3-NdhmitklvJKSk_7phaxquw==" diff --git a/tests/expected/configured/spr_cmp.json.headers b/tests/expected/configured/spr_cmp.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/spr_cmp.json.headers +++ b/tests/expected/configured/spr_cmp.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/spr_cmp.png.headers b/tests/expected/configured/spr_cmp.png.headers index 00c6db1d2..78b76896d 100644 --- a/tests/expected/configured/spr_cmp.png.headers +++ b/tests/expected/configured/spr_cmp.png.headers @@ -1,6 +1,3 @@ - - - content-length: 785 content-type: image/png etag: W/"311-u7NFzzhK-VdpDMgsJ-SjaQ==" diff --git a/tests/expected/configured/spr_cmp_2x.json.headers b/tests/expected/configured/spr_cmp_2x.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/spr_cmp_2x.json.headers +++ b/tests/expected/configured/spr_cmp_2x.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/spr_cmp_2x.png.headers b/tests/expected/configured/spr_cmp_2x.png.headers index 6b7091979..dacce3df0 100644 --- a/tests/expected/configured/spr_cmp_2x.png.headers +++ b/tests/expected/configured/spr_cmp_2x.png.headers @@ -1,6 +1,3 @@ - - - content-length: 1755 content-type: image/png etag: W/"6db-u2j270aTAu4aTfvEwg9iRA==" diff --git a/tests/expected/configured/spr_mysrc.json.headers b/tests/expected/configured/spr_mysrc.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/spr_mysrc.json.headers +++ b/tests/expected/configured/spr_mysrc.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/spr_mysrc.png.headers b/tests/expected/configured/spr_mysrc.png.headers index 359dea24c..87f8ae923 100644 --- a/tests/expected/configured/spr_mysrc.png.headers +++ b/tests/expected/configured/spr_mysrc.png.headers @@ -1,6 +1,3 @@ - - - content-length: 189 content-type: image/png etag: W/"bd-wRhFV2xvMbGQOJkdFxyNyg==" diff --git a/tests/expected/configured/spr_mysrc_2x.json.headers b/tests/expected/configured/spr_mysrc_2x.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/spr_mysrc_2x.json.headers +++ b/tests/expected/configured/spr_mysrc_2x.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/spr_mysrc_2x.png.headers b/tests/expected/configured/spr_mysrc_2x.png.headers index 442c9b7aa..b7a97e72c 100644 --- a/tests/expected/configured/spr_mysrc_2x.png.headers +++ b/tests/expected/configured/spr_mysrc_2x.png.headers @@ -1,6 +1,3 @@ - - - content-length: 344 content-type: image/png etag: W/"158-ZSYNoWLreCScoiFLriGD6Q==" diff --git a/tests/expected/configured/spr_src1.json.headers b/tests/expected/configured/spr_src1.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/spr_src1.json.headers +++ b/tests/expected/configured/spr_src1.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/spr_src1.png.headers b/tests/expected/configured/spr_src1.png.headers index 8dbf64509..b9c2f2466 100644 --- a/tests/expected/configured/spr_src1.png.headers +++ b/tests/expected/configured/spr_src1.png.headers @@ -1,6 +1,3 @@ - - - content-length: 758 content-type: image/png etag: W/"2f6-PZaBSgIOiVTrPDnRiX0hYg==" diff --git a/tests/expected/configured/spr_src1_2x.json.headers b/tests/expected/configured/spr_src1_2x.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/spr_src1_2x.json.headers +++ b/tests/expected/configured/spr_src1_2x.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/spr_src1_2x.png.headers b/tests/expected/configured/spr_src1_2x.png.headers index 2a239de38..c937a4cf4 100644 --- a/tests/expected/configured/spr_src1_2x.png.headers +++ b/tests/expected/configured/spr_src1_2x.png.headers @@ -1,6 +1,3 @@ - - - content-length: 1699 content-type: image/png etag: W/"6a3--J74WPHes8bNZx23r-Ru4w==" diff --git a/tests/expected/configured/style_maplibre_demo.1.json.headers b/tests/expected/configured/style_maplibre_demo.1.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/style_maplibre_demo.1.json.headers +++ b/tests/expected/configured/style_maplibre_demo.1.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/style_maplibre_demo.json.headers b/tests/expected/configured/style_maplibre_demo.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/style_maplibre_demo.json.headers +++ b/tests/expected/configured/style_maplibre_demo.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/style_src2_maptiler_basic.1.json.headers b/tests/expected/configured/style_src2_maptiler_basic.1.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/style_src2_maptiler_basic.1.json.headers +++ b/tests/expected/configured/style_src2_maptiler_basic.1.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/style_src2_maptiler_basic.json.headers b/tests/expected/configured/style_src2_maptiler_basic.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/style_src2_maptiler_basic.json.headers +++ b/tests/expected/configured/style_src2_maptiler_basic.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/expected/configured/tbl_0_0_0.pbf.headers b/tests/expected/configured/tbl_0_0_0.pbf.headers index 3d7068b73..d25a9c019 100644 --- a/tests/expected/configured/tbl_0_0_0.pbf.headers +++ b/tests/expected/configured/tbl_0_0_0.pbf.headers @@ -1,6 +1,3 @@ - - - content-encoding: gzip content-length: 643 content-type: application/x-protobuf diff --git a/tests/expected/configured/tbl_comment_cfg.json.headers b/tests/expected/configured/tbl_comment_cfg.json.headers index 225a0ae3c..4be482306 100644 --- a/tests/expected/configured/tbl_comment_cfg.json.headers +++ b/tests/expected/configured/tbl_comment_cfg.json.headers @@ -1,6 +1,3 @@ - - - content-encoding: br content-type: application/json transfer-encoding: chunked diff --git a/tests/test.sh b/tests/test.sh index 6c66c8797..79faf9d27 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -618,6 +618,7 @@ find -type f -name "*.headers" -exec sed --regexp-extended --in-place "s/date: . # this is defintively not an header find -type f -name "*.headers" -exec sed --regexp-extended --in-place "s/HTTP.+//" {} \; # sorting is arbitrairy -find -type f -name "*.headers" -exec sort -o {} {} \; +find . -type f -name "*.headers" -exec sh -c 'awk '"'"'{gsub(/^[ \t]+/, ""); gsub(/[ \t]+$/, ""); if (length) print}'"'"' "$1" | sort > "$1.tmp" && mv "$1.tmp" "$1" +' sh {} \; >&2 echo "All integration tests have passed" diff --git a/{} b/{} new file mode 100644 index 000000000..e69de29bb From 1e9cd9ea7431e6fa6776463a38b760081e11ee6e Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Wed, 21 May 2025 14:39:49 +0200 Subject: [PATCH 15/24] re-bless outputs --- {} => .tmp | 0 tests/expected/auto/catalog_auto.json.headers | 2 ++ tests/expected/auto/cmp.json.headers | 2 ++ tests/expected/auto/cmp_0_0_0.pbf.headers | 1 + tests/expected/auto/cmp_12_3673_1911.pbf.headers | 1 + tests/expected/auto/cmp_13_7346_3822.pbf.headers | 1 + tests/expected/auto/cmp_14_14692_7645.pbf.headers | 1 + tests/expected/auto/cmp_17_117542_61161.pbf.headers | 1 + tests/expected/auto/cmp_18_235085_122323.pbf.headers | 1 + tests/expected/auto/cmp_6_57_29.pbf.headers | 1 + tests/expected/auto/fnc.json.headers | 2 ++ tests/expected/auto/fnc_0_0_0.pbf.headers | 1 + tests/expected/auto/fnc_12_3673_1911.pbf.headers | 1 + tests/expected/auto/fnc_13_7346_3822.pbf.headers | 1 + tests/expected/auto/fnc_14_14692_7645.pbf.headers | 1 + tests/expected/auto/fnc_17_117542_61161.pbf.headers | 1 + tests/expected/auto/fnc_18_235085_122323.pbf.headers | 1 + tests/expected/auto/fnc_6_57_29.pbf.headers | 1 + tests/expected/auto/fnc_b.json.headers | 2 ++ tests/expected/auto/fnc_b_6_38_20.pbf.headers | 1 + tests/expected/auto/fnc_comment.json.headers | 2 ++ tests/expected/auto/fnc_token.json.headers | 2 ++ tests/expected/auto/fnc_token_0_0_0.pbf.headers | 1 + tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers | 1 + tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers | 1 + tests/expected/auto/fnc_zxy_6_57_29.pbf.headers | 1 + tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers | 1 + tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers | 1 + tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers | 1 + tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers | 1 + tests/expected/auto/mb_jpg.json.headers | 2 ++ tests/expected/auto/mb_jpg_0_0_0.jpg.headers | 1 + tests/expected/auto/mb_mvt.json.headers | 2 ++ tests/expected/auto/mb_mvt_2_3_1.pbf.headers | 1 + tests/expected/auto/mb_png.json.headers | 2 ++ tests/expected/auto/mb_png_0_0_0.png.headers | 1 + tests/expected/auto/pmt.json.headers | 2 ++ tests/expected/auto/pmt_3_4_2.png.headers | 1 + tests/expected/auto/points3857_srid.json.headers | 2 ++ tests/expected/auto/points3857_srid_0_0_0.pbf.headers | 1 + tests/expected/auto/points_empty_srid_0_0_0.pbf.headers | 1 + tests/expected/auto/rgb_u8.json.headers | 2 ++ tests/expected/auto/rgb_u8_0_0_0.png.headers | 1 + tests/expected/auto/rgb_u8_3_0_0.png.headers | 1 + tests/expected/auto/rgb_u8_3_1_1.png.headers | 1 + tests/expected/auto/rgba_u8.json.headers | 2 ++ tests/expected/auto/rgba_u8_0_0_0.png.headers | 1 + tests/expected/auto/rgba_u8_3_0_0.png.headers | 1 + tests/expected/auto/rgba_u8_3_1_1.png.headers | 1 + tests/expected/auto/rgba_u8_nodata.json.headers | 2 ++ tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers | 1 + tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers | 1 + tests/expected/auto/table_source.json.headers | 2 ++ tests/expected/auto/tbl_0_0_0.pbf.headers | 1 + tests/expected/auto/tbl_12_3673_1911.pbf.headers | 1 + tests/expected/auto/tbl_13_7346_3822.pbf.headers | 1 + tests/expected/auto/tbl_14_14692_7645.pbf.headers | 1 + tests/expected/auto/tbl_17_117542_61161.pbf.headers | 1 + tests/expected/auto/tbl_18_235085_122323.pbf.headers | 1 + tests/expected/auto/tbl_6_57_29.pbf.headers | 1 + tests/expected/auto/tbl_comment.json.headers | 2 ++ tests/expected/auto/webp2_1_0_0.png.headers | 1 + tests/expected/auto_mini/catalog_auto.json.headers | 2 ++ tests/expected/configured/catalog_cfg.json.headers | 2 ++ tests/expected/configured/cmp.json.headers | 2 ++ tests/expected/configured/cmp_0_0_0.pbf.headers | 1 + tests/expected/configured/fnc2_0_0_0.pbf.headers | 1 + tests/expected/configured/fnc_0_0_0.pbf.headers | 1 + tests/expected/configured/fnc_comment_cfg.json.headers | 2 ++ tests/expected/configured/font_1.pbf.headers | 2 ++ tests/expected/configured/font_2.pbf.headers | 2 ++ tests/expected/configured/font_3.pbf.headers | 2 ++ tests/expected/configured/pmt2_0_0_0.png.headers | 1 + tests/expected/configured/pmt_0_0_0.png.headers | 1 + tests/expected/configured/sdf_spr_cmp.json.headers | 2 ++ tests/expected/configured/sdf_spr_cmp.png.headers | 1 + tests/expected/configured/sdf_spr_cmp_2.json.headers | 2 ++ tests/expected/configured/sdf_spr_cmp_2.png.headers | 1 + tests/expected/configured/sdf_spr_mysrc.json.headers | 2 ++ tests/expected/configured/sdf_spr_mysrc.png.headers | 1 + tests/expected/configured/sdf_spr_src1.json.headers | 2 ++ tests/expected/configured/sdf_spr_src1.png.headers | 1 + tests/expected/configured/sdf_spr_src1_.json.headers | 2 ++ tests/expected/configured/sdf_spr_src1_.png.headers | 1 + tests/expected/configured/spr_cmp.json.headers | 2 ++ tests/expected/configured/spr_cmp.png.headers | 1 + tests/expected/configured/spr_cmp_2x.json.headers | 2 ++ tests/expected/configured/spr_cmp_2x.png.headers | 1 + tests/expected/configured/spr_mysrc.json.headers | 2 ++ tests/expected/configured/spr_mysrc.png.headers | 1 + tests/expected/configured/spr_mysrc_2x.json.headers | 2 ++ tests/expected/configured/spr_mysrc_2x.png.headers | 1 + tests/expected/configured/spr_src1.json.headers | 2 ++ tests/expected/configured/spr_src1.png.headers | 1 + tests/expected/configured/spr_src1_2x.json.headers | 2 ++ tests/expected/configured/spr_src1_2x.png.headers | 1 + tests/expected/configured/style_maplibre_demo.1.json.headers | 2 ++ tests/expected/configured/style_maplibre_demo.json.headers | 2 ++ .../configured/style_src2_maptiler_basic.1.json.headers | 2 ++ .../expected/configured/style_src2_maptiler_basic.json.headers | 2 ++ tests/expected/configured/tbl_0_0_0.pbf.headers | 1 + tests/expected/configured/tbl_comment_cfg.json.headers | 2 ++ tests/test.sh | 3 +-- 103 files changed, 141 insertions(+), 2 deletions(-) rename {} => .tmp (100%) diff --git a/{} b/.tmp similarity index 100% rename from {} rename to .tmp diff --git a/tests/expected/auto/catalog_auto.json.headers b/tests/expected/auto/catalog_auto.json.headers index 4be482306..205aa0eb3 100644 --- a/tests/expected/auto/catalog_auto.json.headers +++ b/tests/expected/auto/catalog_auto.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"1829-ytE9MUN-OpjkOpCrgVrLsg==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/cmp.json.headers b/tests/expected/auto/cmp.json.headers index 4be482306..5bb618070 100644 --- a/tests/expected/auto/cmp.json.headers +++ b/tests/expected/auto/cmp.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"1a7-SKz0jISgY5NokLA90cn9bQ==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/cmp_0_0_0.pbf.headers b/tests/expected/auto/cmp_0_0_0.pbf.headers index 29e2fde02..a63d36f8f 100644 --- a/tests/expected/auto/cmp_0_0_0.pbf.headers +++ b/tests/expected/auto/cmp_0_0_0.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 1150 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_12_3673_1911.pbf.headers b/tests/expected/auto/cmp_12_3673_1911.pbf.headers index 099b66d9e..15787b6bd 100644 --- a/tests/expected/auto/cmp_12_3673_1911.pbf.headers +++ b/tests/expected/auto/cmp_12_3673_1911.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 228 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_13_7346_3822.pbf.headers b/tests/expected/auto/cmp_13_7346_3822.pbf.headers index 55d476c17..5bd47ab59 100644 --- a/tests/expected/auto/cmp_13_7346_3822.pbf.headers +++ b/tests/expected/auto/cmp_13_7346_3822.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 229 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_14_14692_7645.pbf.headers b/tests/expected/auto/cmp_14_14692_7645.pbf.headers index a169ee81d..98d953c9f 100644 --- a/tests/expected/auto/cmp_14_14692_7645.pbf.headers +++ b/tests/expected/auto/cmp_14_14692_7645.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 241 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_17_117542_61161.pbf.headers b/tests/expected/auto/cmp_17_117542_61161.pbf.headers index bd690c065..5a8aa34a7 100644 --- a/tests/expected/auto/cmp_17_117542_61161.pbf.headers +++ b/tests/expected/auto/cmp_17_117542_61161.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 253 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_18_235085_122323.pbf.headers b/tests/expected/auto/cmp_18_235085_122323.pbf.headers index d4a545f8b..cb4f151d9 100644 --- a/tests/expected/auto/cmp_18_235085_122323.pbf.headers +++ b/tests/expected/auto/cmp_18_235085_122323.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 255 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_6_57_29.pbf.headers b/tests/expected/auto/cmp_6_57_29.pbf.headers index 5d9343490..bff00a8c8 100644 --- a/tests/expected/auto/cmp_6_57_29.pbf.headers +++ b/tests/expected/auto/cmp_6_57_29.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 181 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc.json.headers b/tests/expected/auto/fnc.json.headers index 4be482306..51c80a152 100644 --- a/tests/expected/auto/fnc.json.headers +++ b/tests/expected/auto/fnc.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"85-6Q4dOREWZNsdPdT5r-Pjvg==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_0_0_0.pbf.headers b/tests/expected/auto/fnc_0_0_0.pbf.headers index d2c86077a..41a508047 100644 --- a/tests/expected/auto/fnc_0_0_0.pbf.headers +++ b/tests/expected/auto/fnc_0_0_0.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 546 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_12_3673_1911.pbf.headers b/tests/expected/auto/fnc_12_3673_1911.pbf.headers index 701fe1c91..786dc944b 100644 --- a/tests/expected/auto/fnc_12_3673_1911.pbf.headers +++ b/tests/expected/auto/fnc_12_3673_1911.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 131 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_13_7346_3822.pbf.headers b/tests/expected/auto/fnc_13_7346_3822.pbf.headers index 24b02a0c8..510d55f12 100644 --- a/tests/expected/auto/fnc_13_7346_3822.pbf.headers +++ b/tests/expected/auto/fnc_13_7346_3822.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 133 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_14_14692_7645.pbf.headers b/tests/expected/auto/fnc_14_14692_7645.pbf.headers index efddcf4ce..7431028c1 100644 --- a/tests/expected/auto/fnc_14_14692_7645.pbf.headers +++ b/tests/expected/auto/fnc_14_14692_7645.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 141 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_17_117542_61161.pbf.headers b/tests/expected/auto/fnc_17_117542_61161.pbf.headers index 5b92d2df8..030ca2f67 100644 --- a/tests/expected/auto/fnc_17_117542_61161.pbf.headers +++ b/tests/expected/auto/fnc_17_117542_61161.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 146 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_18_235085_122323.pbf.headers b/tests/expected/auto/fnc_18_235085_122323.pbf.headers index 71a629bc0..269b83b03 100644 --- a/tests/expected/auto/fnc_18_235085_122323.pbf.headers +++ b/tests/expected/auto/fnc_18_235085_122323.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 150 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_6_57_29.pbf.headers b/tests/expected/auto/fnc_6_57_29.pbf.headers index 55efe6c9d..f11c38d6a 100644 --- a/tests/expected/auto/fnc_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_6_57_29.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 106 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_b.json.headers b/tests/expected/auto/fnc_b.json.headers index 4be482306..acf02d711 100644 --- a/tests/expected/auto/fnc_b.json.headers +++ b/tests/expected/auto/fnc_b.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"ad-WumWK2dl9zyB9VKNT00Jkg==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_b_6_38_20.pbf.headers b/tests/expected/auto/fnc_b_6_38_20.pbf.headers index ed0ddab5d..79aa84a60 100644 --- a/tests/expected/auto/fnc_b_6_38_20.pbf.headers +++ b/tests/expected/auto/fnc_b_6_38_20.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 110 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_comment.json.headers b/tests/expected/auto/fnc_comment.json.headers index 4be482306..0ff1c0bf2 100644 --- a/tests/expected/auto/fnc_comment.json.headers +++ b/tests/expected/auto/fnc_comment.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"102-6tbS_Y0ey_fK7fkhJd4WKQ==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_token.json.headers b/tests/expected/auto/fnc_token.json.headers index 4be482306..4631452ee 100644 --- a/tests/expected/auto/fnc_token.json.headers +++ b/tests/expected/auto/fnc_token.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"aa-aH357MWBb3myW2xPJ6n6iw==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/fnc_token_0_0_0.pbf.headers b/tests/expected/auto/fnc_token_0_0_0.pbf.headers index 5828a802e..8c563d68f 100644 --- a/tests/expected/auto/fnc_token_0_0_0.pbf.headers +++ b/tests/expected/auto/fnc_token_0_0_0.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 551 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers b/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers index 31413f77c..ce08f097f 100644 --- a/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 104 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers index 7c9d178df..3fe2cd094 100644 --- a/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 103 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers index d1615e99a..8239db864 100644 --- a/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 101 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers index 55efe6c9d..f11c38d6a 100644 --- a/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 106 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers index 6c08c58ff..c9bf9cce1 100644 --- a/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 115 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers index b6b409b38..0db10025a 100644 --- a/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 107 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers index 476a276eb..be29d2337 100644 --- a/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 107 content-type: application/x-protobuf diff --git a/tests/expected/auto/mb_jpg.json.headers b/tests/expected/auto/mb_jpg.json.headers index 4be482306..a28a84866 100644 --- a/tests/expected/auto/mb_jpg.json.headers +++ b/tests/expected/auto/mb_jpg.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"31fe-1IOZwmkS4fjYIp-JzMoTpA==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/mb_jpg_0_0_0.jpg.headers b/tests/expected/auto/mb_jpg_0_0_0.jpg.headers index 0a11eb80d..dc338cb31 100644 --- a/tests/expected/auto/mb_jpg_0_0_0.jpg.headers +++ b/tests/expected/auto/mb_jpg_0_0_0.jpg.headers @@ -1,3 +1,4 @@ + content-length: 22142 content-type: image/jpeg etag: "80104354369725283657331287868672010947" diff --git a/tests/expected/auto/mb_mvt.json.headers b/tests/expected/auto/mb_mvt.json.headers index 4be482306..23fa24f36 100644 --- a/tests/expected/auto/mb_mvt.json.headers +++ b/tests/expected/auto/mb_mvt.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"1a3-AgILNjTcvIE3t7rN3x0S0Q==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/mb_mvt_2_3_1.pbf.headers b/tests/expected/auto/mb_mvt_2_3_1.pbf.headers index 64544148a..8f99e52f3 100644 --- a/tests/expected/auto/mb_mvt_2_3_1.pbf.headers +++ b/tests/expected/auto/mb_mvt_2_3_1.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 263 content-type: application/x-protobuf diff --git a/tests/expected/auto/mb_png.json.headers b/tests/expected/auto/mb_png.json.headers index 4be482306..c431fe961 100644 --- a/tests/expected/auto/mb_png.json.headers +++ b/tests/expected/auto/mb_png.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"3214-OmIr3Ec0hZORLhvVAfcjXg==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/mb_png_0_0_0.png.headers b/tests/expected/auto/mb_png_0_0_0.png.headers index 55026e76b..633f2e9de 100644 --- a/tests/expected/auto/mb_png_0_0_0.png.headers +++ b/tests/expected/auto/mb_png_0_0_0.png.headers @@ -1,3 +1,4 @@ + content-length: 21246 content-type: image/png etag: "198224485858177844679225803711953162005" diff --git a/tests/expected/auto/pmt.json.headers b/tests/expected/auto/pmt.json.headers index 4be482306..1783271e2 100644 --- a/tests/expected/auto/pmt.json.headers +++ b/tests/expected/auto/pmt.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"b5-iGXOSKeGzUc1iuu-TdN9rg==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/pmt_3_4_2.png.headers b/tests/expected/auto/pmt_3_4_2.png.headers index 591af987e..93d4fa258 100644 --- a/tests/expected/auto/pmt_3_4_2.png.headers +++ b/tests/expected/auto/pmt_3_4_2.png.headers @@ -1,3 +1,4 @@ + content-length: 24475 content-type: image/png etag: "183528903823100539089486478518670939939" diff --git a/tests/expected/auto/points3857_srid.json.headers b/tests/expected/auto/points3857_srid.json.headers index 4be482306..9836dc9ea 100644 --- a/tests/expected/auto/points3857_srid.json.headers +++ b/tests/expected/auto/points3857_srid.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"11c-4GaQ__e5mrlIrmds-0KbWA==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/points3857_srid_0_0_0.pbf.headers b/tests/expected/auto/points3857_srid_0_0_0.pbf.headers index 8adb1bf99..8e11f387c 100644 --- a/tests/expected/auto/points3857_srid_0_0_0.pbf.headers +++ b/tests/expected/auto/points3857_srid_0_0_0.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 339 content-type: application/x-protobuf diff --git a/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers b/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers index 1c2ae0ae2..28300698d 100644 --- a/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers +++ b/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 351 content-type: application/x-protobuf diff --git a/tests/expected/auto/rgb_u8.json.headers b/tests/expected/auto/rgb_u8.json.headers index 4be482306..9e171245c 100644 --- a/tests/expected/auto/rgb_u8.json.headers +++ b/tests/expected/auto/rgb_u8.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"61-IE-cuTwRcHu2Y_TNihoCYQ==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/rgb_u8_0_0_0.png.headers b/tests/expected/auto/rgb_u8_0_0_0.png.headers index 99aa77a8a..7f75e6f33 100644 --- a/tests/expected/auto/rgb_u8_0_0_0.png.headers +++ b/tests/expected/auto/rgb_u8_0_0_0.png.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 1465 content-type: image/png diff --git a/tests/expected/auto/rgb_u8_3_0_0.png.headers b/tests/expected/auto/rgb_u8_3_0_0.png.headers index 764477152..ce6d0dd7f 100644 --- a/tests/expected/auto/rgb_u8_3_0_0.png.headers +++ b/tests/expected/auto/rgb_u8_3_0_0.png.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 26676 content-type: image/png diff --git a/tests/expected/auto/rgb_u8_3_1_1.png.headers b/tests/expected/auto/rgb_u8_3_1_1.png.headers index da330a665..58ee0ef1a 100644 --- a/tests/expected/auto/rgb_u8_3_1_1.png.headers +++ b/tests/expected/auto/rgb_u8_3_1_1.png.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 294 content-type: image/png diff --git a/tests/expected/auto/rgba_u8.json.headers b/tests/expected/auto/rgba_u8.json.headers index 4be482306..2b8784094 100644 --- a/tests/expected/auto/rgba_u8.json.headers +++ b/tests/expected/auto/rgba_u8.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"62-BrVv6ZXdmCdQ_wrDTr0tSw==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/rgba_u8_0_0_0.png.headers b/tests/expected/auto/rgba_u8_0_0_0.png.headers index 99aa77a8a..7f75e6f33 100644 --- a/tests/expected/auto/rgba_u8_0_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_0_0_0.png.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 1465 content-type: image/png diff --git a/tests/expected/auto/rgba_u8_3_0_0.png.headers b/tests/expected/auto/rgba_u8_3_0_0.png.headers index 764477152..ce6d0dd7f 100644 --- a/tests/expected/auto/rgba_u8_3_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_3_0_0.png.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 26676 content-type: image/png diff --git a/tests/expected/auto/rgba_u8_3_1_1.png.headers b/tests/expected/auto/rgba_u8_3_1_1.png.headers index da330a665..58ee0ef1a 100644 --- a/tests/expected/auto/rgba_u8_3_1_1.png.headers +++ b/tests/expected/auto/rgba_u8_3_1_1.png.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 294 content-type: image/png diff --git a/tests/expected/auto/rgba_u8_nodata.json.headers b/tests/expected/auto/rgba_u8_nodata.json.headers index 4be482306..866b22e82 100644 --- a/tests/expected/auto/rgba_u8_nodata.json.headers +++ b/tests/expected/auto/rgba_u8_nodata.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"69-f7ZqJowAoXXdyYxlTrEd6g==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers b/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers index 367bc9d7d..a9d6a97c7 100644 --- a/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 4183 content-type: image/png diff --git a/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers b/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers index 7379f9081..e985ea85c 100644 --- a/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 12297 content-type: image/png diff --git a/tests/expected/auto/table_source.json.headers b/tests/expected/auto/table_source.json.headers index 4be482306..2c1ba6959 100644 --- a/tests/expected/auto/table_source.json.headers +++ b/tests/expected/auto/table_source.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"e6-fbngdmxBgtzD9fRcDwLqMA==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/tbl_0_0_0.pbf.headers b/tests/expected/auto/tbl_0_0_0.pbf.headers index d25a9c019..9daec480b 100644 --- a/tests/expected/auto/tbl_0_0_0.pbf.headers +++ b/tests/expected/auto/tbl_0_0_0.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 643 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_12_3673_1911.pbf.headers b/tests/expected/auto/tbl_12_3673_1911.pbf.headers index b0002e8a4..cdc2b507e 100644 --- a/tests/expected/auto/tbl_12_3673_1911.pbf.headers +++ b/tests/expected/auto/tbl_12_3673_1911.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 166 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_13_7346_3822.pbf.headers b/tests/expected/auto/tbl_13_7346_3822.pbf.headers index 51261abb3..fbe1c3ced 100644 --- a/tests/expected/auto/tbl_13_7346_3822.pbf.headers +++ b/tests/expected/auto/tbl_13_7346_3822.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 171 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_14_14692_7645.pbf.headers b/tests/expected/auto/tbl_14_14692_7645.pbf.headers index 4a4279a0b..578493900 100644 --- a/tests/expected/auto/tbl_14_14692_7645.pbf.headers +++ b/tests/expected/auto/tbl_14_14692_7645.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 178 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_17_117542_61161.pbf.headers b/tests/expected/auto/tbl_17_117542_61161.pbf.headers index af77188e9..4b5941d5a 100644 --- a/tests/expected/auto/tbl_17_117542_61161.pbf.headers +++ b/tests/expected/auto/tbl_17_117542_61161.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 182 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_18_235085_122323.pbf.headers b/tests/expected/auto/tbl_18_235085_122323.pbf.headers index 53e4f5359..d3482eab7 100644 --- a/tests/expected/auto/tbl_18_235085_122323.pbf.headers +++ b/tests/expected/auto/tbl_18_235085_122323.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 181 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_6_57_29.pbf.headers b/tests/expected/auto/tbl_6_57_29.pbf.headers index bb64cef77..d805c4aa0 100644 --- a/tests/expected/auto/tbl_6_57_29.pbf.headers +++ b/tests/expected/auto/tbl_6_57_29.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 138 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_comment.json.headers b/tests/expected/auto/tbl_comment.json.headers index 4be482306..65d887177 100644 --- a/tests/expected/auto/tbl_comment.json.headers +++ b/tests/expected/auto/tbl_comment.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"136-lHzPvh-7gSnjgJnd-2ctzQ==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto/webp2_1_0_0.png.headers b/tests/expected/auto/webp2_1_0_0.png.headers index 8eca48cfd..a48276c20 100644 --- a/tests/expected/auto/webp2_1_0_0.png.headers +++ b/tests/expected/auto/webp2_1_0_0.png.headers @@ -1,3 +1,4 @@ + content-length: 10658 content-type: image/webp etag: "13022905490801985056512160688182263905" diff --git a/tests/expected/auto_mini/catalog_auto.json.headers b/tests/expected/auto_mini/catalog_auto.json.headers index 4be482306..7e8c0fcce 100644 --- a/tests/expected/auto_mini/catalog_auto.json.headers +++ b/tests/expected/auto_mini/catalog_auto.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"64--8bak7FikheiRgT6G8MIRA==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/catalog_cfg.json.headers b/tests/expected/configured/catalog_cfg.json.headers index 4be482306..be617045a 100644 --- a/tests/expected/configured/catalog_cfg.json.headers +++ b/tests/expected/configured/catalog_cfg.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"6d0--TWMcf3UiYDIiN5FPR_n2g==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/cmp.json.headers b/tests/expected/configured/cmp.json.headers index 4be482306..208c2a29b 100644 --- a/tests/expected/configured/cmp.json.headers +++ b/tests/expected/configured/cmp.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"188-1_yQANTYBHv0kaBoGJCqKQ==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/cmp_0_0_0.pbf.headers b/tests/expected/configured/cmp_0_0_0.pbf.headers index 2a625c0bd..69f2958af 100644 --- a/tests/expected/configured/cmp_0_0_0.pbf.headers +++ b/tests/expected/configured/cmp_0_0_0.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 576 content-type: application/x-protobuf diff --git a/tests/expected/configured/fnc2_0_0_0.pbf.headers b/tests/expected/configured/fnc2_0_0_0.pbf.headers index 5828a802e..8c563d68f 100644 --- a/tests/expected/configured/fnc2_0_0_0.pbf.headers +++ b/tests/expected/configured/fnc2_0_0_0.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 551 content-type: application/x-protobuf diff --git a/tests/expected/configured/fnc_0_0_0.pbf.headers b/tests/expected/configured/fnc_0_0_0.pbf.headers index d2c86077a..41a508047 100644 --- a/tests/expected/configured/fnc_0_0_0.pbf.headers +++ b/tests/expected/configured/fnc_0_0_0.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 546 content-type: application/x-protobuf diff --git a/tests/expected/configured/fnc_comment_cfg.json.headers b/tests/expected/configured/fnc_comment_cfg.json.headers index 4be482306..69724b8f8 100644 --- a/tests/expected/configured/fnc_comment_cfg.json.headers +++ b/tests/expected/configured/fnc_comment_cfg.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"f8-Q_61CSCILe6RIhIWzTvf_Q==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/font_1.pbf.headers b/tests/expected/configured/font_1.pbf.headers index b481f4ee0..ece92af43 100644 --- a/tests/expected/configured/font_1.pbf.headers +++ b/tests/expected/configured/font_1.pbf.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/x-protobuf +etag: W/"130b6-leolMlz39eG1OisHJXWcdA==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/font_2.pbf.headers b/tests/expected/configured/font_2.pbf.headers index b481f4ee0..badd78604 100644 --- a/tests/expected/configured/font_2.pbf.headers +++ b/tests/expected/configured/font_2.pbf.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/x-protobuf +etag: W/"13762-12Po9LfxnAVc5cwSQZI0Bg==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/font_3.pbf.headers b/tests/expected/configured/font_3.pbf.headers index b481f4ee0..badd78604 100644 --- a/tests/expected/configured/font_3.pbf.headers +++ b/tests/expected/configured/font_3.pbf.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/x-protobuf +etag: W/"13762-12Po9LfxnAVc5cwSQZI0Bg==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/pmt2_0_0_0.png.headers b/tests/expected/configured/pmt2_0_0_0.png.headers index 7178577a0..58259a270 100644 --- a/tests/expected/configured/pmt2_0_0_0.png.headers +++ b/tests/expected/configured/pmt2_0_0_0.png.headers @@ -1,3 +1,4 @@ + content-length: 11586 content-type: image/webp etag: "319069140686520200453324848169489853378" diff --git a/tests/expected/configured/pmt_0_0_0.png.headers b/tests/expected/configured/pmt_0_0_0.png.headers index ca3b40b80..96933e062 100644 --- a/tests/expected/configured/pmt_0_0_0.png.headers +++ b/tests/expected/configured/pmt_0_0_0.png.headers @@ -1,3 +1,4 @@ + content-length: 18404 content-type: image/png etag: "109615783887137800409763947330857640552" diff --git a/tests/expected/configured/sdf_spr_cmp.json.headers b/tests/expected/configured/sdf_spr_cmp.json.headers index 4be482306..30ac90bf0 100644 --- a/tests/expected/configured/sdf_spr_cmp.json.headers +++ b/tests/expected/configured/sdf_spr_cmp.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"131-s95fKXweVNtXjVXT7l2oHQ==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/sdf_spr_cmp.png.headers b/tests/expected/configured/sdf_spr_cmp.png.headers index b515e6eac..f30e5d5b7 100644 --- a/tests/expected/configured/sdf_spr_cmp.png.headers +++ b/tests/expected/configured/sdf_spr_cmp.png.headers @@ -1,3 +1,4 @@ + content-length: 945 content-type: image/png etag: W/"3b1-qyh8Bev0R5Z2fLn83grsPw==" diff --git a/tests/expected/configured/sdf_spr_cmp_2.json.headers b/tests/expected/configured/sdf_spr_cmp_2.json.headers index 4be482306..bf233f534 100644 --- a/tests/expected/configured/sdf_spr_cmp_2.json.headers +++ b/tests/expected/configured/sdf_spr_cmp_2.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"131-Bjo8hrRKhIMOqK572ImviA==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/sdf_spr_cmp_2.png.headers b/tests/expected/configured/sdf_spr_cmp_2.png.headers index 58e57f8c7..71bbcc5c5 100644 --- a/tests/expected/configured/sdf_spr_cmp_2.png.headers +++ b/tests/expected/configured/sdf_spr_cmp_2.png.headers @@ -1,3 +1,4 @@ + content-length: 1863 content-type: image/png etag: W/"747-uY5SJOmaA0qgk9TmFw54yw==" diff --git a/tests/expected/configured/sdf_spr_mysrc.json.headers b/tests/expected/configured/sdf_spr_mysrc.json.headers index 4be482306..97aab9e19 100644 --- a/tests/expected/configured/sdf_spr_mysrc.json.headers +++ b/tests/expected/configured/sdf_spr_mysrc.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"4a-2PGKEoQ361taeiNAqH1Hyg==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/sdf_spr_mysrc.png.headers b/tests/expected/configured/sdf_spr_mysrc.png.headers index e3af18d38..9b6e5670e 100644 --- a/tests/expected/configured/sdf_spr_mysrc.png.headers +++ b/tests/expected/configured/sdf_spr_mysrc.png.headers @@ -1,3 +1,4 @@ + content-length: 675 content-type: image/png etag: W/"2a3-ju0zA7FbYbeaqMM_Qg1Iqg==" diff --git a/tests/expected/configured/sdf_spr_src1.json.headers b/tests/expected/configured/sdf_spr_src1.json.headers index 4be482306..d4819c272 100644 --- a/tests/expected/configured/sdf_spr_src1.json.headers +++ b/tests/expected/configured/sdf_spr_src1.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"e7-7ie4iOXghXewTq4x5OKswg==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/sdf_spr_src1.png.headers b/tests/expected/configured/sdf_spr_src1.png.headers index 10b72ab21..1908b89f0 100644 --- a/tests/expected/configured/sdf_spr_src1.png.headers +++ b/tests/expected/configured/sdf_spr_src1.png.headers @@ -1,3 +1,4 @@ + content-length: 900 content-type: image/png etag: W/"384-m3iOSdyLqIRO-1uu8tzIcw==" diff --git a/tests/expected/configured/sdf_spr_src1_.json.headers b/tests/expected/configured/sdf_spr_src1_.json.headers index 4be482306..12030b751 100644 --- a/tests/expected/configured/sdf_spr_src1_.json.headers +++ b/tests/expected/configured/sdf_spr_src1_.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"e6-IQNV1VuPkoio6olHvfumfg==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/sdf_spr_src1_.png.headers b/tests/expected/configured/sdf_spr_src1_.png.headers index 778e00063..109ebad00 100644 --- a/tests/expected/configured/sdf_spr_src1_.png.headers +++ b/tests/expected/configured/sdf_spr_src1_.png.headers @@ -1,3 +1,4 @@ + content-length: 1699 content-type: image/png etag: W/"6a3-NdhmitklvJKSk_7phaxquw==" diff --git a/tests/expected/configured/spr_cmp.json.headers b/tests/expected/configured/spr_cmp.json.headers index 4be482306..1c51bdd97 100644 --- a/tests/expected/configured/spr_cmp.json.headers +++ b/tests/expected/configured/spr_cmp.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"106-vO62JYCAMTM5xx97X6qw9w==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_cmp.png.headers b/tests/expected/configured/spr_cmp.png.headers index 78b76896d..45036ab3e 100644 --- a/tests/expected/configured/spr_cmp.png.headers +++ b/tests/expected/configured/spr_cmp.png.headers @@ -1,3 +1,4 @@ + content-length: 785 content-type: image/png etag: W/"311-u7NFzzhK-VdpDMgsJ-SjaQ==" diff --git a/tests/expected/configured/spr_cmp_2x.json.headers b/tests/expected/configured/spr_cmp_2x.json.headers index 4be482306..05e6369dd 100644 --- a/tests/expected/configured/spr_cmp_2x.json.headers +++ b/tests/expected/configured/spr_cmp_2x.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"106-XvyGBYKI-CKbS-pEdF5nAA==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_cmp_2x.png.headers b/tests/expected/configured/spr_cmp_2x.png.headers index dacce3df0..6a4ac1ba3 100644 --- a/tests/expected/configured/spr_cmp_2x.png.headers +++ b/tests/expected/configured/spr_cmp_2x.png.headers @@ -1,3 +1,4 @@ + content-length: 1755 content-type: image/png etag: W/"6db-u2j270aTAu4aTfvEwg9iRA==" diff --git a/tests/expected/configured/spr_mysrc.json.headers b/tests/expected/configured/spr_mysrc.json.headers index 4be482306..dcd63510d 100644 --- a/tests/expected/configured/spr_mysrc.json.headers +++ b/tests/expected/configured/spr_mysrc.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"3f-dujM8uKY4xAnuwDPF3cq1Q==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_mysrc.png.headers b/tests/expected/configured/spr_mysrc.png.headers index 87f8ae923..653ce5182 100644 --- a/tests/expected/configured/spr_mysrc.png.headers +++ b/tests/expected/configured/spr_mysrc.png.headers @@ -1,3 +1,4 @@ + content-length: 189 content-type: image/png etag: W/"bd-wRhFV2xvMbGQOJkdFxyNyg==" diff --git a/tests/expected/configured/spr_mysrc_2x.json.headers b/tests/expected/configured/spr_mysrc_2x.json.headers index 4be482306..032e85fab 100644 --- a/tests/expected/configured/spr_mysrc_2x.json.headers +++ b/tests/expected/configured/spr_mysrc_2x.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"3f-ZlKlqxoAjk_BolpJ5vQ4Gw==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_mysrc_2x.png.headers b/tests/expected/configured/spr_mysrc_2x.png.headers index b7a97e72c..70a2891b0 100644 --- a/tests/expected/configured/spr_mysrc_2x.png.headers +++ b/tests/expected/configured/spr_mysrc_2x.png.headers @@ -1,3 +1,4 @@ + content-length: 344 content-type: image/png etag: W/"158-ZSYNoWLreCScoiFLriGD6Q==" diff --git a/tests/expected/configured/spr_src1.json.headers b/tests/expected/configured/spr_src1.json.headers index 4be482306..7647dea03 100644 --- a/tests/expected/configured/spr_src1.json.headers +++ b/tests/expected/configured/spr_src1.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"c6-hm38ksFM7OrTdjwShP2iRA==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_src1.png.headers b/tests/expected/configured/spr_src1.png.headers index b9c2f2466..66f810031 100644 --- a/tests/expected/configured/spr_src1.png.headers +++ b/tests/expected/configured/spr_src1.png.headers @@ -1,3 +1,4 @@ + content-length: 758 content-type: image/png etag: W/"2f6-PZaBSgIOiVTrPDnRiX0hYg==" diff --git a/tests/expected/configured/spr_src1_2x.json.headers b/tests/expected/configured/spr_src1_2x.json.headers index 4be482306..1bc110bf3 100644 --- a/tests/expected/configured/spr_src1_2x.json.headers +++ b/tests/expected/configured/spr_src1_2x.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"c6-4pCj2iqngMtQ6k9bdvO19w==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/spr_src1_2x.png.headers b/tests/expected/configured/spr_src1_2x.png.headers index c937a4cf4..90528146c 100644 --- a/tests/expected/configured/spr_src1_2x.png.headers +++ b/tests/expected/configured/spr_src1_2x.png.headers @@ -1,3 +1,4 @@ + content-length: 1699 content-type: image/png etag: W/"6a3--J74WPHes8bNZx23r-Ru4w==" diff --git a/tests/expected/configured/style_maplibre_demo.1.json.headers b/tests/expected/configured/style_maplibre_demo.1.json.headers index 4be482306..56a38504e 100644 --- a/tests/expected/configured/style_maplibre_demo.1.json.headers +++ b/tests/expected/configured/style_maplibre_demo.1.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"1050-ndsWDIE-ORCeUzSbybafug==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/style_maplibre_demo.json.headers b/tests/expected/configured/style_maplibre_demo.json.headers index 4be482306..56a38504e 100644 --- a/tests/expected/configured/style_maplibre_demo.json.headers +++ b/tests/expected/configured/style_maplibre_demo.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"1050-ndsWDIE-ORCeUzSbybafug==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/style_src2_maptiler_basic.1.json.headers b/tests/expected/configured/style_src2_maptiler_basic.1.json.headers index 4be482306..4c570e54c 100644 --- a/tests/expected/configured/style_src2_maptiler_basic.1.json.headers +++ b/tests/expected/configured/style_src2_maptiler_basic.1.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"3f5c-az1eu_MvSQst-tUfz9ePoQ==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/style_src2_maptiler_basic.json.headers b/tests/expected/configured/style_src2_maptiler_basic.json.headers index 4be482306..4c570e54c 100644 --- a/tests/expected/configured/style_src2_maptiler_basic.json.headers +++ b/tests/expected/configured/style_src2_maptiler_basic.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"3f5c-az1eu_MvSQst-tUfz9ePoQ==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/tbl_0_0_0.pbf.headers b/tests/expected/configured/tbl_0_0_0.pbf.headers index d25a9c019..9daec480b 100644 --- a/tests/expected/configured/tbl_0_0_0.pbf.headers +++ b/tests/expected/configured/tbl_0_0_0.pbf.headers @@ -1,3 +1,4 @@ + content-encoding: gzip content-length: 643 content-type: application/x-protobuf diff --git a/tests/expected/configured/tbl_comment_cfg.json.headers b/tests/expected/configured/tbl_comment_cfg.json.headers index 4be482306..65d887177 100644 --- a/tests/expected/configured/tbl_comment_cfg.json.headers +++ b/tests/expected/configured/tbl_comment_cfg.json.headers @@ -1,4 +1,6 @@ + content-encoding: br content-type: application/json +etag: W/"136-lHzPvh-7gSnjgJnd-2ctzQ==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/test.sh b/tests/test.sh index 79faf9d27..142ef9520 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -618,7 +618,6 @@ find -type f -name "*.headers" -exec sed --regexp-extended --in-place "s/date: . # this is defintively not an header find -type f -name "*.headers" -exec sed --regexp-extended --in-place "s/HTTP.+//" {} \; # sorting is arbitrairy -find . -type f -name "*.headers" -exec sh -c 'awk '"'"'{gsub(/^[ \t]+/, ""); gsub(/[ \t]+$/, ""); if (length) print}'"'"' "$1" | sort > "$1.tmp" && mv "$1.tmp" "$1" -' sh {} \; +find . -type f -name "*.headers" -exec sh -c "awk '{gsub(/^[ \t]+/, \"\"); gsub(/[ \t]+$/, \"\"); if (length) print}' '$1' | sort > '$1.tmp' && mv '$1.tmp' '$1'" sh {} \; >&2 echo "All integration tests have passed" From 407af5213b20d3e4eb1e1a973746fe54c80e91d1 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Wed, 21 May 2025 14:52:55 +0200 Subject: [PATCH 16/24] reset to the less smart awk command --- tests/expected/auto/catalog_auto.json.headers | 1 - tests/expected/auto/cmp.json.headers | 1 - tests/expected/auto/cmp_0_0_0.pbf.headers | 1 - tests/expected/auto/cmp_12_3673_1911.pbf.headers | 1 - tests/expected/auto/cmp_13_7346_3822.pbf.headers | 1 - tests/expected/auto/cmp_14_14692_7645.pbf.headers | 1 - tests/expected/auto/cmp_17_117542_61161.pbf.headers | 1 - tests/expected/auto/cmp_18_235085_122323.pbf.headers | 1 - tests/expected/auto/cmp_6_57_29.pbf.headers | 1 - tests/expected/auto/fnc.json.headers | 1 - tests/expected/auto/fnc_0_0_0.pbf.headers | 1 - tests/expected/auto/fnc_12_3673_1911.pbf.headers | 1 - tests/expected/auto/fnc_13_7346_3822.pbf.headers | 1 - tests/expected/auto/fnc_14_14692_7645.pbf.headers | 1 - tests/expected/auto/fnc_17_117542_61161.pbf.headers | 1 - tests/expected/auto/fnc_18_235085_122323.pbf.headers | 1 - tests/expected/auto/fnc_6_57_29.pbf.headers | 1 - tests/expected/auto/fnc_b.json.headers | 1 - tests/expected/auto/fnc_b_6_38_20.pbf.headers | 1 - tests/expected/auto/fnc_comment.json.headers | 1 - tests/expected/auto/fnc_token.json.headers | 1 - tests/expected/auto/fnc_token_0_0_0.pbf.headers | 1 - tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers | 1 - tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers | 1 - tests/expected/auto/fnc_zxy_6_57_29.pbf.headers | 1 - tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers | 1 - tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers | 1 - tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers | 1 - tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers | 1 - tests/expected/auto/mb_jpg.json.headers | 1 - tests/expected/auto/mb_jpg_0_0_0.jpg.headers | 1 - tests/expected/auto/mb_mvt.json.headers | 1 - tests/expected/auto/mb_mvt_2_3_1.pbf.headers | 1 - tests/expected/auto/mb_png.json.headers | 1 - tests/expected/auto/mb_png_0_0_0.png.headers | 1 - tests/expected/auto/pmt.json.headers | 1 - tests/expected/auto/pmt_3_4_2.png.headers | 1 - tests/expected/auto/points3857_srid.json.headers | 1 - tests/expected/auto/points3857_srid_0_0_0.pbf.headers | 1 - tests/expected/auto/points_empty_srid_0_0_0.pbf.headers | 1 - tests/expected/auto/rgb_u8.json.headers | 1 - tests/expected/auto/rgb_u8_0_0_0.png.headers | 1 - tests/expected/auto/rgb_u8_3_0_0.png.headers | 1 - tests/expected/auto/rgb_u8_3_1_1.png.headers | 1 - tests/expected/auto/rgba_u8.json.headers | 1 - tests/expected/auto/rgba_u8_0_0_0.png.headers | 1 - tests/expected/auto/rgba_u8_3_0_0.png.headers | 1 - tests/expected/auto/rgba_u8_3_1_1.png.headers | 1 - tests/expected/auto/rgba_u8_nodata.json.headers | 1 - tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers | 1 - tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers | 1 - tests/expected/auto/table_source.json.headers | 1 - tests/expected/auto/tbl_0_0_0.pbf.headers | 1 - tests/expected/auto/tbl_12_3673_1911.pbf.headers | 1 - tests/expected/auto/tbl_13_7346_3822.pbf.headers | 1 - tests/expected/auto/tbl_14_14692_7645.pbf.headers | 1 - tests/expected/auto/tbl_17_117542_61161.pbf.headers | 1 - tests/expected/auto/tbl_18_235085_122323.pbf.headers | 1 - tests/expected/auto/tbl_6_57_29.pbf.headers | 1 - tests/expected/auto/tbl_comment.json.headers | 1 - tests/expected/auto/webp2_1_0_0.png.headers | 1 - tests/expected/auto_mini/catalog_auto.json.headers | 1 - tests/expected/configured/catalog_cfg.json.headers | 1 - tests/expected/configured/cmp.json.headers | 1 - tests/expected/configured/cmp_0_0_0.pbf.headers | 1 - tests/expected/configured/fnc2_0_0_0.pbf.headers | 1 - tests/expected/configured/fnc_0_0_0.pbf.headers | 1 - tests/expected/configured/fnc_comment_cfg.json.headers | 1 - tests/expected/configured/font_1.pbf.headers | 1 - tests/expected/configured/font_2.pbf.headers | 1 - tests/expected/configured/font_3.pbf.headers | 1 - tests/expected/configured/pmt2_0_0_0.png.headers | 1 - tests/expected/configured/pmt_0_0_0.png.headers | 1 - tests/expected/configured/sdf_spr_cmp.json.headers | 1 - tests/expected/configured/sdf_spr_cmp.png.headers | 1 - tests/expected/configured/sdf_spr_cmp_2.json.headers | 1 - tests/expected/configured/sdf_spr_cmp_2.png.headers | 1 - tests/expected/configured/sdf_spr_mysrc.json.headers | 1 - tests/expected/configured/sdf_spr_mysrc.png.headers | 1 - tests/expected/configured/sdf_spr_src1.json.headers | 1 - tests/expected/configured/sdf_spr_src1.png.headers | 1 - tests/expected/configured/sdf_spr_src1_.json.headers | 1 - tests/expected/configured/sdf_spr_src1_.png.headers | 1 - tests/expected/configured/spr_cmp.json.headers | 1 - tests/expected/configured/spr_cmp.png.headers | 1 - tests/expected/configured/spr_cmp_2x.json.headers | 1 - tests/expected/configured/spr_cmp_2x.png.headers | 1 - tests/expected/configured/spr_mysrc.json.headers | 1 - tests/expected/configured/spr_mysrc.png.headers | 1 - tests/expected/configured/spr_mysrc_2x.json.headers | 1 - tests/expected/configured/spr_mysrc_2x.png.headers | 1 - tests/expected/configured/spr_src1.json.headers | 1 - tests/expected/configured/spr_src1.png.headers | 1 - tests/expected/configured/spr_src1_2x.json.headers | 1 - tests/expected/configured/spr_src1_2x.png.headers | 1 - .../expected/configured/style_maplibre_demo.1.json.headers | 1 - tests/expected/configured/style_maplibre_demo.json.headers | 1 - .../configured/style_src2_maptiler_basic.1.json.headers | 1 - .../configured/style_src2_maptiler_basic.json.headers | 1 - tests/expected/configured/tbl_0_0_0.pbf.headers | 1 - tests/expected/configured/tbl_comment_cfg.json.headers | 1 - tests/test.sh | 6 ++++-- 102 files changed, 4 insertions(+), 103 deletions(-) diff --git a/tests/expected/auto/catalog_auto.json.headers b/tests/expected/auto/catalog_auto.json.headers index 205aa0eb3..ceea41815 100644 --- a/tests/expected/auto/catalog_auto.json.headers +++ b/tests/expected/auto/catalog_auto.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"1829-ytE9MUN-OpjkOpCrgVrLsg==" diff --git a/tests/expected/auto/cmp.json.headers b/tests/expected/auto/cmp.json.headers index 5bb618070..c7b802f10 100644 --- a/tests/expected/auto/cmp.json.headers +++ b/tests/expected/auto/cmp.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"1a7-SKz0jISgY5NokLA90cn9bQ==" diff --git a/tests/expected/auto/cmp_0_0_0.pbf.headers b/tests/expected/auto/cmp_0_0_0.pbf.headers index a63d36f8f..29e2fde02 100644 --- a/tests/expected/auto/cmp_0_0_0.pbf.headers +++ b/tests/expected/auto/cmp_0_0_0.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 1150 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_12_3673_1911.pbf.headers b/tests/expected/auto/cmp_12_3673_1911.pbf.headers index 15787b6bd..099b66d9e 100644 --- a/tests/expected/auto/cmp_12_3673_1911.pbf.headers +++ b/tests/expected/auto/cmp_12_3673_1911.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 228 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_13_7346_3822.pbf.headers b/tests/expected/auto/cmp_13_7346_3822.pbf.headers index 5bd47ab59..55d476c17 100644 --- a/tests/expected/auto/cmp_13_7346_3822.pbf.headers +++ b/tests/expected/auto/cmp_13_7346_3822.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 229 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_14_14692_7645.pbf.headers b/tests/expected/auto/cmp_14_14692_7645.pbf.headers index 98d953c9f..a169ee81d 100644 --- a/tests/expected/auto/cmp_14_14692_7645.pbf.headers +++ b/tests/expected/auto/cmp_14_14692_7645.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 241 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_17_117542_61161.pbf.headers b/tests/expected/auto/cmp_17_117542_61161.pbf.headers index 5a8aa34a7..bd690c065 100644 --- a/tests/expected/auto/cmp_17_117542_61161.pbf.headers +++ b/tests/expected/auto/cmp_17_117542_61161.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 253 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_18_235085_122323.pbf.headers b/tests/expected/auto/cmp_18_235085_122323.pbf.headers index cb4f151d9..d4a545f8b 100644 --- a/tests/expected/auto/cmp_18_235085_122323.pbf.headers +++ b/tests/expected/auto/cmp_18_235085_122323.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 255 content-type: application/x-protobuf diff --git a/tests/expected/auto/cmp_6_57_29.pbf.headers b/tests/expected/auto/cmp_6_57_29.pbf.headers index bff00a8c8..5d9343490 100644 --- a/tests/expected/auto/cmp_6_57_29.pbf.headers +++ b/tests/expected/auto/cmp_6_57_29.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 181 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc.json.headers b/tests/expected/auto/fnc.json.headers index 51c80a152..0fb16de3e 100644 --- a/tests/expected/auto/fnc.json.headers +++ b/tests/expected/auto/fnc.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"85-6Q4dOREWZNsdPdT5r-Pjvg==" diff --git a/tests/expected/auto/fnc_0_0_0.pbf.headers b/tests/expected/auto/fnc_0_0_0.pbf.headers index 41a508047..d2c86077a 100644 --- a/tests/expected/auto/fnc_0_0_0.pbf.headers +++ b/tests/expected/auto/fnc_0_0_0.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 546 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_12_3673_1911.pbf.headers b/tests/expected/auto/fnc_12_3673_1911.pbf.headers index 786dc944b..701fe1c91 100644 --- a/tests/expected/auto/fnc_12_3673_1911.pbf.headers +++ b/tests/expected/auto/fnc_12_3673_1911.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 131 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_13_7346_3822.pbf.headers b/tests/expected/auto/fnc_13_7346_3822.pbf.headers index 510d55f12..24b02a0c8 100644 --- a/tests/expected/auto/fnc_13_7346_3822.pbf.headers +++ b/tests/expected/auto/fnc_13_7346_3822.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 133 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_14_14692_7645.pbf.headers b/tests/expected/auto/fnc_14_14692_7645.pbf.headers index 7431028c1..efddcf4ce 100644 --- a/tests/expected/auto/fnc_14_14692_7645.pbf.headers +++ b/tests/expected/auto/fnc_14_14692_7645.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 141 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_17_117542_61161.pbf.headers b/tests/expected/auto/fnc_17_117542_61161.pbf.headers index 030ca2f67..5b92d2df8 100644 --- a/tests/expected/auto/fnc_17_117542_61161.pbf.headers +++ b/tests/expected/auto/fnc_17_117542_61161.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 146 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_18_235085_122323.pbf.headers b/tests/expected/auto/fnc_18_235085_122323.pbf.headers index 269b83b03..71a629bc0 100644 --- a/tests/expected/auto/fnc_18_235085_122323.pbf.headers +++ b/tests/expected/auto/fnc_18_235085_122323.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 150 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_6_57_29.pbf.headers b/tests/expected/auto/fnc_6_57_29.pbf.headers index f11c38d6a..55efe6c9d 100644 --- a/tests/expected/auto/fnc_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_6_57_29.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 106 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_b.json.headers b/tests/expected/auto/fnc_b.json.headers index acf02d711..f279f938e 100644 --- a/tests/expected/auto/fnc_b.json.headers +++ b/tests/expected/auto/fnc_b.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"ad-WumWK2dl9zyB9VKNT00Jkg==" diff --git a/tests/expected/auto/fnc_b_6_38_20.pbf.headers b/tests/expected/auto/fnc_b_6_38_20.pbf.headers index 79aa84a60..ed0ddab5d 100644 --- a/tests/expected/auto/fnc_b_6_38_20.pbf.headers +++ b/tests/expected/auto/fnc_b_6_38_20.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 110 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_comment.json.headers b/tests/expected/auto/fnc_comment.json.headers index 0ff1c0bf2..1643547c4 100644 --- a/tests/expected/auto/fnc_comment.json.headers +++ b/tests/expected/auto/fnc_comment.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"102-6tbS_Y0ey_fK7fkhJd4WKQ==" diff --git a/tests/expected/auto/fnc_token.json.headers b/tests/expected/auto/fnc_token.json.headers index 4631452ee..cdcaf36ce 100644 --- a/tests/expected/auto/fnc_token.json.headers +++ b/tests/expected/auto/fnc_token.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"aa-aH357MWBb3myW2xPJ6n6iw==" diff --git a/tests/expected/auto/fnc_token_0_0_0.pbf.headers b/tests/expected/auto/fnc_token_0_0_0.pbf.headers index 8c563d68f..5828a802e 100644 --- a/tests/expected/auto/fnc_token_0_0_0.pbf.headers +++ b/tests/expected/auto/fnc_token_0_0_0.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 551 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers b/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers index ce08f097f..31413f77c 100644 --- a/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zoom_xy_6_57_29.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 104 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers index 3fe2cd094..7c9d178df 100644 --- a/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy2_6_57_29.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 103 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers index 8239db864..d1615e99a 100644 --- a/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_6_57_29.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 101 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers index f11c38d6a..55efe6c9d 100644 --- a/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_query_6_57_29.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 106 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers index c9bf9cce1..6c08c58ff 100644 --- a/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_row2_6_57_29.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 115 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers index 0db10025a..b6b409b38 100644 --- a/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_row_6_57_29.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 107 content-type: application/x-protobuf diff --git a/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers b/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers index be29d2337..476a276eb 100644 --- a/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers +++ b/tests/expected/auto/fnc_zxy_row_key_6_57_29.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 107 content-type: application/x-protobuf diff --git a/tests/expected/auto/mb_jpg.json.headers b/tests/expected/auto/mb_jpg.json.headers index a28a84866..ff7bb356f 100644 --- a/tests/expected/auto/mb_jpg.json.headers +++ b/tests/expected/auto/mb_jpg.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"31fe-1IOZwmkS4fjYIp-JzMoTpA==" diff --git a/tests/expected/auto/mb_jpg_0_0_0.jpg.headers b/tests/expected/auto/mb_jpg_0_0_0.jpg.headers index dc338cb31..0a11eb80d 100644 --- a/tests/expected/auto/mb_jpg_0_0_0.jpg.headers +++ b/tests/expected/auto/mb_jpg_0_0_0.jpg.headers @@ -1,4 +1,3 @@ - content-length: 22142 content-type: image/jpeg etag: "80104354369725283657331287868672010947" diff --git a/tests/expected/auto/mb_mvt.json.headers b/tests/expected/auto/mb_mvt.json.headers index 23fa24f36..5f614c645 100644 --- a/tests/expected/auto/mb_mvt.json.headers +++ b/tests/expected/auto/mb_mvt.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"1a3-AgILNjTcvIE3t7rN3x0S0Q==" diff --git a/tests/expected/auto/mb_mvt_2_3_1.pbf.headers b/tests/expected/auto/mb_mvt_2_3_1.pbf.headers index 8f99e52f3..64544148a 100644 --- a/tests/expected/auto/mb_mvt_2_3_1.pbf.headers +++ b/tests/expected/auto/mb_mvt_2_3_1.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 263 content-type: application/x-protobuf diff --git a/tests/expected/auto/mb_png.json.headers b/tests/expected/auto/mb_png.json.headers index c431fe961..6d69cc7e8 100644 --- a/tests/expected/auto/mb_png.json.headers +++ b/tests/expected/auto/mb_png.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"3214-OmIr3Ec0hZORLhvVAfcjXg==" diff --git a/tests/expected/auto/mb_png_0_0_0.png.headers b/tests/expected/auto/mb_png_0_0_0.png.headers index 633f2e9de..55026e76b 100644 --- a/tests/expected/auto/mb_png_0_0_0.png.headers +++ b/tests/expected/auto/mb_png_0_0_0.png.headers @@ -1,4 +1,3 @@ - content-length: 21246 content-type: image/png etag: "198224485858177844679225803711953162005" diff --git a/tests/expected/auto/pmt.json.headers b/tests/expected/auto/pmt.json.headers index 1783271e2..2ede2f78a 100644 --- a/tests/expected/auto/pmt.json.headers +++ b/tests/expected/auto/pmt.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"b5-iGXOSKeGzUc1iuu-TdN9rg==" diff --git a/tests/expected/auto/pmt_3_4_2.png.headers b/tests/expected/auto/pmt_3_4_2.png.headers index 93d4fa258..591af987e 100644 --- a/tests/expected/auto/pmt_3_4_2.png.headers +++ b/tests/expected/auto/pmt_3_4_2.png.headers @@ -1,4 +1,3 @@ - content-length: 24475 content-type: image/png etag: "183528903823100539089486478518670939939" diff --git a/tests/expected/auto/points3857_srid.json.headers b/tests/expected/auto/points3857_srid.json.headers index 9836dc9ea..6059e3b29 100644 --- a/tests/expected/auto/points3857_srid.json.headers +++ b/tests/expected/auto/points3857_srid.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"11c-4GaQ__e5mrlIrmds-0KbWA==" diff --git a/tests/expected/auto/points3857_srid_0_0_0.pbf.headers b/tests/expected/auto/points3857_srid_0_0_0.pbf.headers index 8e11f387c..8adb1bf99 100644 --- a/tests/expected/auto/points3857_srid_0_0_0.pbf.headers +++ b/tests/expected/auto/points3857_srid_0_0_0.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 339 content-type: application/x-protobuf diff --git a/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers b/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers index 28300698d..1c2ae0ae2 100644 --- a/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers +++ b/tests/expected/auto/points_empty_srid_0_0_0.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 351 content-type: application/x-protobuf diff --git a/tests/expected/auto/rgb_u8.json.headers b/tests/expected/auto/rgb_u8.json.headers index 9e171245c..0637be813 100644 --- a/tests/expected/auto/rgb_u8.json.headers +++ b/tests/expected/auto/rgb_u8.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"61-IE-cuTwRcHu2Y_TNihoCYQ==" diff --git a/tests/expected/auto/rgb_u8_0_0_0.png.headers b/tests/expected/auto/rgb_u8_0_0_0.png.headers index 7f75e6f33..99aa77a8a 100644 --- a/tests/expected/auto/rgb_u8_0_0_0.png.headers +++ b/tests/expected/auto/rgb_u8_0_0_0.png.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 1465 content-type: image/png diff --git a/tests/expected/auto/rgb_u8_3_0_0.png.headers b/tests/expected/auto/rgb_u8_3_0_0.png.headers index ce6d0dd7f..764477152 100644 --- a/tests/expected/auto/rgb_u8_3_0_0.png.headers +++ b/tests/expected/auto/rgb_u8_3_0_0.png.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 26676 content-type: image/png diff --git a/tests/expected/auto/rgb_u8_3_1_1.png.headers b/tests/expected/auto/rgb_u8_3_1_1.png.headers index 58ee0ef1a..da330a665 100644 --- a/tests/expected/auto/rgb_u8_3_1_1.png.headers +++ b/tests/expected/auto/rgb_u8_3_1_1.png.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 294 content-type: image/png diff --git a/tests/expected/auto/rgba_u8.json.headers b/tests/expected/auto/rgba_u8.json.headers index 2b8784094..14faf7f9e 100644 --- a/tests/expected/auto/rgba_u8.json.headers +++ b/tests/expected/auto/rgba_u8.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"62-BrVv6ZXdmCdQ_wrDTr0tSw==" diff --git a/tests/expected/auto/rgba_u8_0_0_0.png.headers b/tests/expected/auto/rgba_u8_0_0_0.png.headers index 7f75e6f33..99aa77a8a 100644 --- a/tests/expected/auto/rgba_u8_0_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_0_0_0.png.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 1465 content-type: image/png diff --git a/tests/expected/auto/rgba_u8_3_0_0.png.headers b/tests/expected/auto/rgba_u8_3_0_0.png.headers index ce6d0dd7f..764477152 100644 --- a/tests/expected/auto/rgba_u8_3_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_3_0_0.png.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 26676 content-type: image/png diff --git a/tests/expected/auto/rgba_u8_3_1_1.png.headers b/tests/expected/auto/rgba_u8_3_1_1.png.headers index 58ee0ef1a..da330a665 100644 --- a/tests/expected/auto/rgba_u8_3_1_1.png.headers +++ b/tests/expected/auto/rgba_u8_3_1_1.png.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 294 content-type: image/png diff --git a/tests/expected/auto/rgba_u8_nodata.json.headers b/tests/expected/auto/rgba_u8_nodata.json.headers index 866b22e82..4c5a243e3 100644 --- a/tests/expected/auto/rgba_u8_nodata.json.headers +++ b/tests/expected/auto/rgba_u8_nodata.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"69-f7ZqJowAoXXdyYxlTrEd6g==" diff --git a/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers b/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers index a9d6a97c7..367bc9d7d 100644 --- a/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_nodata_0_0_0.png.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 4183 content-type: image/png diff --git a/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers b/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers index e985ea85c..7379f9081 100644 --- a/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers +++ b/tests/expected/auto/rgba_u8_nodata_1_0_0.png.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 12297 content-type: image/png diff --git a/tests/expected/auto/table_source.json.headers b/tests/expected/auto/table_source.json.headers index 2c1ba6959..2da589faa 100644 --- a/tests/expected/auto/table_source.json.headers +++ b/tests/expected/auto/table_source.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"e6-fbngdmxBgtzD9fRcDwLqMA==" diff --git a/tests/expected/auto/tbl_0_0_0.pbf.headers b/tests/expected/auto/tbl_0_0_0.pbf.headers index 9daec480b..d25a9c019 100644 --- a/tests/expected/auto/tbl_0_0_0.pbf.headers +++ b/tests/expected/auto/tbl_0_0_0.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 643 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_12_3673_1911.pbf.headers b/tests/expected/auto/tbl_12_3673_1911.pbf.headers index cdc2b507e..b0002e8a4 100644 --- a/tests/expected/auto/tbl_12_3673_1911.pbf.headers +++ b/tests/expected/auto/tbl_12_3673_1911.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 166 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_13_7346_3822.pbf.headers b/tests/expected/auto/tbl_13_7346_3822.pbf.headers index fbe1c3ced..51261abb3 100644 --- a/tests/expected/auto/tbl_13_7346_3822.pbf.headers +++ b/tests/expected/auto/tbl_13_7346_3822.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 171 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_14_14692_7645.pbf.headers b/tests/expected/auto/tbl_14_14692_7645.pbf.headers index 578493900..4a4279a0b 100644 --- a/tests/expected/auto/tbl_14_14692_7645.pbf.headers +++ b/tests/expected/auto/tbl_14_14692_7645.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 178 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_17_117542_61161.pbf.headers b/tests/expected/auto/tbl_17_117542_61161.pbf.headers index 4b5941d5a..af77188e9 100644 --- a/tests/expected/auto/tbl_17_117542_61161.pbf.headers +++ b/tests/expected/auto/tbl_17_117542_61161.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 182 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_18_235085_122323.pbf.headers b/tests/expected/auto/tbl_18_235085_122323.pbf.headers index d3482eab7..53e4f5359 100644 --- a/tests/expected/auto/tbl_18_235085_122323.pbf.headers +++ b/tests/expected/auto/tbl_18_235085_122323.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 181 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_6_57_29.pbf.headers b/tests/expected/auto/tbl_6_57_29.pbf.headers index d805c4aa0..bb64cef77 100644 --- a/tests/expected/auto/tbl_6_57_29.pbf.headers +++ b/tests/expected/auto/tbl_6_57_29.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 138 content-type: application/x-protobuf diff --git a/tests/expected/auto/tbl_comment.json.headers b/tests/expected/auto/tbl_comment.json.headers index 65d887177..8e3e93972 100644 --- a/tests/expected/auto/tbl_comment.json.headers +++ b/tests/expected/auto/tbl_comment.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"136-lHzPvh-7gSnjgJnd-2ctzQ==" diff --git a/tests/expected/auto/webp2_1_0_0.png.headers b/tests/expected/auto/webp2_1_0_0.png.headers index a48276c20..8eca48cfd 100644 --- a/tests/expected/auto/webp2_1_0_0.png.headers +++ b/tests/expected/auto/webp2_1_0_0.png.headers @@ -1,4 +1,3 @@ - content-length: 10658 content-type: image/webp etag: "13022905490801985056512160688182263905" diff --git a/tests/expected/auto_mini/catalog_auto.json.headers b/tests/expected/auto_mini/catalog_auto.json.headers index 7e8c0fcce..d21c50839 100644 --- a/tests/expected/auto_mini/catalog_auto.json.headers +++ b/tests/expected/auto_mini/catalog_auto.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"64--8bak7FikheiRgT6G8MIRA==" diff --git a/tests/expected/configured/catalog_cfg.json.headers b/tests/expected/configured/catalog_cfg.json.headers index be617045a..0ecb26978 100644 --- a/tests/expected/configured/catalog_cfg.json.headers +++ b/tests/expected/configured/catalog_cfg.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"6d0--TWMcf3UiYDIiN5FPR_n2g==" diff --git a/tests/expected/configured/cmp.json.headers b/tests/expected/configured/cmp.json.headers index 208c2a29b..2a150798b 100644 --- a/tests/expected/configured/cmp.json.headers +++ b/tests/expected/configured/cmp.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"188-1_yQANTYBHv0kaBoGJCqKQ==" diff --git a/tests/expected/configured/cmp_0_0_0.pbf.headers b/tests/expected/configured/cmp_0_0_0.pbf.headers index 69f2958af..2a625c0bd 100644 --- a/tests/expected/configured/cmp_0_0_0.pbf.headers +++ b/tests/expected/configured/cmp_0_0_0.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 576 content-type: application/x-protobuf diff --git a/tests/expected/configured/fnc2_0_0_0.pbf.headers b/tests/expected/configured/fnc2_0_0_0.pbf.headers index 8c563d68f..5828a802e 100644 --- a/tests/expected/configured/fnc2_0_0_0.pbf.headers +++ b/tests/expected/configured/fnc2_0_0_0.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 551 content-type: application/x-protobuf diff --git a/tests/expected/configured/fnc_0_0_0.pbf.headers b/tests/expected/configured/fnc_0_0_0.pbf.headers index 41a508047..d2c86077a 100644 --- a/tests/expected/configured/fnc_0_0_0.pbf.headers +++ b/tests/expected/configured/fnc_0_0_0.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 546 content-type: application/x-protobuf diff --git a/tests/expected/configured/fnc_comment_cfg.json.headers b/tests/expected/configured/fnc_comment_cfg.json.headers index 69724b8f8..a0e39c305 100644 --- a/tests/expected/configured/fnc_comment_cfg.json.headers +++ b/tests/expected/configured/fnc_comment_cfg.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"f8-Q_61CSCILe6RIhIWzTvf_Q==" diff --git a/tests/expected/configured/font_1.pbf.headers b/tests/expected/configured/font_1.pbf.headers index ece92af43..2ca7325ff 100644 --- a/tests/expected/configured/font_1.pbf.headers +++ b/tests/expected/configured/font_1.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/x-protobuf etag: W/"130b6-leolMlz39eG1OisHJXWcdA==" diff --git a/tests/expected/configured/font_2.pbf.headers b/tests/expected/configured/font_2.pbf.headers index badd78604..94ea48934 100644 --- a/tests/expected/configured/font_2.pbf.headers +++ b/tests/expected/configured/font_2.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/x-protobuf etag: W/"13762-12Po9LfxnAVc5cwSQZI0Bg==" diff --git a/tests/expected/configured/font_3.pbf.headers b/tests/expected/configured/font_3.pbf.headers index badd78604..94ea48934 100644 --- a/tests/expected/configured/font_3.pbf.headers +++ b/tests/expected/configured/font_3.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/x-protobuf etag: W/"13762-12Po9LfxnAVc5cwSQZI0Bg==" diff --git a/tests/expected/configured/pmt2_0_0_0.png.headers b/tests/expected/configured/pmt2_0_0_0.png.headers index 58259a270..7178577a0 100644 --- a/tests/expected/configured/pmt2_0_0_0.png.headers +++ b/tests/expected/configured/pmt2_0_0_0.png.headers @@ -1,4 +1,3 @@ - content-length: 11586 content-type: image/webp etag: "319069140686520200453324848169489853378" diff --git a/tests/expected/configured/pmt_0_0_0.png.headers b/tests/expected/configured/pmt_0_0_0.png.headers index 96933e062..ca3b40b80 100644 --- a/tests/expected/configured/pmt_0_0_0.png.headers +++ b/tests/expected/configured/pmt_0_0_0.png.headers @@ -1,4 +1,3 @@ - content-length: 18404 content-type: image/png etag: "109615783887137800409763947330857640552" diff --git a/tests/expected/configured/sdf_spr_cmp.json.headers b/tests/expected/configured/sdf_spr_cmp.json.headers index 30ac90bf0..803efb201 100644 --- a/tests/expected/configured/sdf_spr_cmp.json.headers +++ b/tests/expected/configured/sdf_spr_cmp.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"131-s95fKXweVNtXjVXT7l2oHQ==" diff --git a/tests/expected/configured/sdf_spr_cmp.png.headers b/tests/expected/configured/sdf_spr_cmp.png.headers index f30e5d5b7..b515e6eac 100644 --- a/tests/expected/configured/sdf_spr_cmp.png.headers +++ b/tests/expected/configured/sdf_spr_cmp.png.headers @@ -1,4 +1,3 @@ - content-length: 945 content-type: image/png etag: W/"3b1-qyh8Bev0R5Z2fLn83grsPw==" diff --git a/tests/expected/configured/sdf_spr_cmp_2.json.headers b/tests/expected/configured/sdf_spr_cmp_2.json.headers index bf233f534..efa538335 100644 --- a/tests/expected/configured/sdf_spr_cmp_2.json.headers +++ b/tests/expected/configured/sdf_spr_cmp_2.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"131-Bjo8hrRKhIMOqK572ImviA==" diff --git a/tests/expected/configured/sdf_spr_cmp_2.png.headers b/tests/expected/configured/sdf_spr_cmp_2.png.headers index 71bbcc5c5..58e57f8c7 100644 --- a/tests/expected/configured/sdf_spr_cmp_2.png.headers +++ b/tests/expected/configured/sdf_spr_cmp_2.png.headers @@ -1,4 +1,3 @@ - content-length: 1863 content-type: image/png etag: W/"747-uY5SJOmaA0qgk9TmFw54yw==" diff --git a/tests/expected/configured/sdf_spr_mysrc.json.headers b/tests/expected/configured/sdf_spr_mysrc.json.headers index 97aab9e19..184e8b2a2 100644 --- a/tests/expected/configured/sdf_spr_mysrc.json.headers +++ b/tests/expected/configured/sdf_spr_mysrc.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"4a-2PGKEoQ361taeiNAqH1Hyg==" diff --git a/tests/expected/configured/sdf_spr_mysrc.png.headers b/tests/expected/configured/sdf_spr_mysrc.png.headers index 9b6e5670e..e3af18d38 100644 --- a/tests/expected/configured/sdf_spr_mysrc.png.headers +++ b/tests/expected/configured/sdf_spr_mysrc.png.headers @@ -1,4 +1,3 @@ - content-length: 675 content-type: image/png etag: W/"2a3-ju0zA7FbYbeaqMM_Qg1Iqg==" diff --git a/tests/expected/configured/sdf_spr_src1.json.headers b/tests/expected/configured/sdf_spr_src1.json.headers index d4819c272..4cb8d015a 100644 --- a/tests/expected/configured/sdf_spr_src1.json.headers +++ b/tests/expected/configured/sdf_spr_src1.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"e7-7ie4iOXghXewTq4x5OKswg==" diff --git a/tests/expected/configured/sdf_spr_src1.png.headers b/tests/expected/configured/sdf_spr_src1.png.headers index 1908b89f0..10b72ab21 100644 --- a/tests/expected/configured/sdf_spr_src1.png.headers +++ b/tests/expected/configured/sdf_spr_src1.png.headers @@ -1,4 +1,3 @@ - content-length: 900 content-type: image/png etag: W/"384-m3iOSdyLqIRO-1uu8tzIcw==" diff --git a/tests/expected/configured/sdf_spr_src1_.json.headers b/tests/expected/configured/sdf_spr_src1_.json.headers index 12030b751..7e81daf57 100644 --- a/tests/expected/configured/sdf_spr_src1_.json.headers +++ b/tests/expected/configured/sdf_spr_src1_.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"e6-IQNV1VuPkoio6olHvfumfg==" diff --git a/tests/expected/configured/sdf_spr_src1_.png.headers b/tests/expected/configured/sdf_spr_src1_.png.headers index 109ebad00..778e00063 100644 --- a/tests/expected/configured/sdf_spr_src1_.png.headers +++ b/tests/expected/configured/sdf_spr_src1_.png.headers @@ -1,4 +1,3 @@ - content-length: 1699 content-type: image/png etag: W/"6a3-NdhmitklvJKSk_7phaxquw==" diff --git a/tests/expected/configured/spr_cmp.json.headers b/tests/expected/configured/spr_cmp.json.headers index 1c51bdd97..098415e06 100644 --- a/tests/expected/configured/spr_cmp.json.headers +++ b/tests/expected/configured/spr_cmp.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"106-vO62JYCAMTM5xx97X6qw9w==" diff --git a/tests/expected/configured/spr_cmp.png.headers b/tests/expected/configured/spr_cmp.png.headers index 45036ab3e..78b76896d 100644 --- a/tests/expected/configured/spr_cmp.png.headers +++ b/tests/expected/configured/spr_cmp.png.headers @@ -1,4 +1,3 @@ - content-length: 785 content-type: image/png etag: W/"311-u7NFzzhK-VdpDMgsJ-SjaQ==" diff --git a/tests/expected/configured/spr_cmp_2x.json.headers b/tests/expected/configured/spr_cmp_2x.json.headers index 05e6369dd..6a33a9ff5 100644 --- a/tests/expected/configured/spr_cmp_2x.json.headers +++ b/tests/expected/configured/spr_cmp_2x.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"106-XvyGBYKI-CKbS-pEdF5nAA==" diff --git a/tests/expected/configured/spr_cmp_2x.png.headers b/tests/expected/configured/spr_cmp_2x.png.headers index 6a4ac1ba3..dacce3df0 100644 --- a/tests/expected/configured/spr_cmp_2x.png.headers +++ b/tests/expected/configured/spr_cmp_2x.png.headers @@ -1,4 +1,3 @@ - content-length: 1755 content-type: image/png etag: W/"6db-u2j270aTAu4aTfvEwg9iRA==" diff --git a/tests/expected/configured/spr_mysrc.json.headers b/tests/expected/configured/spr_mysrc.json.headers index dcd63510d..40d619610 100644 --- a/tests/expected/configured/spr_mysrc.json.headers +++ b/tests/expected/configured/spr_mysrc.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"3f-dujM8uKY4xAnuwDPF3cq1Q==" diff --git a/tests/expected/configured/spr_mysrc.png.headers b/tests/expected/configured/spr_mysrc.png.headers index 653ce5182..87f8ae923 100644 --- a/tests/expected/configured/spr_mysrc.png.headers +++ b/tests/expected/configured/spr_mysrc.png.headers @@ -1,4 +1,3 @@ - content-length: 189 content-type: image/png etag: W/"bd-wRhFV2xvMbGQOJkdFxyNyg==" diff --git a/tests/expected/configured/spr_mysrc_2x.json.headers b/tests/expected/configured/spr_mysrc_2x.json.headers index 032e85fab..f3941102a 100644 --- a/tests/expected/configured/spr_mysrc_2x.json.headers +++ b/tests/expected/configured/spr_mysrc_2x.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"3f-ZlKlqxoAjk_BolpJ5vQ4Gw==" diff --git a/tests/expected/configured/spr_mysrc_2x.png.headers b/tests/expected/configured/spr_mysrc_2x.png.headers index 70a2891b0..b7a97e72c 100644 --- a/tests/expected/configured/spr_mysrc_2x.png.headers +++ b/tests/expected/configured/spr_mysrc_2x.png.headers @@ -1,4 +1,3 @@ - content-length: 344 content-type: image/png etag: W/"158-ZSYNoWLreCScoiFLriGD6Q==" diff --git a/tests/expected/configured/spr_src1.json.headers b/tests/expected/configured/spr_src1.json.headers index 7647dea03..5c05feeef 100644 --- a/tests/expected/configured/spr_src1.json.headers +++ b/tests/expected/configured/spr_src1.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"c6-hm38ksFM7OrTdjwShP2iRA==" diff --git a/tests/expected/configured/spr_src1.png.headers b/tests/expected/configured/spr_src1.png.headers index 66f810031..b9c2f2466 100644 --- a/tests/expected/configured/spr_src1.png.headers +++ b/tests/expected/configured/spr_src1.png.headers @@ -1,4 +1,3 @@ - content-length: 758 content-type: image/png etag: W/"2f6-PZaBSgIOiVTrPDnRiX0hYg==" diff --git a/tests/expected/configured/spr_src1_2x.json.headers b/tests/expected/configured/spr_src1_2x.json.headers index 1bc110bf3..66334744c 100644 --- a/tests/expected/configured/spr_src1_2x.json.headers +++ b/tests/expected/configured/spr_src1_2x.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"c6-4pCj2iqngMtQ6k9bdvO19w==" diff --git a/tests/expected/configured/spr_src1_2x.png.headers b/tests/expected/configured/spr_src1_2x.png.headers index 90528146c..c937a4cf4 100644 --- a/tests/expected/configured/spr_src1_2x.png.headers +++ b/tests/expected/configured/spr_src1_2x.png.headers @@ -1,4 +1,3 @@ - content-length: 1699 content-type: image/png etag: W/"6a3--J74WPHes8bNZx23r-Ru4w==" diff --git a/tests/expected/configured/style_maplibre_demo.1.json.headers b/tests/expected/configured/style_maplibre_demo.1.json.headers index 56a38504e..143805f94 100644 --- a/tests/expected/configured/style_maplibre_demo.1.json.headers +++ b/tests/expected/configured/style_maplibre_demo.1.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"1050-ndsWDIE-ORCeUzSbybafug==" diff --git a/tests/expected/configured/style_maplibre_demo.json.headers b/tests/expected/configured/style_maplibre_demo.json.headers index 56a38504e..143805f94 100644 --- a/tests/expected/configured/style_maplibre_demo.json.headers +++ b/tests/expected/configured/style_maplibre_demo.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"1050-ndsWDIE-ORCeUzSbybafug==" diff --git a/tests/expected/configured/style_src2_maptiler_basic.1.json.headers b/tests/expected/configured/style_src2_maptiler_basic.1.json.headers index 4c570e54c..9425e37ae 100644 --- a/tests/expected/configured/style_src2_maptiler_basic.1.json.headers +++ b/tests/expected/configured/style_src2_maptiler_basic.1.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"3f5c-az1eu_MvSQst-tUfz9ePoQ==" diff --git a/tests/expected/configured/style_src2_maptiler_basic.json.headers b/tests/expected/configured/style_src2_maptiler_basic.json.headers index 4c570e54c..9425e37ae 100644 --- a/tests/expected/configured/style_src2_maptiler_basic.json.headers +++ b/tests/expected/configured/style_src2_maptiler_basic.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"3f5c-az1eu_MvSQst-tUfz9ePoQ==" diff --git a/tests/expected/configured/tbl_0_0_0.pbf.headers b/tests/expected/configured/tbl_0_0_0.pbf.headers index 9daec480b..d25a9c019 100644 --- a/tests/expected/configured/tbl_0_0_0.pbf.headers +++ b/tests/expected/configured/tbl_0_0_0.pbf.headers @@ -1,4 +1,3 @@ - content-encoding: gzip content-length: 643 content-type: application/x-protobuf diff --git a/tests/expected/configured/tbl_comment_cfg.json.headers b/tests/expected/configured/tbl_comment_cfg.json.headers index 65d887177..8e3e93972 100644 --- a/tests/expected/configured/tbl_comment_cfg.json.headers +++ b/tests/expected/configured/tbl_comment_cfg.json.headers @@ -1,4 +1,3 @@ - content-encoding: br content-type: application/json etag: W/"136-lHzPvh-7gSnjgJnd-2ctzQ==" diff --git a/tests/test.sh b/tests/test.sh index 142ef9520..c3abb9912 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -617,7 +617,9 @@ rm -rf "$TEST_TEMP_DIR" find -type f -name "*.headers" -exec sed --regexp-extended --in-place "s/date: .+//" {} \; # this is defintively not an header find -type f -name "*.headers" -exec sed --regexp-extended --in-place "s/HTTP.+//" {} \; -# sorting is arbitrairy -find . -type f -name "*.headers" -exec sh -c "awk '{gsub(/^[ \t]+/, \"\"); gsub(/[ \t]+$/, \"\"); if (length) print}' '$1' | sort > '$1.tmp' && mv '$1.tmp' '$1'" sh {} \; +# sorting is arbitrairy => need to sort and remove empty lines +find . -type f -name "*.headers" -exec sh -c ' + awk '"'"'{gsub(/^[ \t]+/, ""); gsub(/[ \t]+$/, ""); if (length) print}'"'"' "$1" | sort > "$1.tmp" && mv "$1.tmp" "$1" +' sh {} \; >&2 echo "All integration tests have passed" From 1904e9ee9df07b6a4963d2afb707a65f761c5b02 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Wed, 21 May 2025 15:00:02 +0200 Subject: [PATCH 17/24] fix line ending diff --- tests/expected/auto/catalog_auto.json.headers | 2 +- tests/expected/configured/catalog_cfg.json.headers | 2 +- tests/test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/expected/auto/catalog_auto.json.headers b/tests/expected/auto/catalog_auto.json.headers index ceea41815..94ad9e543 100644 --- a/tests/expected/auto/catalog_auto.json.headers +++ b/tests/expected/auto/catalog_auto.json.headers @@ -1,5 +1,5 @@ content-encoding: br content-type: application/json -etag: W/"1829-ytE9MUN-OpjkOpCrgVrLsg==" +etag: W/"1829-b7Vop4VAB90PW_GLtQiiYw==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/catalog_cfg.json.headers b/tests/expected/configured/catalog_cfg.json.headers index 0ecb26978..ceb7f2309 100644 --- a/tests/expected/configured/catalog_cfg.json.headers +++ b/tests/expected/configured/catalog_cfg.json.headers @@ -1,5 +1,5 @@ content-encoding: br content-type: application/json -etag: W/"6d0--TWMcf3UiYDIiN5FPR_n2g==" +etag: W/"6d0-8UEAA8bHB61Ye4Z3Y7cRmw==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/test.sh b/tests/test.sh index c3abb9912..c8d8d96e0 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -619,7 +619,7 @@ find -type f -name "*.headers" -exec sed --regexp-extended --in-place "s/date: . find -type f -name "*.headers" -exec sed --regexp-extended --in-place "s/HTTP.+//" {} \; # sorting is arbitrairy => need to sort and remove empty lines find . -type f -name "*.headers" -exec sh -c ' - awk '"'"'{gsub(/^[ \t]+/, ""); gsub(/[ \t]+$/, ""); if (length) print}'"'"' "$1" | sort > "$1.tmp" && mv "$1.tmp" "$1" + tr -d "\r" < "$1" | awk '"'"'{gsub(/^[[:space:]]+/, ""); gsub(/[[:space:]]+$/, ""); if ($0 != "") print}'"'"' | sort > "$1.tmp" && mv "$1.tmp" "$1" ' sh {} \; >&2 echo "All integration tests have passed" From d6b2177e4219f145c1313e6e14a52d9359702854 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Wed, 21 May 2025 15:03:58 +0200 Subject: [PATCH 18/24] remove etag handling for catalogs where the etags are not actually stable --- martin/src/srv/server.rs | 1 - tests/expected/auto/catalog_auto.json.headers | 1 - tests/expected/auto_mini/catalog_auto.json.headers | 1 - tests/expected/configured/catalog_cfg.json.headers | 1 - 4 files changed, 4 deletions(-) diff --git a/martin/src/srv/server.rs b/martin/src/srv/server.rs index 37e80f665..c57c9af3f 100644 --- a/martin/src/srv/server.rs +++ b/martin/src/srv/server.rs @@ -106,7 +106,6 @@ async fn get_health() -> impl Responder { "/catalog", method = "GET", method = "HEAD", - wrap = "Etag", wrap = "Compress::default()" )] #[allow(clippy::unused_async)] diff --git a/tests/expected/auto/catalog_auto.json.headers b/tests/expected/auto/catalog_auto.json.headers index 94ad9e543..4be482306 100644 --- a/tests/expected/auto/catalog_auto.json.headers +++ b/tests/expected/auto/catalog_auto.json.headers @@ -1,5 +1,4 @@ content-encoding: br content-type: application/json -etag: W/"1829-b7Vop4VAB90PW_GLtQiiYw==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/auto_mini/catalog_auto.json.headers b/tests/expected/auto_mini/catalog_auto.json.headers index d21c50839..4be482306 100644 --- a/tests/expected/auto_mini/catalog_auto.json.headers +++ b/tests/expected/auto_mini/catalog_auto.json.headers @@ -1,5 +1,4 @@ content-encoding: br content-type: application/json -etag: W/"64--8bak7FikheiRgT6G8MIRA==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers diff --git a/tests/expected/configured/catalog_cfg.json.headers b/tests/expected/configured/catalog_cfg.json.headers index ceb7f2309..4be482306 100644 --- a/tests/expected/configured/catalog_cfg.json.headers +++ b/tests/expected/configured/catalog_cfg.json.headers @@ -1,5 +1,4 @@ content-encoding: br content-type: application/json -etag: W/"6d0-8UEAA8bHB61Ye4Z3Y7cRmw==" transfer-encoding: chunked vary: accept-encoding, Origin, Access-Control-Request-Method, Access-Control-Request-Headers From a26a0dce3646f66df8244a0f799d2aed4cc56179 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Wed, 21 May 2025 15:07:19 +0200 Subject: [PATCH 19/24] fix formatting --- martin/src/srv/server.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/martin/src/srv/server.rs b/martin/src/srv/server.rs index c57c9af3f..2f6edc024 100644 --- a/martin/src/srv/server.rs +++ b/martin/src/srv/server.rs @@ -24,7 +24,6 @@ use crate::source::TileCatalog; use crate::srv::config::{KEEP_ALIVE_DEFAULT, LISTEN_ADDRESSES_DEFAULT, SrvConfig}; use crate::srv::tiles::get_tile; use crate::srv::tiles_info::get_source_info; -use actix_middleware_etag::Etag; #[cfg(feature = "webui")] mod webui { From 9711cf75549b006b00f747a9ff8e13813a3ca2ec Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Sun, 25 May 2025 15:46:48 +0200 Subject: [PATCH 20/24] move header dumping near header dumping --- tests/test.sh | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/tests/test.sh b/tests/test.sh index c8d8d96e0..81cec3cfa 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -95,6 +95,7 @@ test_jsn() { echo "Testing $(basename "$FILENAME") from $URL" # jq before 1.6 had a different float->int behavior, so trying to make it consistent in all $CURL --dump-header "$FILENAME.headers" "$URL" | jq --sort-keys -e 'walk(if type == "number" then .+0.0 else . end)' > "$FILENAME" + clean_headers_dump "$FILENAME.headers" } test_pbf() { @@ -103,6 +104,7 @@ test_pbf() { echo "Testing $(basename "$FILENAME") from $URL" $CURL --dump-header "$FILENAME.headers" "$URL" > "$FILENAME" + clean_headers_dump "$FILENAME.headers" if [[ $OSTYPE == linux* ]]; then ./tests/fixtures/vtzero-check "$FILENAME" @@ -120,6 +122,7 @@ test_png() { echo "Testing $(basename "$FILENAME") from $URL" $CURL --dump-header "$FILENAME.headers" "$URL" > "$FILENAME" + clean_headers_dump "$FILENAME.headers" if [[ $OSTYPE == linux* ]]; then file "$FILENAME" > "$FILENAME.txt" @@ -137,6 +140,7 @@ test_font() { echo "Testing $(basename "$FILENAME") from $URL" $CURL --dump-header "$FILENAME.headers" "$URL" > "$FILENAME" + clean_headers_dump "$FILENAME.headers" } # Delete a line from a file $1 that matches parameter $2 @@ -148,6 +152,21 @@ remove_line() { mv "${FILE}.tmp" "${FILE}" } +# if we dump a headers file via curl, this is otherwise not reproducible +clean_headers_dump() { + FILE="$1" + # now we need to strip the date header as it is undeterministic + sed --regexp-extended --in-place "s/date: .+//" "$FILE" + # the http version is not an "header" that we want to assert + sed --regexp-extended --in-place "s/HTTP.+//" "$FILE" + # need to remove entirely empty lines, \r\n and leading/trailing whitespace + # sorting is arbitrairy => sort here + tr --squeeze-repeats '\r\n' '\n' < "$FILE" | sort > "$FILE.tmp" + mv "$FILE.tmp" "$FILE" + # we need to remove the first line as squeezing repeat newlines makes does not remove this empty line + sed --in-place '1d' "$FILE" +} + test_log_has_str() { LOG_FILE="$1" EXPECTED_TEXT="$2" @@ -613,13 +632,4 @@ fi rm -rf "$TEST_TEMP_DIR" -# now we need to strip the date header as it is undeterministic -find -type f -name "*.headers" -exec sed --regexp-extended --in-place "s/date: .+//" {} \; -# this is defintively not an header -find -type f -name "*.headers" -exec sed --regexp-extended --in-place "s/HTTP.+//" {} \; -# sorting is arbitrairy => need to sort and remove empty lines -find . -type f -name "*.headers" -exec sh -c ' - tr -d "\r" < "$1" | awk '"'"'{gsub(/^[[:space:]]+/, ""); gsub(/[[:space:]]+$/, ""); if ($0 != "") print}'"'"' | sort > "$1.tmp" && mv "$1.tmp" "$1" -' sh {} \; - >&2 echo "All integration tests have passed" From 86c5952f741214dfedcd721891b95e2d83794e71 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Sun, 25 May 2025 15:55:45 +0200 Subject: [PATCH 21/24] fix CI disagreeing if `pmt2_0_0_0.png.txt` has alpha --- tests/expected/configured/pmt2_0_0_0.png.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/expected/configured/pmt2_0_0_0.png.txt b/tests/expected/configured/pmt2_0_0_0.png.txt index ef543da60..1587845ee 100644 --- a/tests/expected/configured/pmt2_0_0_0.png.txt +++ b/tests/expected/configured/pmt2_0_0_0.png.txt @@ -1 +1 @@ -tests/output/configured/pmt2_0_0_0.png: RIFF (little-endian) data, Web/P image, with alpha, 511+1x511+1 +tests/output/configured/pmt2_0_0_0.png: RIFF (little-endian) data, Web/P image From 5c2aa2d19835573400923bdcebc18dbc1efc3541 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Sun, 25 May 2025 15:50:29 +0200 Subject: [PATCH 22/24] remove testing file --- .tmp | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .tmp diff --git a/.tmp b/.tmp deleted file mode 100644 index e69de29bb..000000000 From e18d4a54ac02e4d78751cd2565e9f6a243e2be40 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Mon, 26 May 2025 23:47:16 +0200 Subject: [PATCH 23/24] add an expected file for auto/s3_1_0_0.pbf.headers --- tests/expected/auto/s3_1_0_0.pbf.headers | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 tests/expected/auto/s3_1_0_0.pbf.headers diff --git a/tests/expected/auto/s3_1_0_0.pbf.headers b/tests/expected/auto/s3_1_0_0.pbf.headers new file mode 100644 index 000000000..15c59f589 --- /dev/null +++ b/tests/expected/auto/s3_1_0_0.pbf.headers @@ -0,0 +1,5 @@ +content-encoding: gzip +content-length: 215320 +content-type: application/x-protobuf +etag: "90893510347658296425614750151245557991" +vary: Origin, Access-Control-Request-Method, Access-Control-Request-Headers From bfe3baf893e1c5f7900a4d7b192d4da4702f5d85 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Mon, 26 May 2025 23:56:35 +0200 Subject: [PATCH 24/24] apply `just fmt` and some of the suggestions of `just clippy` (the ones not in https://github.com/maplibre/martin/pull/1856) --- martin/src/srv/fonts.rs | 3 ++- martin/src/srv/sprites.rs | 3 ++- martin/src/srv/styles.rs | 3 +-- martin/src/srv/tiles_info.rs | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/martin/src/srv/fonts.rs b/martin/src/srv/fonts.rs index a9b3f43ca..d184b9bb9 100644 --- a/martin/src/srv/fonts.rs +++ b/martin/src/srv/fonts.rs @@ -2,8 +2,9 @@ use std::string::ToString; use actix_middleware_etag::Etag; use actix_web::error::{ErrorBadRequest, ErrorNotFound}; +use actix_web::middleware::Compress; use actix_web::web::{Data, Path}; -use actix_web::{HttpResponse, Result as ActixResult, middleware::Compress, route}; +use actix_web::{HttpResponse, Result as ActixResult, route}; use serde::Deserialize; use crate::fonts::{FontError, FontSources}; diff --git a/martin/src/srv/sprites.rs b/martin/src/srv/sprites.rs index 7a450b594..2eb5598e9 100644 --- a/martin/src/srv/sprites.rs +++ b/martin/src/srv/sprites.rs @@ -3,8 +3,9 @@ use std::string::ToString; use actix_middleware_etag::Etag; use actix_web::error::ErrorNotFound; use actix_web::http::header::ContentType; +use actix_web::middleware::Compress; use actix_web::web::{Data, Path}; -use actix_web::{HttpResponse, Result as ActixResult, middleware::Compress, route}; +use actix_web::{HttpResponse, Result as ActixResult, route}; use spreet::Spritesheet; use crate::sprites::{SpriteError, SpriteSources}; diff --git a/martin/src/srv/styles.rs b/martin/src/srv/styles.rs index 854a4a5a3..e4b987486 100644 --- a/martin/src/srv/styles.rs +++ b/martin/src/srv/styles.rs @@ -1,9 +1,8 @@ -use crate::styles::StyleSources; use actix_middleware_etag::Etag; use actix_web::http::header::ContentType; use actix_web::middleware::Compress; use actix_web::web::{Data, Path}; -use actix_web::{HttpResponse, middleware, route}; +use actix_web::{HttpResponse, route}; use log::error; use serde::Deserialize; diff --git a/martin/src/srv/tiles_info.rs b/martin/src/srv/tiles_info.rs index a9e655046..17e4c2560 100644 --- a/martin/src/srv/tiles_info.rs +++ b/martin/src/srv/tiles_info.rs @@ -3,8 +3,9 @@ use std::string::ToString; use actix_middleware_etag::Etag; use actix_web::error::ErrorBadRequest; use actix_web::http::Uri; +use actix_web::middleware::Compress; use actix_web::web::{Data, Path}; -use actix_web::{HttpRequest, HttpResponse, Result as ActixResult, middleware::Compress, route}; +use actix_web::{HttpRequest, HttpResponse, Result as ActixResult, route}; use itertools::Itertools as _; use serde::Deserialize; use tilejson::{TileJSON, tilejson};