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.

diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h
index f152006a005e768376f3d648c0d57371f319059a..d278d8346e383342011a8614c3c1d4701ac3f281 100644 (file)
--- a/src/http/ngx_http.h
+++ b/src/http/ngx_http.h
@@ -94,7 +94,6 @@ void ngx_http_split_args(ngx_http_request_t *r, ngx_str_t *uri,
     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);

diff --git a/src/http/ngx_http_variables.h b/src/http/ngx_http_variables.h
index d2bb4db882bb50ed508a628a8a40cf1ffe92a48f..829fab31e647a196342cbd268fb87f3af688437d 100644 (file)
--- a/src/http/ngx_http_variables.h
+++ b/src/http/ngx_http_variables.h
@@ -57,9 +57,6 @@ ngx_int_t ngx_http_variable_unknown_header(ngx_http_variable_value_t *v,
     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 {