comparison src/http/ngx_http_upstream.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 b743d290eb3b
children a39aab45a53f
comparison
equal deleted inserted replaced
357:16d557a75356 358:9121a0a91f47
2121 time_t lm; 2121 time_t lm;
2122 ngx_err_t err; 2122 ngx_err_t err;
2123 ngx_str_t *temp, path, *last_modified; 2123 ngx_str_t *temp, path, *last_modified;
2124 ngx_temp_file_t *tf; 2124 ngx_temp_file_t *tf;
2125 2125
2126 if (u->pipe->temp_file->file.fd == NGX_INVALID_FILE) { 2126 tf = u->pipe->temp_file;
2127
2128 if (tf->file.fd == NGX_INVALID_FILE) {
2127 2129
2128 /* create file for empty 200 response */ 2130 /* create file for empty 200 response */
2129 2131
2130 tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t)); 2132 tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t));
2131 if (tf == NULL) { 2133 if (tf == NULL) {
2146 } 2148 }
2147 2149
2148 u->pipe->temp_file = tf; 2150 u->pipe->temp_file = tf;
2149 } 2151 }
2150 2152
2151 temp = &u->pipe->temp_file->file.name; 2153 temp = &tf->file.name;
2152 2154
2153 #if !(NGX_WIN32) 2155 #if !(NGX_WIN32)
2154 2156
2155 if (ngx_change_file_access(temp->data, u->conf->store_access) 2157 if (ngx_change_file_access(temp->data, u->conf->store_access)
2156 == NGX_FILE_ERROR) 2158 == NGX_FILE_ERROR)
2169 last_modified = &u->headers_in.last_modified->value; 2171 last_modified = &u->headers_in.last_modified->value;
2170 2172
2171 lm = ngx_http_parse_time(last_modified->data, last_modified->len); 2173 lm = ngx_http_parse_time(last_modified->data, last_modified->len);
2172 2174
2173 if (lm != NGX_ERROR) { 2175 if (lm != NGX_ERROR) {
2174 if (ngx_set_file_time(temp->data, u->pipe->temp_file->file.fd, lm) 2176 if (ngx_set_file_time(temp->data, tf->file.fd, lm) != NGX_OK) {
2175 != NGX_OK)
2176 {
2177 err = ngx_errno; 2177 err = ngx_errno;
2178 failed = ngx_set_file_time_n; 2178 failed = ngx_set_file_time_n;
2179 name = temp->data; 2179 name = temp->data;
2180 2180
2181 goto failed; 2181 goto failed;