File tree Expand file tree Collapse file tree 5 files changed +32
-7
lines changed Expand file tree Collapse file tree 5 files changed +32
-7
lines changed Original file line number Diff line number Diff line change 1
1
2
+ Changes with nginx 1.8.0 21 Apr 2015
3
+
4
+ *) 1.8.x stable branch.
5
+
6
+
2
7
Changes with nginx 1.7.12 07 Apr 2015
3
8
4
9
*) Feature: now the "tcp_nodelay" directive works with backend SSL
Original file line number Diff line number Diff line change 1
1
2
+ Изменения в nginx 1.8 . 0 21.04 . 2015
3
+
4
+ *) Стабильная ветка 1.8 . x .
5
+
6
+
2
7
Изменения в nginx 1.7 . 12 07.04 . 2015
3
8
4
9
*) Добавление : теперь директива tcp_nodelay работает для SSL -соединений
Original file line number Diff line number Diff line change @@ -248,18 +248,30 @@ main(int argc, char *const *argv)
248
248
}
249
249
250
250
if (ngx_show_configure ) {
251
- ngx_write_stderr (
251
+
252
252
#ifdef NGX_COMPILER
253
- "built by " NGX_COMPILER NGX_LINEFEED
253
+ ngx_write_stderr ( "built by " NGX_COMPILER NGX_LINEFEED );
254
254
#endif
255
+
255
256
#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
+ }
256
267
#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
257
- "TLS SNI support enabled" NGX_LINEFEED
268
+ ngx_write_stderr ( "TLS SNI support enabled" NGX_LINEFEED );
258
269
#else
259
- "TLS SNI support disabled" NGX_LINEFEED
270
+ ngx_write_stderr ( "TLS SNI support disabled" NGX_LINEFEED );
260
271
#endif
261
272
#endif
262
- "configure arguments:" NGX_CONFIGURE NGX_LINEFEED );
273
+
274
+ ngx_write_stderr ("configure arguments:" NGX_CONFIGURE NGX_LINEFEED );
263
275
}
264
276
265
277
if (!ngx_test_config ) {
Original file line number Diff line number Diff line change 9
9
#define _NGINX_H_INCLUDED_
10
10
11
11
12
- #define nginx_version 1007012
13
- #define NGINX_VERSION "1.7.12 "
12
+ #define nginx_version 1008000
13
+ #define NGINX_VERSION "1.8.0 "
14
14
#define NGINX_VER "nginx/" NGINX_VERSION
15
15
16
16
#ifdef NGX_BUILD
Original file line number Diff line number Diff line change 9
9
#define _NGX_CORE_H_INCLUDED_
10
10
11
11
12
+ #include <ngx_config.h>
13
+
14
+
12
15
typedef struct ngx_module_s ngx_module_t ;
13
16
typedef struct ngx_conf_s ngx_conf_t ;
14
17
typedef struct ngx_cycle_s ngx_cycle_t ;
You can’t perform that action at this time.
0 commit comments