Skip to content

Commit a984849

Browse files
authored
Update structs for nginx 1.19.4+ and 1.21.0+ (#41)
1 parent 4746629 commit a984849

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

ngx_cache_purge_module.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -540,9 +540,9 @@ typedef struct {
540540
ngx_array_t *cookie_domains;
541541
ngx_array_t *cookie_paths;
542542
# endif /* nginx_version >= 1001015 */
543-
# if (nginx_version >= 1019003)
543+
# if (nginx_version >= 1019003)
544544
ngx_array_t *cookie_flags;
545-
#endif /* nginx_version >= 1019003 */
545+
# endif /* nginx_version >= 1019003 */
546546
# if (nginx_version < 1007008)
547547
ngx_str_t body_source;
548548
# endif /* nginx_version < 1007008 */
@@ -579,11 +579,14 @@ typedef struct {
579579
ngx_str_t ssl_trusted_certificate;
580580
ngx_str_t ssl_crl;
581581
# endif /* nginx_version >= 1007000 */
582-
# if (nginx_version >= 1007008)
582+
# if ((nginx_version >= 1007008) && (nginx_version < 1021000))
583583
ngx_str_t ssl_certificate;
584584
ngx_str_t ssl_certificate_key;
585585
ngx_array_t *ssl_passwords;
586-
# endif /* nginx_version >= 1007008 */
586+
# endif /* nginx_version >= 1007008 && nginx_version < 1021000 */
587+
# if (nginx_version >= 1019004)
588+
ngx_array_t *ssl_conf_commands;
589+
# endif /*nginx_version >= 1019004 */
587590
# endif
588591
} ngx_http_proxy_loc_conf_t;
589592

@@ -1052,11 +1055,14 @@ typedef struct {
10521055
ngx_str_t ssl_trusted_certificate;
10531056
ngx_str_t ssl_crl;
10541057
# endif /* nginx_version >= 1007000 */
1055-
# if (nginx_version >= 1007008)
1058+
# if ((nginx_version >= 1007008) && (nginx_version < 1021000))
10561059
ngx_str_t ssl_certificate;
10571060
ngx_str_t ssl_certificate_key;
10581061
ngx_array_t *ssl_passwords;
1059-
# endif /* nginx_version >= 1007008 */
1062+
# endif /* nginx_version >= 1007008 && nginx_version < 1021000 */
1063+
# if (nginx_version >= 1019004)
1064+
ngx_array_t *ssl_conf_commands;
1065+
# endif /*nginx_version >= 1019004 */
10601066
# endif
10611067
} ngx_http_uwsgi_loc_conf_t;
10621068

0 commit comments

Comments
 (0)