summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2013-03-29 17:15:34 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2013-03-29 17:15:34 +0000
commit0e7eb773de932c4c6ab4d517e489d217b2fc0387 (patch)
treea15cf789762eea5c8365299390f2590c198dfe07
parentf3dcfd8c20b2aeb3cf3c483bfb0a37dc66003a94 (diff)
downloadnginx-0e7eb773de932c4c6ab4d517e489d217b2fc0387.tar.gz
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.
-rw-r--r--src/http/modules/ngx_http_ssl_module.c1
-rw-r--r--src/http/ngx_http_file_cache.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index ea8a0da32..336018236 100644
--- 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 *cf, ngx_command_t *cmd, void *conf)
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
index bd6cebadd..6d94c5034 100644
--- 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 *cf, ngx_command_t *cmd, void *conf)
p = (u_char *) ngx_strchr(name.data, ':');
if (p) {
- *p = '\0';
-
name.len = p - name.data;
p++;