[nginx] svn commit: r5153 - in branches/stable-1.2: . src/http src/http/modules

[mdounin at mdounin.ru]

Author: mdounin
Date: 2013-03-29 17:15:34 +0000 (Fri, 29 Mar 2013)
New Revision: 5153
URL: http://trac.nginx.org/nginx/changeset/5153/nginx

Log:
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.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/http/modules/ngx_http_ssl_module.c
   branches/stable-1.2/src/http/ngx_http_file_cache.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2013-03-29 17:13:45 UTC (rev 5152)
+++ branches/stable-1.2	2013-03-29 17:15:34 UTC (rev 5153)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4969,4973-4974,4976-4994,4997,4999-5005,5011-5025,5027-5031,5066,5070-5071
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4969,4973-4974,4976-4994,4997,4999-5005,5011-5025,5027-5031,5066,5070-5071,5078
\ No newline at end of property
Modified: branches/stable-1.2/src/http/modules/ngx_http_ssl_module.c
===================================================================
--- branches/stable-1.2/src/http/modules/ngx_http_ssl_module.c	2013-03-29 17:13:45 UTC (rev 5152)
+++ branches/stable-1.2/src/http/modules/ngx_http_ssl_module.c	2013-03-29 17:15:34 UTC (rev 5153)
@@ -593,7 +593,6 @@
 
             for (j = sizeof("shared:") - 1; j < value[i].len; j++) {
                 if (value[i].data[j] == ':') {
-                    value[i].data[j] = '\0';
                     break;
                 }
 

Modified: branches/stable-1.2/src/http/ngx_http_file_cache.c
===================================================================
--- branches/stable-1.2/src/http/ngx_http_file_cache.c	2013-03-29 17:13:45 UTC (rev 5152)
+++ branches/stable-1.2/src/http/ngx_http_file_cache.c	2013-03-29 17:15:34 UTC (rev 5153)
@@ -1674,8 +1674,6 @@
             p = (u_char *) ngx_strchr(name.data, ':');
 
             if (p) {
-                *p = '\0';
-
                 name.len = p - name.data;
 
                 p++;