Mercurial > hg > nginx-quic
comparison src/http/modules/ngx_http_uwsgi_module.c @ 8452:bdd4d89370a7
Changed complex value slots to use NGX_CONF_UNSET_PTR.
With this change, it is now possible to use ngx_conf_merge_ptr_value()
to merge complex values. This change follows much earlier changes in
ngx_conf_merge_ptr_value() and ngx_conf_set_str_array_slot()
in 1452:cd586e963db0 (0.6.10) and 1701:40d004d95d88 (0.6.22), and the
change in ngx_conf_set_keyval_slot() (7728:485dba3e2a01, 1.19.4).
To preserve compatibility with existing 3rd party modules, both NULL
and NGX_CONF_UNSET_PTR are accepted for now.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 06 May 2021 02:22:03 +0300 |
parents | 7ce28b4cc57e |
children | 3ab8e1e2f0f7 |
comparison
equal
deleted
inserted
replaced
8451:f2ff291bbdac | 8452:bdd4d89370a7 |
---|---|
1507 | 1507 |
1508 conf->upstream.intercept_errors = NGX_CONF_UNSET; | 1508 conf->upstream.intercept_errors = NGX_CONF_UNSET; |
1509 | 1509 |
1510 #if (NGX_HTTP_SSL) | 1510 #if (NGX_HTTP_SSL) |
1511 conf->upstream.ssl_session_reuse = NGX_CONF_UNSET; | 1511 conf->upstream.ssl_session_reuse = NGX_CONF_UNSET; |
1512 conf->upstream.ssl_name = NGX_CONF_UNSET_PTR; | |
1512 conf->upstream.ssl_server_name = NGX_CONF_UNSET; | 1513 conf->upstream.ssl_server_name = NGX_CONF_UNSET; |
1513 conf->upstream.ssl_verify = NGX_CONF_UNSET; | 1514 conf->upstream.ssl_verify = NGX_CONF_UNSET; |
1514 conf->ssl_verify_depth = NGX_CONF_UNSET_UINT; | 1515 conf->ssl_verify_depth = NGX_CONF_UNSET_UINT; |
1515 conf->ssl_passwords = NGX_CONF_UNSET_PTR; | 1516 conf->ssl_passwords = NGX_CONF_UNSET_PTR; |
1516 conf->ssl_conf_commands = NGX_CONF_UNSET_PTR; | 1517 conf->ssl_conf_commands = NGX_CONF_UNSET_PTR; |
1822 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); | 1823 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); |
1823 | 1824 |
1824 ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, | 1825 ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, |
1825 "DEFAULT"); | 1826 "DEFAULT"); |
1826 | 1827 |
1827 if (conf->upstream.ssl_name == NULL) { | 1828 ngx_conf_merge_ptr_value(conf->upstream.ssl_name, |
1828 conf->upstream.ssl_name = prev->upstream.ssl_name; | 1829 prev->upstream.ssl_name, NULL); |
1829 } | |
1830 | |
1831 ngx_conf_merge_value(conf->upstream.ssl_server_name, | 1830 ngx_conf_merge_value(conf->upstream.ssl_server_name, |
1832 prev->upstream.ssl_server_name, 0); | 1831 prev->upstream.ssl_server_name, 0); |
1833 ngx_conf_merge_value(conf->upstream.ssl_verify, | 1832 ngx_conf_merge_value(conf->upstream.ssl_verify, |
1834 prev->upstream.ssl_verify, 0); | 1833 prev->upstream.ssl_verify, 0); |
1835 ngx_conf_merge_uint_value(conf->ssl_verify_depth, | 1834 ngx_conf_merge_uint_value(conf->ssl_verify_depth, |