Mercurial > hg > nginx

changeset 5152:2ff51c32791f stable-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 29 Mar 2013 17:15:34 +0000
parents 3c4f32ebef31
children 0dbe5eaa2388
files src/http/modules/ngx_http_ssl_module.c src/http/ngx_http_file_cache.c
diffstat 2 files changed, 0 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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;
                 }
 
--- 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++;