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

[mdounin at mdounin.ru]

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

Log:
Merge of r5109, r5128: removed unused prototype and macro.

*) Removed unused prototype of ngx_http_find_server_conf().
   This function prototype and its implementation was added in r90,
   but the implementation was removed in r97.

*) Removed unused ngx_http_clear_variable() macro.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/http/ngx_http.h
   branches/stable-1.2/src/http/ngx_http_variables.h

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2013-03-29 17:20:59 UTC (rev 5156)
+++ branches/stable-1.2	2013-03-29 17:23:36 UTC (rev 5157)

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,5078,5082-5083,5098
+/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,5082-5083,5098,5109,5128
\ No newline at end of property
Modified: branches/stable-1.2/src/http/ngx_http.h
===================================================================
--- branches/stable-1.2/src/http/ngx_http.h	2013-03-29 17:20:59 UTC (rev 5156)
+++ branches/stable-1.2/src/http/ngx_http.h	2013-03-29 17:23:36 UTC (rev 5157)
@@ -94,7 +94,6 @@
     ngx_str_t *args);
 
 
-ngx_int_t ngx_http_find_server_conf(ngx_http_request_t *r);
 void ngx_http_update_location_config(ngx_http_request_t *r);
 void ngx_http_handler(ngx_http_request_t *r);
 void ngx_http_run_posted_requests(ngx_connection_t *c);

Modified: branches/stable-1.2/src/http/ngx_http_variables.h
===================================================================
--- branches/stable-1.2/src/http/ngx_http_variables.h	2013-03-29 17:20:59 UTC (rev 5156)
+++ branches/stable-1.2/src/http/ngx_http_variables.h	2013-03-29 17:23:36 UTC (rev 5157)
@@ -57,9 +57,6 @@
     ngx_str_t *var, ngx_list_part_t *part, size_t prefix);
 
 
-#define ngx_http_clear_variable(r, index) r->variables0[index].text.data = NULL;
-
-
 #if (NGX_PCRE)
 
 typedef struct {