comparison src/http/modules/ngx_http_memcached_module.c @ 358:9121a0a91f47 NGINX_0_6_23

nginx 0.6.23 *) Change: the "off" parameter in the "ssl_session_cache" directive; now this is default parameter. *) Change: the "open_file_cache_retest" directive was renamed to the "open_file_cache_valid". *) Feature: the "open_file_cache_min_uses" directive. *) Feature: the ngx_http_gzip_static_module. *) Feature: the "gzip_disable" directive. *) Feature: the "memcached_pass" directive may be used inside the "if" block. *) Bugfix: a segmentation fault occurred in worker process, if the "memcached_pass" and "if" directives were used in the same location. *) Bugfix: if a "satisfy_any on" directive was used and not all access and auth modules directives were set, then other given access and auth directives were not tested; *) Bugfix: regex parameters in a "valid_referers" directive were not inherited from previous level. *) Bugfix: a "post_action" directive did run if a request was completed with 499 status code. *) Bugfix: optimization of 16K buffer usage in a SSL connection. Thanks to Ben Maurer. *) Bugfix: the STARTTLS in SMTP mode did not work. Thanks to Oleg Motienko. *) Bugfix: in HTTPS mode requests might fail with the "bad write retry" error; bug appeared in 0.5.13.
author Igor Sysoev <http://sysoev.ru>
date Thu, 27 Dec 2007 00:00:00 +0300
parents e10168d6e371
children babd3d9efb62
comparison
equal deleted inserted replaced
357:16d557a75356 358:9121a0a91f47
56 56
57 57
58 static ngx_command_t ngx_http_memcached_commands[] = { 58 static ngx_command_t ngx_http_memcached_commands[] = {
59 59
60 { ngx_string("memcached_pass"), 60 { ngx_string("memcached_pass"),
61 NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 61 NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
62 ngx_http_memcached_pass, 62 ngx_http_memcached_pass,
63 NGX_HTTP_LOC_CONF_OFFSET, 63 NGX_HTTP_LOC_CONF_OFFSET,
64 0, 64 0,
65 NULL }, 65 NULL },
66 66
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 *