aboutsummaryrefslogtreecommitdiff
path: root/src/bun.js/api/server.zig
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> 2022-10-26 21:04:12 -0700
committerGravatar Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> 2022-10-26 21:04:12 -0700
commit75b1ef1ef4ea6a35d134e30e3c9723f9161fa140 (patch)
tree6bc4530606abb9f152f091b4b5c9f5983c87f960 /src/bun.js/api/server.zig
parent830f83a44d2119846c0a64eb758f737b54a3e78b (diff)
downloadbun-75b1ef1ef4ea6a35d134e30e3c9723f9161fa140.tar.gz
bun-75b1ef1ef4ea6a35d134e30e3c9723f9161fa140.tar.zst
bun-75b1ef1ef4ea6a35d134e30e3c9723f9161fa140.zip
Make `"tls"` an explicit object we pass instead of implicit top-level options
cc @Electroid @colinhacks
Diffstat (limited to 'src/bun.js/api/server.zig')
-rw-r--r--src/bun.js/api/server.zig22
1 files changed, 18 insertions, 4 deletions
diff --git a/src/bun.js/api/server.zig b/src/bun.js/api/server.zig
index 73480a93d..c86edf534 100644
--- a/src/bun.js/api/server.zig
+++ b/src/bun.js/api/server.zig
@@ -329,12 +329,26 @@ pub const ServerConfig = struct {
args.development = dev.toBoolean();
}
- if (SSLConfig.fromJS(global, arguments, exception)) |ssl_config| {
- args.ssl_config = ssl_config;
+ if (arg.getTruthy("tls")) |tls| {
+ if (SSLConfig.inJS(global, tls, exception)) |ssl_config| {
+ args.ssl_config = ssl_config;
+ }
+
+ if (exception.* != null) {
+ return args;
+ }
}
- if (exception.* != null) {
- return args;
+ // @compatibility Bun v0.x - v0.2.1
+ // this used to be top-level, now it's "tls" object
+ if (args.ssl_config == null) {
+ if (SSLConfig.inJS(global, arg, exception)) |ssl_config| {
+ args.ssl_config = ssl_config;
+ }
+
+ if (exception.* != null) {
+ return args;
+ }
}
if (arg.getTruthy(global, "maxRequestBodySize")) |max_request_body_size| {