Mercurial > hg > nginx
comparison src/http/modules/ngx_http_memcached_module.c @ 1787:a37fe5ceacc4
inherit $memached_key index and memcached_pass upstream inside "if" block
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 27 Dec 2007 14:18:34 +0000 |
parents | 13f8dec720b5 |
children | f10228d7ea06 |
comparison
equal
deleted
inserted
replaced
1786:adca43955f79 | 1787:a37fe5ceacc4 |
---|---|
522 * conf->upstream.next_upstream = 0; | 522 * conf->upstream.next_upstream = 0; |
523 * conf->upstream.temp_path = NULL; | 523 * conf->upstream.temp_path = NULL; |
524 * conf->upstream.schema = { 0, NULL }; | 524 * conf->upstream.schema = { 0, NULL }; |
525 * conf->upstream.uri = { 0, NULL }; | 525 * conf->upstream.uri = { 0, NULL }; |
526 * conf->upstream.location = NULL; | 526 * conf->upstream.location = NULL; |
527 * | |
528 * conf->index = 0; | |
529 */ | 527 */ |
530 | 528 |
531 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; | 529 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; |
532 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; | 530 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; |
533 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; | 531 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; |
546 conf->upstream.intercept_errors = 1; | 544 conf->upstream.intercept_errors = 1; |
547 conf->upstream.intercept_404 = 1; | 545 conf->upstream.intercept_404 = 1; |
548 conf->upstream.pass_request_headers = 0; | 546 conf->upstream.pass_request_headers = 0; |
549 conf->upstream.pass_request_body = 0; | 547 conf->upstream.pass_request_body = 0; |
550 | 548 |
549 conf->index = NGX_CONF_UNSET; | |
550 | |
551 return conf; | 551 return conf; |
552 } | 552 } |
553 | 553 |
554 | 554 |
555 static char * | 555 static char * |
580 if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) { | 580 if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) { |
581 conf->upstream.next_upstream = NGX_CONF_BITMASK_SET | 581 conf->upstream.next_upstream = NGX_CONF_BITMASK_SET |
582 |NGX_HTTP_UPSTREAM_FT_OFF; | 582 |NGX_HTTP_UPSTREAM_FT_OFF; |
583 } | 583 } |
584 | 584 |
585 if (conf->upstream.upstream == NULL) { | |
586 conf->upstream.upstream = prev->upstream.upstream; | |
587 conf->upstream.schema = prev->upstream.schema; | |
588 } | |
589 | |
590 if (conf->index == NGX_CONF_UNSET) { | |
591 conf->index = prev->index; | |
592 } | |
593 | |
585 return NGX_CONF_OK; | 594 return NGX_CONF_OK; |
586 } | 595 } |
587 | 596 |
588 | 597 |
589 static char * | 598 static char * |