comparison src/core/ngx_string.c @ 4848:a0f1d53546d4 stable-1.2

Merge of r4778, r4782, r4783, r4824, r4830, r4834: minor fixes. *) Reorder checks in ngx_shared_memory_add() for more consistent error messages. *) Added "const" to ngx_memcpy() with NGX_MEMCPY_LIMIT defined. This fixes warning produced during compilation of the ngx_http_geoip_module due to const qualifier being discarded. *) Fixed possible use of old cached times if runtime went backwards. If ngx_time_sigsafe_update() updated only ngx_cached_err_log_time, and then clock was adjusted backwards, the cached_time[slot].sec might accidentally match current seconds on next ngx_time_update() call, resulting in various cached times not being updated. Fix is to clear the cached_time[slot].sec to explicitly mark cached times are stale and need updating. *) Radix tree preallocation fix. The preallocation size was calculated incorrectly and was always 8 due to sizeof(ngx_radix_tree_t) accidentally used instead of sizeof(ngx_radix_node_t). *) Fixed overflow if ngx_slab_alloc() is called with very big "size" argument. *) Write filter: replaced unneeded loop with one to free chains. Noted by Gabor Lekeny.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 24 Sep 2012 18:34:04 +0000
parents d3fc672fd6cc
children 670ceaba03d8
comparison
equal deleted inserted replaced
4847:0275f587e00b 4848:a0f1d53546d4
1825 1825
1826 1826
1827 #if (NGX_MEMCPY_LIMIT) 1827 #if (NGX_MEMCPY_LIMIT)
1828 1828
1829 void * 1829 void *
1830 ngx_memcpy(void *dst, void *src, size_t n) 1830 ngx_memcpy(void *dst, const void *src, size_t n)
1831 { 1831 {
1832 if (n > NGX_MEMCPY_LIMIT) { 1832 if (n > NGX_MEMCPY_LIMIT) {
1833 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, "memcpy %uz bytes", n); 1833 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, "memcpy %uz bytes", n);
1834 ngx_debug_point(); 1834 ngx_debug_point();
1835 } 1835 }