Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/nginx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,11 @@ env:

NGX_TEST_FILES: examples/t
NGX_TEST_GLOBALS_DYNAMIC: >-
load_module ${{ github.workspace }}/nginx/objs/ngx_http_async_module.so;
load_module ${{ github.workspace }}/nginx/objs/ngx_http_async_request_module.so;
load_module ${{ github.workspace }}/nginx/objs/ngx_http_awssigv4_module.so;
load_module ${{ github.workspace }}/nginx/objs/ngx_http_curl_module.so;
load_module ${{ github.workspace }}/nginx/objs/ngx_http_shared_dict_module.so;
load_module ${{ github.workspace }}/nginx/objs/ngx_http_subrequest_module.so;
load_module ${{ github.workspace }}/nginx/objs/ngx_http_upstream_custom_module.so;

OPENSSL_VERSION: '3.0.16'
Expand Down
33 changes: 32 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ targets = []
[dependencies]
allocator-api2 = { version = "0.4.0", default-features = false, features = ["fresh-rust"] }
async-task = { version = "4.7.1", optional = true }
futures-util = { version = "0.3", default-features = false }
lock_api = "0.4.13"
nginx-sys = { path = "nginx-sys", version = "0.5.0"}
pin-project-lite = { version = "0.2.16", optional = true }
Expand Down
14 changes: 12 additions & 2 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ autobins = false
build = "../build.rs"

[dependencies]
# allocator-api2 = { version = "0.4.0", default-features = false, features = ["fresh-rust"] }
# async-task = { version = "4.7.1" }
# futures = "0.3"
nginx-sys = { path = "../nginx-sys/", default-features = false }
ngx = { path = "../", default-features = false, features = ["std"] }

Expand Down Expand Up @@ -47,22 +50,29 @@ path = "upstream.rs"
crate-type = ["cdylib"]

[[example]]
name = "async"
path = "async.rs"
name = "async_request"
path = "async_request.rs"
crate-type = ["cdylib"]
required-features = ["async"]

[[example]]
name = "shared_dict"
path = "shared_dict.rs"
crate-type = ["cdylib"]

[[example]]
name = "subrequest"
path = "subrequest.rs"
crate-type = ["cdylib"]

[features]
default = ["export-modules", "ngx/vendored"]
# Generate `ngx_modules` table with module exports
# The exports table is required for building loadable modules with --crate-type cdylib
# outside of the NGINX buildsystem. However, cargo currently does not detect
# this configuration automatically.
# See https://github.com/rust-lang/rust/issues/20267
async = ["ngx/async"]
export-modules = []
linux = []

Expand Down
24 changes: 0 additions & 24 deletions examples/async.conf

This file was deleted.

243 changes: 0 additions & 243 deletions examples/async.rs

This file was deleted.

Loading
Loading