Skip to content

Commit a3055d1

Browse files
nginxkolbyjack
authored andcommitted
Changes with nginx 1.8.0 21 Apr 2015
*) 1.8.x stable branch.
1 parent 6612579 commit a3055d1

File tree

5 files changed

+32
-7
lines changed

5 files changed

+32
-7
lines changed

CHANGES

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11

2+
Changes with nginx 1.8.0 21 Apr 2015
3+
4+
*) 1.8.x stable branch.
5+
6+
27
Changes with nginx 1.7.12 07 Apr 2015
38

49
*) Feature: now the "tcp_nodelay" directive works with backend SSL

CHANGES.ru

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11

2+
Изменения в nginx 1.8.0 21.04.2015
3+
4+
*) Стабильная ветка 1.8.x.
5+
6+
27
Изменения в nginx 1.7.12 07.04.2015
38

49
*) Добавление: теперь директива tcp_nodelay работает для SSL-соединений

src/core/nginx.c

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -248,18 +248,30 @@ main(int argc, char *const *argv)
248248
}
249249

250250
if (ngx_show_configure) {
251-
ngx_write_stderr(
251+
252252
#ifdef NGX_COMPILER
253-
"built by " NGX_COMPILER NGX_LINEFEED
253+
ngx_write_stderr("built by " NGX_COMPILER NGX_LINEFEED);
254254
#endif
255+
255256
#if (NGX_SSL)
257+
if (SSLeay() == SSLEAY_VERSION_NUMBER) {
258+
ngx_write_stderr("built with " OPENSSL_VERSION_TEXT
259+
NGX_LINEFEED);
260+
} else {
261+
ngx_write_stderr("built with " OPENSSL_VERSION_TEXT
262+
" (running with ");
263+
ngx_write_stderr((char *) (uintptr_t)
264+
SSLeay_version(SSLEAY_VERSION));
265+
ngx_write_stderr(")" NGX_LINEFEED);
266+
}
256267
#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
257-
"TLS SNI support enabled" NGX_LINEFEED
268+
ngx_write_stderr("TLS SNI support enabled" NGX_LINEFEED);
258269
#else
259-
"TLS SNI support disabled" NGX_LINEFEED
270+
ngx_write_stderr("TLS SNI support disabled" NGX_LINEFEED);
260271
#endif
261272
#endif
262-
"configure arguments:" NGX_CONFIGURE NGX_LINEFEED);
273+
274+
ngx_write_stderr("configure arguments:" NGX_CONFIGURE NGX_LINEFEED);
263275
}
264276

265277
if (!ngx_test_config) {

src/core/nginx.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#define _NGINX_H_INCLUDED_
1010

1111

12-
#define nginx_version 1007012
13-
#define NGINX_VERSION "1.7.12"
12+
#define nginx_version 1008000
13+
#define NGINX_VERSION "1.8.0"
1414
#define NGINX_VER "nginx/" NGINX_VERSION
1515

1616
#ifdef NGX_BUILD

src/core/ngx_core.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
#define _NGX_CORE_H_INCLUDED_
1010

1111

12+
#include <ngx_config.h>
13+
14+
1215
typedef struct ngx_module_s ngx_module_t;
1316
typedef struct ngx_conf_s ngx_conf_t;
1417
typedef struct ngx_cycle_s ngx_cycle_t;

0 commit comments

Comments
 (0)