comparison src/core/ngx_conf_file.c @ 694:88a1b4797f2e NGINX_1_3_10

nginx 1.3.10 *) Change: domain names specified in configuration file are now resolved to IPv6 addresses as well as IPv4 ones. *) Change: now if the "include" directive with mask is used on Unix systems, included files are sorted in alphabetical order. *) Change: the "add_header" directive adds headers to 201 responses. *) Feature: the "geo" directive now supports IPv6 addresses in CIDR notation. *) Feature: the "flush" and "gzip" parameters of the "access_log" directive. *) Feature: variables support in the "auth_basic" directive. *) Bugfix: nginx could not be built with the ngx_http_perl_module in some cases. *) Bugfix: a segmentation fault might occur in a worker process if the ngx_http_xslt_module was used. *) Bugfix: nginx could not be built on MacOSX in some cases. Thanks to Piotr Sikora. *) Bugfix: the "limit_rate" directive with high rates might result in truncated responses on 32-bit platforms. Thanks to Alexey Antropov. *) Bugfix: a segmentation fault might occur in a worker process if the "if" directive was used. Thanks to Piotr Sikora. *) Bugfix: a "100 Continue" response was issued with "413 Request Entity Too Large" responses. *) Bugfix: the "image_filter", "image_filter_jpeg_quality" and "image_filter_sharpen" directives might be inherited incorrectly. Thanks to Ian Babrou. *) Bugfix: "crypt_r() failed" errors might appear if the "auth_basic" directive was used on Linux. *) Bugfix: in backup servers handling. Thanks to Thomas Chen. *) Bugfix: proxied HEAD requests might return incorrect response if the "gzip" directive was used.
author Igor Sysoev <http://sysoev.ru>
date Tue, 25 Dec 2012 00:00:00 +0400
parents 2e8a942c8872
children
comparison
equal deleted inserted replaced
693:cfd4279acc6e 694:88a1b4797f2e
943 } else { 943 } else {
944 file->fd = ngx_stderr; 944 file->fd = ngx_stderr;
945 file->name = *name; 945 file->name = *name;
946 } 946 }
947 947
948 file->buffer = NULL; 948 file->flush = NULL;
949 949
950 return file; 950 return file;
951 } 951 }
952 952
953 953
954 static void 954 static void
955 ngx_conf_flush_files(ngx_cycle_t *cycle) 955 ngx_conf_flush_files(ngx_cycle_t *cycle)
956 { 956 {
957 ssize_t n, len;
958 ngx_uint_t i; 957 ngx_uint_t i;
959 ngx_list_part_t *part; 958 ngx_list_part_t *part;
960 ngx_open_file_t *file; 959 ngx_open_file_t *file;
961 960
962 ngx_log_debug0(NGX_LOG_DEBUG_CORE, cycle->log, 0, "flush files"); 961 ngx_log_debug0(NGX_LOG_DEBUG_CORE, cycle->log, 0, "flush files");
973 part = part->next; 972 part = part->next;
974 file = part->elts; 973 file = part->elts;
975 i = 0; 974 i = 0;
976 } 975 }
977 976
978 len = file[i].pos - file[i].buffer; 977 if (file[i].flush) {
979 978 file[i].flush(&file[i], cycle->log);
980 if (file[i].buffer == NULL || len == 0) {
981 continue;
982 }
983
984 n = ngx_write_fd(file[i].fd, file[i].buffer, len);
985
986 if (n == NGX_FILE_ERROR) {
987 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
988 ngx_write_fd_n " to \"%s\" failed",
989 file[i].name.data);
990
991 } else if (n != len) {
992 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
993 ngx_write_fd_n " to \"%s\" was incomplete: %z of %uz",
994 file[i].name.data, n, len);
995 } 979 }
996 } 980 }
997 } 981 }
998 982
999 983