-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Not enable the rustls feature by default for sqlx
DB's like sqlite not need the tls feature with sqlx at all. When cross compiling e.g. to i586, ring is not supported and therefore the db-pool cannot be used because the rustls feature is turned on by default even though not needed.
- Loading branch information
Showing
20 changed files
with
86 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[package] | ||
name = "rocket_db_pools" | ||
version = "0.1.0" | ||
version = "0.2.1" | ||
authors = ["Sergio Benitez <[email protected]>", "Jeb Rosen <[email protected]>"] | ||
description = "Rocket async database pooling support" | ||
repository = "https://github.com/rwf2/Rocket/tree/master/contrib/db_pools" | ||
|
@@ -26,13 +26,23 @@ sqlx_postgres = ["sqlx", "sqlx/postgres", "log"] | |
sqlx_sqlite = ["sqlx", "sqlx/sqlite", "log"] | ||
sqlx_macros = ["sqlx/macros"] | ||
# diesel features | ||
diesel_postgres = ["diesel-async/postgres", "diesel-async/deadpool", "deadpool", "diesel"] | ||
diesel_mysql = ["diesel-async/mysql", "diesel-async/deadpool", "deadpool", "diesel"] | ||
diesel_postgres = [ | ||
"diesel-async/postgres", | ||
"diesel-async/deadpool", | ||
"deadpool", | ||
"diesel", | ||
] | ||
diesel_mysql = [ | ||
"diesel-async/mysql", | ||
"diesel-async/deadpool", | ||
"deadpool", | ||
"diesel", | ||
] | ||
# implicit features: mongodb | ||
|
||
[dependencies.rocket] | ||
path = "../../../core/lib" | ||
version = "0.6.0-dev" | ||
version = "0.5.2-dev" | ||
default-features = false | ||
|
||
[dependencies.rocket_db_pools_codegen] | ||
|
@@ -77,7 +87,7 @@ optional = true | |
[dependencies.sqlx] | ||
version = "0.8" | ||
default-features = false | ||
features = ["runtime-tokio-rustls"] | ||
features = ["runtime-tokio"] | ||
optional = true | ||
|
||
[dependencies.log] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[package] | ||
name = "rocket_codegen" | ||
version = "0.6.0-dev" | ||
version = "0.5.2-dev" | ||
authors = ["Sergio Benitez <[email protected]>"] | ||
description = "Procedural macros for the Rocket web framework." | ||
documentation = "https://api.rocket.rs/master/rocket_codegen/" | ||
|
@@ -21,17 +21,22 @@ proc-macro = true | |
[dependencies] | ||
indexmap = "2" | ||
quote = "1.0" | ||
syn = { version = "2.0", features = ["full", "visit", "visit-mut", "extra-traits"] } | ||
syn = { version = "2.0", features = [ | ||
"full", | ||
"visit", | ||
"visit-mut", | ||
"extra-traits", | ||
] } | ||
proc-macro2 = "1.0.60" | ||
devise = "0.4" | ||
rocket_http = { version = "0.6.0-dev", path = "../http/" } | ||
rocket_http = { version = "0.5.2-dev", path = "../http/" } | ||
unicode-xid = "0.2" | ||
version_check = "0.9" | ||
glob = "0.3" | ||
|
||
[dev-dependencies] | ||
rocket = { path = "../lib", features = ["json", "msgpack"] } | ||
time = { version = "0.3", features = ["macros"] } | ||
time = { version = "0.3", features = ["macros"] } | ||
pretty_assertions = "1" | ||
version_check = "0.9" | ||
trybuild = "1.0" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[package] | ||
name = "rocket_http" | ||
version = "0.6.0-dev" | ||
version = "0.5.2-dev" | ||
authors = ["Sergio Benitez <[email protected]>"] | ||
description = """ | ||
Types, traits, and parsers for HTTP requests, responses, and headers. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[package] | ||
name = "rocket" | ||
version = "0.6.0-dev" | ||
version = "0.5.2-dev" | ||
authors = ["Sergio Benitez <[email protected]>"] | ||
description = """ | ||
Web framework with a focus on usability, security, extensibility, and speed. | ||
|
@@ -33,33 +33,50 @@ uuid = ["uuid_", "rocket_http/uuid"] | |
tls = ["rustls", "tokio-rustls", "rustls-pemfile"] | ||
mtls = ["tls", "x509-parser"] | ||
tokio-macros = ["tokio/macros"] | ||
trace = ["tracing-subscriber", "tinyvec", "thread_local", "rustls?/logging", "tokio-rustls?/logging", "multer/log", "s2n-quic-h3?/tracing"] | ||
trace = [ | ||
"tracing-subscriber", | ||
"tinyvec", | ||
"thread_local", | ||
"rustls?/logging", | ||
"tokio-rustls?/logging", | ||
"multer/log", | ||
"s2n-quic-h3?/tracing", | ||
] | ||
|
||
[dependencies] | ||
# Optional serialization dependencies. | ||
serde_json = { version = "1.0.26", optional = true } | ||
rmp-serde = { version = "1", optional = true } | ||
uuid_ = { package = "uuid", version = "1", optional = true, features = ["serde"] } | ||
uuid_ = { package = "uuid", version = "1", optional = true, features = [ | ||
"serde", | ||
] } | ||
|
||
# Optional MTLS dependencies | ||
x509-parser = { version = "0.16", optional = true } | ||
|
||
# Hyper dependencies | ||
http = "1" | ||
bytes = "1.4" | ||
hyper = { version = "1.1", default-features = false, features = ["http1", "server"] } | ||
hyper-util = { version = "0.1.3", default-features = false, features = ["http1", "server", "tokio"] } | ||
hyper = { version = "1.1", default-features = false, features = [ | ||
"http1", | ||
"server", | ||
] } | ||
hyper-util = { version = "0.1.3", default-features = false, features = [ | ||
"http1", | ||
"server", | ||
"tokio", | ||
] } | ||
|
||
# Non-optional, core dependencies from here on out. | ||
yansi = { version = "1.0.1", features = ["detect-tty"] } | ||
num_cpus = "1.0" | ||
time = { version = "0.3", features = ["macros", "parsing"] } | ||
memchr = "2" # TODO: Use pear instead. | ||
memchr = "2" # TODO: Use pear instead. | ||
binascii = "0.1" | ||
ref-cast = "1.0" | ||
ref-swap = "0.1.2" | ||
parking_lot = "0.12" | ||
ubyte = {version = "0.10.2", features = ["serde"] } | ||
ubyte = { version = "0.10.2", features = ["serde"] } | ||
serde = { version = "1.0", features = ["derive"] } | ||
figment = { version = "0.10.17", features = ["toml", "env"] } | ||
rand = "0.8" | ||
|
@@ -76,7 +93,10 @@ futures = { version = "0.3.30", default-features = false, features = ["std"] } | |
state = "0.6" | ||
|
||
# tracing | ||
tracing = { version = "0.1.40", default-features = false, features = ["std", "attributes"] } | ||
tracing = { version = "0.1.40", default-features = false, features = [ | ||
"std", | ||
"attributes", | ||
] } | ||
tinyvec = { version = "1.6", optional = true, features = ["std", "rustc_1_57"] } | ||
thread_local = { version = "1.1", optional = true } | ||
|
||
|
@@ -87,17 +107,26 @@ default-features = false | |
features = ["fmt", "tracing-log", "parking_lot"] | ||
|
||
[dependencies.rocket_codegen] | ||
version = "0.6.0-dev" | ||
version = "0.5.2-dev" | ||
path = "../codegen" | ||
|
||
[dependencies.rocket_http] | ||
version = "0.6.0-dev" | ||
version = "0.5.2-dev" | ||
path = "../http" | ||
features = ["serde"] | ||
|
||
[dependencies.tokio] | ||
version = "1.35.1" | ||
features = ["rt-multi-thread", "net", "io-util", "fs", "time", "sync", "signal", "parking_lot"] | ||
features = [ | ||
"rt-multi-thread", | ||
"net", | ||
"io-util", | ||
"fs", | ||
"time", | ||
"sync", | ||
"signal", | ||
"parking_lot", | ||
] | ||
|
||
[dependencies.tokio-util] | ||
version = "0.7" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters