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.
This commit is contained in:
parent
50d44774c9
commit
f121aa193d
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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++;
|
||||
|
|
Loading…
Reference in New Issue