diff options
| author | nginx <nginx@nginx.org> | 2015-04-21 14:43:54 +0000 |
|---|---|---|
| committer | Jon Kolb <kolbyjack@gmail.com> | 2015-04-21 14:43:54 +0000 |
| commit | a3055d1ce9febb3fa0c8d25ba406c7c473efba43 (patch) | |
| tree | 1da4f442ffe5bcb12df9c174f995e6cb3352d03e | |
| parent | 6612579e5a1459b05960a31bbbcfe4cd5afc319a (diff) | |
| download | nginx-1.8.tar.gz | |
*) 1.8.x stable branch.
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | CHANGES.ru | 5 | ||||
| -rw-r--r-- | src/core/nginx.c | 22 | ||||
| -rw-r--r-- | src/core/nginx.h | 4 | ||||
| -rw-r--r-- | src/core/ngx_core.h | 3 |
5 files changed, 32 insertions, 7 deletions
@@ -1,4 +1,9 @@ +Changes with nginx 1.8.0 21 Apr 2015 + + *) 1.8.x stable branch. + + Changes with nginx 1.7.12 07 Apr 2015 *) Feature: now the "tcp_nodelay" directive works with backend SSL diff --git a/CHANGES.ru b/CHANGES.ru index 08b641b62..b301f4b67 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,9 @@ +Изменения в nginx 1.8.0 21.04.2015 + + *) Стабильная ветка 1.8.x. + + Изменения в nginx 1.7.12 07.04.2015 *) Добавление: теперь директива tcp_nodelay работает для SSL-соединений diff --git a/src/core/nginx.c b/src/core/nginx.c index feb861a11..4702d2881 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -248,18 +248,30 @@ main(int argc, char *const *argv) } if (ngx_show_configure) { - ngx_write_stderr( + #ifdef NGX_COMPILER - "built by " NGX_COMPILER NGX_LINEFEED + ngx_write_stderr("built by " NGX_COMPILER NGX_LINEFEED); #endif + #if (NGX_SSL) + if (SSLeay() == SSLEAY_VERSION_NUMBER) { + ngx_write_stderr("built with " OPENSSL_VERSION_TEXT + NGX_LINEFEED); + } else { + ngx_write_stderr("built with " OPENSSL_VERSION_TEXT + " (running with "); + ngx_write_stderr((char *) (uintptr_t) + SSLeay_version(SSLEAY_VERSION)); + ngx_write_stderr(")" NGX_LINEFEED); + } #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME - "TLS SNI support enabled" NGX_LINEFEED + ngx_write_stderr("TLS SNI support enabled" NGX_LINEFEED); #else - "TLS SNI support disabled" NGX_LINEFEED + ngx_write_stderr("TLS SNI support disabled" NGX_LINEFEED); #endif #endif - "configure arguments:" NGX_CONFIGURE NGX_LINEFEED); + + ngx_write_stderr("configure arguments:" NGX_CONFIGURE NGX_LINEFEED); } if (!ngx_test_config) { diff --git a/src/core/nginx.h b/src/core/nginx.h index b350ef2dc..9f3a65631 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1007012 -#define NGINX_VERSION "1.7.12" +#define nginx_version 1008000 +#define NGINX_VERSION "1.8.0" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h index bc1d43f98..97100f6d0 100644 --- a/src/core/ngx_core.h +++ b/src/core/ngx_core.h @@ -9,6 +9,9 @@ #define _NGX_CORE_H_INCLUDED_ +#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; |