Mercurial > hg > nginx-vendor-current
annotate src/os/unix/ngx_solaris_init.c @ 656:9d21dad0b5a1 NGINX_1_1_12
nginx 1.1.12
*) Change: a "proxy_pass" directive without URI part now uses changed
URI after redirection with the "error_page" directive;
Thanks to Lanshun Zhou.
*) Feature: the "proxy/fastcgi/scgi/uwsgi_cache_lock",
"proxy/fastcgi/scgi/uwsgi_cache_lock_timeout" directives.
*) Feature: the "pcre_jit" directive.
*) Feature: the "if" SSI command supports captures in regular
expressions.
*) Bugfix: the "if" SSI command did not work inside the "block" command.
*) Bugfix: the "limit_conn_log_level" and "limit_req_log_level"
directives might not work.
*) Bugfix: the "limit_rate" directive did not allow to use full
throughput, even if limit value was very high.
*) Bugfix: the "sendfile_max_chunk" directive did not work, if the
"limit_rate" directive was used.
*) Bugfix: a "proxy_pass" directive without URI part always used
original request URI if variables were used.
*) Bugfix: a "proxy_pass" directive without URI part might use original
request after redirection with the "try_files" directive;
Thanks to Lanshun Zhou.
*) Bugfix: in the ngx_http_scgi_module.
*) Bugfix: in the ngx_http_mp4_module.
*) Bugfix: nginx could not be built on Solaris; the bug had appeared in
1.1.9.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 26 Dec 2011 00:00:00 +0400 |
parents | 583decdb82a4 |
children | d0f7a625f27c |
rev | line source |
---|---|
0 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
7 #include <ngx_config.h> | |
8 #include <ngx_core.h> | |
9 | |
10 | |
11 char ngx_solaris_sysname[20]; | |
12 char ngx_solaris_release[10]; | |
13 char ngx_solaris_version[50]; | |
14 | |
15 | |
88 | 16 static ngx_os_io_t ngx_solaris_io = { |
0 | 17 ngx_unix_recv, |
18 ngx_readv_chain, | |
354 | 19 ngx_udp_unix_recv, |
0 | 20 ngx_unix_send, |
18 | 21 #if (NGX_HAVE_SENDFILE) |
0 | 22 ngx_solaris_sendfilev_chain, |
23 NGX_IO_SENDFILE | |
24 #else | |
25 ngx_writev_chain, | |
26 0 | |
27 #endif | |
28 }; | |
29 | |
30 | |
88 | 31 ngx_int_t |
32 ngx_os_specific_init(ngx_log_t *log) | |
0 | 33 { |
34 if (sysinfo(SI_SYSNAME, ngx_solaris_sysname, sizeof(ngx_solaris_sysname)) | |
88 | 35 == -1) |
0 | 36 { |
37 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, | |
38 "sysinfo(SI_SYSNAME) failed"); | |
39 return NGX_ERROR; | |
40 } | |
41 | |
42 if (sysinfo(SI_RELEASE, ngx_solaris_release, sizeof(ngx_solaris_release)) | |
88 | 43 == -1) |
0 | 44 { |
45 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, | |
46 "sysinfo(SI_RELEASE) failed"); | |
47 return NGX_ERROR; | |
48 } | |
49 | |
50 if (sysinfo(SI_VERSION, ngx_solaris_version, sizeof(ngx_solaris_version)) | |
88 | 51 == -1) |
0 | 52 { |
53 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, | |
54 "sysinfo(SI_SYSNAME) failed"); | |
55 return NGX_ERROR; | |
56 } | |
57 | |
2 | 58 |
88 | 59 ngx_os_io = ngx_solaris_io; |
60 | |
340 | 61 return NGX_OK; |
0 | 62 } |
63 | |
64 | |
88 | 65 void |
66 ngx_os_specific_status(ngx_log_t *log) | |
0 | 67 { |
68 | |
80 | 69 ngx_log_error(NGX_LOG_NOTICE, log, 0, "OS: %s %s", |
0 | 70 ngx_solaris_sysname, ngx_solaris_release); |
71 | |
80 | 72 ngx_log_error(NGX_LOG_NOTICE, log, 0, "version: %s", |
0 | 73 ngx_solaris_version); |
74 } |