mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-12 18:29:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

delete surplus upstream.schema field

Browse Source
This commit is contained in:
Igor Sysoev 2008-12-10 14:44:48 +00:00
parent d56088f4da
commit 73c3121e6a
4 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/http/modules/ngx_http_fastcgi_module.c
View File

@ -1681,7 +1681,6 @@ ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf)
* conf->upstream.next_upstream = 0;
* conf->upstream.temp_path = NULL;
* conf->upstream.hide_headers_hash = { NULL, 0 };
* conf->upstream.schema = { 0, NULL };
* conf->upstream.uri = { 0, NULL };
* conf->upstream.location = NULL;
* conf->upstream.store_lengths = NULL;
@ -1911,7 +1910,6 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->upstream.upstream == NULL) {
conf->upstream.upstream = prev->upstream.upstream;
conf->upstream.schema = prev->upstream.schema;
}
if (conf->fastcgi_lengths == NULL) {
@ -2107,16 +2105,13 @@ ngx_http_fastcgi_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_http_core_loc_conf_t *clcf;
ngx_http_script_compile_t sc;
if (flcf->upstream.schema.len) {
if (flcf->upstream.upstream || flcf->fastcgi_lengths) {
return "is duplicate";
}
clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
clcf->handler = ngx_http_fastcgi_handler;
flcf->upstream.schema.len = sizeof("fastcgi://") - 1;
flcf->upstream.schema.data = (u_char *) "fastcgi://";
value = cf->args->elts;
url = &value[1];

10
src/http/modules/ngx_http_memcached_module.c
View File

@ -183,7 +183,8 @@ ngx_http_memcached_handler(ngx_http_request_t *r)
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
u->schema = mlcf->upstream.schema;
u->schema.len = sizeof("memcached://") - 1;
u->schema.data = (u_char *) "memcached://";
u->peer.log = r->connection->log;
u->peer.log_error = NGX_ERROR_ERR;
@ -521,7 +522,6 @@ ngx_http_memcached_create_loc_conf(ngx_conf_t *cf)
* conf->upstream.bufs.num = 0;
* conf->upstream.next_upstream = 0;
* conf->upstream.temp_path = NULL;
* conf->upstream.schema = { 0, NULL };
* conf->upstream.uri = { 0, NULL };
* conf->upstream.location = NULL;
*/
@ -584,7 +584,6 @@ ngx_http_memcached_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->upstream.upstream == NULL) {
conf->upstream.upstream = prev->upstream.upstream;
conf->upstream.schema = prev->upstream.schema;
}
if (conf->index == NGX_CONF_UNSET) {
@ -604,7 +603,7 @@ ngx_http_memcached_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_url_t u;
ngx_http_core_loc_conf_t *clcf;
if (lcf->upstream.schema.len) {
if (lcf->upstream.upstream) {
return "is duplicate";
}
@ -620,9 +619,6 @@ ngx_http_memcached_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_ERROR;
}
lcf->upstream.schema.len = sizeof("memcached://") - 1;
lcf->upstream.schema.data = (u_char *) "memcached://";
clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
clcf->handler = ngx_http_memcached_handler;

12
src/http/modules/ngx_http_proxy_module.c
View File

@ -32,6 +32,7 @@ struct ngx_http_proxy_redirect_s {
typedef struct {
ngx_str_t schema;
ngx_str_t host_header;
ngx_str_t port;
ngx_str_t uri;
@ -480,7 +481,7 @@ ngx_http_proxy_handler(ngx_http_request_t *r)
if (plcf->proxy_lengths == 0) {
ctx->vars = plcf->vars;
u->schema = plcf->upstream.schema;
u->schema = plcf->vars.schema;
#if (NGX_HTTP_SSL)
u->ssl = (plcf->upstream.ssl != NULL);
#endif
@ -1631,7 +1632,6 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
* conf->upstream.next_upstream = 0;
* conf->upstream.temp_path = NULL;
* conf->upstream.hide_headers_hash = { NULL, 0 };
* conf->upstream.schema = { 0, NULL };
* conf->upstream.uri = { 0, NULL };
* conf->upstream.location = NULL;
* conf->upstream.store_lengths = NULL;
@ -1931,9 +1931,7 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->upstream.upstream == NULL) {
conf->upstream.upstream = prev->upstream.upstream;
conf->vars = prev->vars;
conf->upstream.schema = prev->upstream.schema;
}
@ -2216,7 +2214,7 @@ ngx_http_proxy_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_http_core_loc_conf_t *clcf;
ngx_http_script_compile_t sc;
if (plcf->upstream.schema.len) {
if (plcf->upstream.upstream || plcf->proxy_lengths) {
return "is duplicate";
}
@ -2296,8 +2294,8 @@ ngx_http_proxy_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_ERROR;
}
plcf->upstream.schema.len = add;
plcf->upstream.schema.data = url->data;
plcf->vars.schema.len = add;
plcf->vars.schema.data = url->data;
plcf->location = clcf->name;
clcf->handler = ngx_http_proxy_handler;

2
src/http/ngx_http_upstream.h
View File

@ -144,8 +144,6 @@ typedef struct {
ngx_array_t *hide_headers;
ngx_array_t *pass_headers;
ngx_str_t schema;
ngx_array_t *store_lengths;
ngx_array_t *store_values;