# HG changeset patch # User Maxim Dounin # Date 1364577334 0 # Node ID 2ff51c32791f8b12a6f68890dfe91e969633ed76 # Parent 3c4f32ebef31577916a179ffb18463ffbe0fcbfb Merge of r5078: removed zero termination of shm zone names. It was added in r2717 and no longer needed since r2721, where the termination was added to ngx_shm_alloc() and ngx_init_zone_pool(). Since then it only corrupted error messages about invalid zones. diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c --- a/src/http/modules/ngx_http_ssl_module.c +++ b/src/http/modules/ngx_http_ssl_module.c @@ -593,7 +593,6 @@ ngx_http_ssl_session_cache(ngx_conf_t *c for (j = sizeof("shared:") - 1; j < value[i].len; j++) { if (value[i].data[j] == ':') { - value[i].data[j] = '\0'; break; } diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c --- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -1674,8 +1674,6 @@ ngx_http_file_cache_set_slot(ngx_conf_t p = (u_char *) ngx_strchr(name.data, ':'); if (p) { - *p = '\0'; - name.len = p - name.data; p++;