Modules compatibility: compatibility with NGX_HTTP_SSL.

With this change it is now possible to load modules compiled without
the "--with-http_ssl_module" configure option into nginx binary compiled
with it, and vice versa (if a module doesn't use ssl-specific functions),
assuming both use the "--with-compat" option.

3 files changed, 17 insertions, 15 deletions

diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index a49c5a656..1d3e3a3a1 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -147,7 +147,7 @@ struct ngx_connection_s {
     ngx_str_t           proxy_protocol_addr;
     in_port_t           proxy_protocol_port;
 
-#if (NGX_SSL)
+#if (NGX_SSL || NGX_COMPAT)
     ngx_ssl_connection_t  *ssl;
 #endif
 
diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h
index 8f8489fcb..2069373ba 100644
--- a/src/core/ngx_core.h
+++ b/src/core/ngx_core.h
@@ -12,19 +12,21 @@
 #include <ngx_config.h>
 
 
-typedef struct ngx_module_s       ngx_module_t;
-typedef struct ngx_conf_s         ngx_conf_t;
-typedef struct ngx_cycle_s        ngx_cycle_t;
-typedef struct ngx_pool_s         ngx_pool_t;
-typedef struct ngx_chain_s        ngx_chain_t;
-typedef struct ngx_log_s          ngx_log_t;
-typedef struct ngx_open_file_s    ngx_open_file_t;
-typedef struct ngx_command_s      ngx_command_t;
-typedef struct ngx_file_s         ngx_file_t;
-typedef struct ngx_event_s        ngx_event_t;
-typedef struct ngx_event_aio_s    ngx_event_aio_t;
-typedef struct ngx_connection_s   ngx_connection_t;
-typedef struct ngx_thread_task_s  ngx_thread_task_t;
+typedef struct ngx_module_s          ngx_module_t;
+typedef struct ngx_conf_s            ngx_conf_t;
+typedef struct ngx_cycle_s           ngx_cycle_t;
+typedef struct ngx_pool_s            ngx_pool_t;
+typedef struct ngx_chain_s           ngx_chain_t;
+typedef struct ngx_log_s             ngx_log_t;
+typedef struct ngx_open_file_s       ngx_open_file_t;
+typedef struct ngx_command_s         ngx_command_t;
+typedef struct ngx_file_s            ngx_file_t;
+typedef struct ngx_event_s           ngx_event_t;
+typedef struct ngx_event_aio_s       ngx_event_aio_t;
+typedef struct ngx_connection_s      ngx_connection_t;
+typedef struct ngx_thread_task_s     ngx_thread_task_t;
+typedef struct ngx_ssl_s             ngx_ssl_t;
+typedef struct ngx_ssl_connection_s  ngx_ssl_connection_t;
 
 typedef void (*ngx_event_handler_pt)(ngx_event_t *ev);
 typedef void (*ngx_connection_handler_pt)(ngx_connection_t *c);
diff --git a/src/core/ngx_module.h b/src/core/ngx_module.h
index 4d0db44c6..8cf3210e8 100644
--- a/src/core/ngx_module.h
+++ b/src/core/ngx_module.h
@@ -139,7 +139,7 @@
 #define NGX_MODULE_SIGNATURE_23  "0"
 #endif
 
-#if (NGX_HTTP_SSL)
+#if (NGX_HTTP_SSL || NGX_COMPAT)
 #define NGX_MODULE_SIGNATURE_24  "1"
 #else
 #define NGX_MODULE_SIGNATURE_24  "0"