Check nginx' version if build's name starts with "nginx" #89
Conversation
|
✅ All required contributors have signed the F5 CLA for this PR. Thank you! |
osokin
changed the title
osokin
changed the title
|
I have hereby read the F5 CLA and agree to its terms |
bavshin-f5
left a comment
bavshin-f5
left a comment
There was a problem hiding this comment.
Sorry for delay, did not get a chance to review this before holidays.
|
|
||
| println!("cargo::rustc-check-cfg=cfg(ngx_ssl_cache)"); | ||
| println!("cargo::rustc-check-cfg=cfg(ngx_ssl_client_hello_cb)"); | ||
| println!("cargo::rerun-if-env-changed=DEP_NGINX_VER_BUILD"); |
There was a problem hiding this comment.
DEP_NGINX_BUILD or DEP_NGINX_VERSION, see https://docs.rs/nginx-sys/0.5.0/nginx_sys/#version-and-build-information.
These environment variables are generated from cargo::metadata={name}=... in the nginx-sys buildscript, using DEP_{package.links}_{name} format. I'm afraid it's too late to change the metadata names to match the macros in nginx.h.
| println!("cargo::rerun-if-env-changed=DEP_NGINX_VERSION_NUMBER"); | ||
| if let Ok(version) = env::var("DEP_NGINX_VERSION_NUMBER") { | ||
| let version: u64 = version.parse().unwrap(); | ||
| let build: String = env::var("DEP_NGINX_VER_BUILD").unwrap_or("any()".to_string()); |
There was a problem hiding this comment.
.unwrap_or_default().
I'd also prefer to save the check state as a bool and use in subsequent conditionals, allowing future version checks for different projects:
let is_nginx = env::var("DEP_NGINX_VERSION").unwrap_or_default().starts_with("nginx/");
if is_nginx && version >= ...There was a problem hiding this comment.
Does that requires an additional change in nginx-sys ?
There was a problem hiding this comment.
No, everything I suggested here works with the current release of nginx-sys.
There was a problem hiding this comment.
Alright, sounds good to me, thanks.
2 participants
Proposed changes
The proposed changes adopt the application make a check of nginx' version if the build's name start with "nginx".
These changes sponsored by: https://tipi.work/ - this's the part of the change, can't be removed.
Checklist
Before creating a PR, run through this checklist and mark each as complete:
README.mdand/orCHANGELOG.md).