Skip to content

Commit 0780483

Browse files
committed
default compression: false
1 parent 5f27a55 commit 0780483

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

dropshot/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ impl Default for ConfigDropshot {
123123
default_request_body_max_bytes: 1024,
124124
default_handler_task_mode: HandlerTaskMode::Detached,
125125
log_headers: Default::default(),
126-
compression: true,
126+
compression: false,
127127
}
128128
}
129129
}

dropshot/tests/integration-tests/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ fn test_valid_config_all_settings() {
6666
default_request_body_max_bytes: 1048576,
6767
default_handler_task_mode: HandlerTaskMode::CancelOnDisconnect,
6868
log_headers: vec!["X-Forwarded-For".to_string()],
69-
compression: true,
69+
compression: false,
7070
},
7171
);
7272
}

dropshot/tests/integration-tests/gzip.rs

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,29 @@ use hyper::body::Frame;
1515
use hyper::{Request, Response};
1616
use serde::{Deserialize, Serialize};
1717

18-
use crate::common::{create_log_context, test_setup};
18+
use crate::common::create_log_context;
1919

2020
extern crate slog;
2121

22+
// Helper function for tests in this file
23+
// Since we're testing gzip compression, most tests need compression enabled
24+
fn test_setup(
25+
test_name: &str,
26+
api: ApiDescription<usize>,
27+
) -> dropshot::test_util::TestContext<usize> {
28+
let config =
29+
dropshot::ConfigDropshot { compression: true, ..Default::default() };
30+
let logctx = create_log_context(test_name);
31+
let log = logctx.log.new(slog::o!());
32+
dropshot::test_util::TestContext::new(
33+
api,
34+
0_usize,
35+
&config,
36+
Some(logctx),
37+
log,
38+
)
39+
}
40+
2241
// Helper functions for tests
2342

2443
/// Creates a request builder with gzip Accept-Encoding header

0 commit comments

Comments
 (0)