Mercurial > hg > nginx-vendor-current
annotate src/core/ngx_shmtx.c @ 592:09d5f308901f NGINX_0_8_48
nginx 0.8.48
*) Change: now the "server_name" directive default value is an empty
name "".
Thanks to Gena Makhomed.
*) Change: now the "server_name_in_redirect" directive default value is
"off".
*) Feature: the $geoip_dma_code, $geoip_area_code, and
$geoip_region_name variables.
Thanks to Christine McGonagle.
*) Bugfix: the "proxy_pass", "fastcgi_pass", "uwsgi_pass", and
"scgi_pass" directives were not inherited inside "limit_except"
blocks.
*) Bugfix: the "proxy_cache_min_uses", "fastcgi_cache_min_uses"
"uwsgi_cache_min_uses", and "scgi_cache_min_uses" directives did not
work; the bug had appeared in 0.8.46.
*) Bugfix: the "fastcgi_split_path_info" directive used incorrectly
captures, if only parts of an URI were captured.
Thanks to Yuriy Taraday and Frank Enderle.
*) Bugfix: the "rewrite" directive did not escape a ";" character
during copying from URI to query string.
Thanks to Daisuke Murase.
*) Bugfix: the ngx_http_image_filter_module closed a connection, if an
image was larger than "image_filter_buffer" size.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Tue, 03 Aug 2010 00:00:00 +0400 |
| parents | 3dbecd747fbb |
| children | d4da38525468 |
| rev | line source |
|---|---|
| 160 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4 */ | |
| 5 | |
| 6 | |
| 7 #include <ngx_config.h> | |
| 8 #include <ngx_core.h> | |
| 9 | |
| 10 | |
| 11 #if (NGX_HAVE_ATOMIC_OPS) | |
| 12 | |
| 13 | |
| 14 ngx_int_t | |
| 258 | 15 ngx_shmtx_create(ngx_shmtx_t *mtx, void *addr, u_char *name) |
| 160 | 16 { |
| 17 mtx->lock = addr; | |
| 18 | |
| 19 return NGX_OK; | |
| 20 } | |
| 21 | |
| 22 #else | |
| 23 | |
| 24 | |
| 25 ngx_int_t | |
| 258 | 26 ngx_shmtx_create(ngx_shmtx_t *mtx, void *addr, u_char *name) |
| 160 | 27 { |
| 28 if (mtx->name) { | |
| 29 | |
| 30 if (ngx_strcmp(name, mtx->name) == 0) { | |
| 31 mtx->name = name; | |
| 32 return NGX_OK; | |
| 33 } | |
| 34 | |
| 35 ngx_shmtx_destory(mtx); | |
| 36 } | |
| 37 | |
| 284 | 38 mtx->fd = ngx_open_file(name, NGX_FILE_RDWR, NGX_FILE_CREATE_OR_OPEN, |
| 39 NGX_FILE_DEFAULT_ACCESS); | |
| 160 | 40 |
| 41 if (mtx->fd == NGX_INVALID_FILE) { | |
| 258 | 42 ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno, |
| 160 | 43 ngx_open_file_n " \"%s\" failed", name); |
| 44 return NGX_ERROR; | |
| 45 } | |
| 46 | |
| 47 if (ngx_delete_file(name) == NGX_FILE_ERROR) { | |
| 258 | 48 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_errno, |
| 160 | 49 ngx_delete_file_n " \"%s\" failed", name); |
| 50 } | |
| 51 | |
| 52 mtx->name = name; | |
| 53 | |
| 54 return NGX_OK; | |
| 55 } | |
| 56 | |
| 57 | |
| 58 void | |
| 59 ngx_shmtx_destory(ngx_shmtx_t *mtx) | |
| 60 { | |
| 61 if (ngx_close_file(mtx->fd) == NGX_FILE_ERROR) { | |
| 258 | 62 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_errno, |
| 160 | 63 ngx_close_file_n " \"%s\" failed", mtx->name); |
| 64 } | |
| 65 } | |
| 66 | |
| 67 | |
| 68 #endif |