# HG changeset patch # User Piotr Sikora <[email protected]> # Date 1445649693 25200 # Fri Oct 23 18:21:33 2015 -0700 # Node ID 7435401242d6dbfdb4b42339ab2d96ed30d397a7 # Parent 8c25beef3cc4f7d3b88c8718bd24f02b1bc39d35 Configure: remove redundant NGX_OPENSSL.
Previously, both NGX_OPENSSL (used to init library and include headers) and NGX_SSL (used in rest of the source code) had to be defined. Signed-off-by: Piotr Sikora <[email protected]> diff -r 8c25beef3cc4 -r 7435401242d6 auto/lib/openssl/conf --- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -8,7 +8,6 @@ if [ $OPENSSL != NONE ]; then case "$CC" in cl | bcc32) - have=NGX_OPENSSL . auto/have have=NGX_SSL . auto/have CFLAGS="$CFLAGS -DNO_SYS_TYPES_H" @@ -25,7 +24,6 @@ if [ $OPENSSL != NONE ]; then ;; *) - have=NGX_OPENSSL . auto/have have=NGX_SSL . auto/have CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include" @@ -47,7 +45,7 @@ else OPENSSL=NO ngx_feature="OpenSSL library" - ngx_feature_name="NGX_OPENSSL" + ngx_feature_name="NGX_SSL" ngx_feature_run=no ngx_feature_incs="#include <openssl/ssl.h>" ngx_feature_path= @@ -104,7 +102,6 @@ else fi if [ $ngx_found = yes ]; then - have=NGX_SSL . auto/have CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL" OPENSSL=YES fi diff -r 8c25beef3cc4 -r 7435401242d6 src/core/nginx.c --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -218,7 +218,7 @@ main(int argc, char *const *argv) } /* STUB */ -#if (NGX_OPENSSL) +#if (NGX_SSL) ngx_ssl_init(log); #endif diff -r 8c25beef3cc4 -r 7435401242d6 src/core/ngx_core.h --- a/src/core/ngx_core.h +++ b/src/core/ngx_core.h @@ -77,7 +77,7 @@ typedef void (*ngx_connection_handler_pt #include <ngx_inet.h> #include <ngx_cycle.h> #include <ngx_resolver.h> -#if (NGX_OPENSSL) +#if (NGX_SSL) #include <ngx_event_openssl.h> #endif #include <ngx_process_cycle.h> _______________________________________________ nginx-devel mailing list [email protected] http://mailman.nginx.org/mailman/listinfo/nginx-devel
