nginx-0.1.45-RELEASE importrelease-0.1.45

    *) Change: the "ssl_engine" directive was canceled in the
       ngx_http_ssl_module and now is introduced at global level.

    *) Bugfix: the responses with SSI subrequests did not transferred via
       SSL connection.

    *) Various bug fixes in the IMAP/POP3 proxy.

1 files changed, 23 insertions, 4 deletions

diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h
index 1f4e72cee..483852fd2 100644
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -65,8 +65,6 @@
 #define NGX_CONF_BLOCK_DONE  2
 #define NGX_CONF_FILE_DONE   3
 
-#define NGX_MODULE_V1        0, 0, 1, 0, 0
-
 #define NGX_CORE_MODULE      0x45524F43  /* "CORE" */
 #define NGX_CONF_MODULE      0x464E4F43  /* "CONF" */
 
@@ -99,21 +97,42 @@ struct ngx_open_file_s {
 };
 
 
+#define NGX_MODULE_V1          0, 0, 1, 0, 0, 0, 0
+#define NGX_MODULE_V1_PADDING  0, 0, 0, 0, 0, 0, 0, 0
+
 struct ngx_module_s {
     ngx_uint_t            ctx_index;
     ngx_uint_t            index;
     ngx_uint_t            version;
+
     ngx_uint_t            spare0;
     ngx_uint_t            spare1;
+    ngx_uint_t            spare2;
+    ngx_uint_t            spare3;
 
     void                 *ctx;
     ngx_command_t        *commands;
     ngx_uint_t            type;
+
+    ngx_int_t           (*init_master)(ngx_log_t *log);
+
     ngx_int_t           (*init_module)(ngx_cycle_t *cycle);
+
     ngx_int_t           (*init_process)(ngx_cycle_t *cycle);
-#if 0
     ngx_int_t           (*init_thread)(ngx_cycle_t *cycle);
-#endif
+    ngx_int_t           (*exit_thread)(ngx_cycle_t *cycle);
+    ngx_int_t           (*exit_process)(ngx_cycle_t *cycle);
+
+    ngx_int_t           (*exit_master)(ngx_cycle_t *cycle);
+
+    uintptr_t             spare_hook0;
+    uintptr_t             spare_hook1;
+    uintptr_t             spare_hook2;
+    uintptr_t             spare_hook3;
+    uintptr_t             spare_hook4;
+    uintptr_t             spare_hook5;
+    uintptr_t             spare_hook6;
+    uintptr_t             spare_hook7;
 };