diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-05-18 16:31:31 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2009-05-18 16:31:31 +0000 |
| commit | 1b271801c3e9b1464a24c2ab3e104b7b2fb530a6 (patch) | |
| tree | e423ec50dc241033b07fd1954f3c6aea1681bc3c /src/core | |
| parent | 5e44792c14ec6bf5b0ea68717d754ba0105ae529 (diff) | |
| download | nginx-0.6.37.tar.gz | |
Changes with nginx 0.6.37 18 May 2009v0.6.37
*) Feature: Microsoft specific "AUTH LOGIN with User Name" mode support
in mail proxy server.
Thanks to Maxim Dounin.
*) Bugfix: nginx could not be built on platforms different from i386,
amd64, sparc, and ppc; the bug had appeared in 0.6.36.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.c | 4 | ||||
| -rw-r--r-- | src/core/nginx.h | 4 | ||||
| -rw-r--r-- | src/core/ngx_cpuinfo.c | 8 | ||||
| -rw-r--r-- | src/core/ngx_log.c | 4 | ||||
| -rw-r--r-- | src/core/ngx_log.h | 2 |
5 files changed, 12 insertions, 10 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index 28624db76..05d26eefc 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -261,8 +261,8 @@ main(int argc, char *const *argv) } #endif - p = "configure arguments: " NGX_CONFIGURE CRLF; - n = sizeof("configure arguments :" NGX_CONFIGURE CRLF) - 1; + p = "configure arguments:" NGX_CONFIGURE CRLF; + n = sizeof("configure arguments:" NGX_CONFIGURE CRLF) - 1; if (ngx_write_fd(ngx_stderr_fileno, p, n) != n) { return 1; diff --git a/src/core/nginx.h b/src/core/nginx.h index ba51d4ac3..14458bf9f 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,8 +8,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 006036 -#define NGINX_VERSION "0.6.36" +#define nginx_version 006037 +#define NGINX_VERSION "0.6.37" #define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VAR "NGINX" diff --git a/src/core/ngx_cpuinfo.c b/src/core/ngx_cpuinfo.c index 68eb094c9..39a6b05a0 100644 --- a/src/core/ngx_cpuinfo.c +++ b/src/core/ngx_cpuinfo.c @@ -72,7 +72,7 @@ void ngx_cpuinfo(void) { u_char *vendor; - uint32_t vbuf[5], cpu[4]; + uint32_t vbuf[5], cpu[4], model; vbuf[0] = 0; vbuf[1] = 0; @@ -103,8 +103,10 @@ ngx_cpuinfo(void) case 6: ngx_cacheline_size = 32; - if ((cpu[0] & 0xf0) >= 0xd0) { - /* Intel Core */ + model = ((cpu[0] & 0xf0000) >> 8) | (cpu[0] & 0xf0); + + if (model >= 0xd0) { + /* Intel Core, Core 2, Atom */ ngx_cacheline_size = 64; } diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c index a9221db6e..6eab24ad7 100644 --- a/src/core/ngx_log.c +++ b/src/core/ngx_log.c @@ -184,9 +184,9 @@ ngx_log_debug_core(ngx_log_t *log, ngx_err_t err, const char *fmt, ...) void -ngx_log_abort(ngx_err_t err, const char *text) +ngx_log_abort(ngx_err_t err, const char *text, void *param) { - ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, err, text); + ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, err, text, param); } diff --git a/src/core/ngx_log.h b/src/core/ngx_log.h index 1fd1ad8ad..73de6fddc 100644 --- a/src/core/ngx_log.h +++ b/src/core/ngx_log.h @@ -198,7 +198,7 @@ void ngx_cdecl ngx_log_debug_core(ngx_log_t *log, ngx_err_t err, ngx_log_t *ngx_log_init(void); ngx_log_t *ngx_log_create_errlog(ngx_cycle_t *cycle, ngx_array_t *args); char *ngx_set_error_log_levels(ngx_conf_t *cf, ngx_log_t *log); -void ngx_log_abort(ngx_err_t err, const char *text); +void ngx_log_abort(ngx_err_t err, const char *text, void *param); extern ngx_module_t ngx_errlog_module; |