Mercurial > hg > nginx-ranges
comparison src/core/ngx_conf_file.c @ 635:e67b227c8dbb default tip
Merge with current.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 Apr 2011 04:07:55 +0400 |
parents | b4dcae568a2a |
children |
comparison
equal
deleted
inserted
replaced
578:f3a9e57d2e17 | 635:e67b227c8dbb |
---|---|
505 "missing terminating \"%c\" character", ch); | 505 "missing terminating \"%c\" character", ch); |
506 return NGX_ERROR; | 506 return NGX_ERROR; |
507 } | 507 } |
508 | 508 |
509 if (len) { | 509 if (len) { |
510 ngx_memcpy(b->start, start, len); | 510 ngx_memmove(b->start, start, len); |
511 } | 511 } |
512 | 512 |
513 size = (ssize_t) (file_size - cf->conf_file->file.offset); | 513 size = (ssize_t) (file_size - cf->conf_file->file.offset); |
514 | 514 |
515 if (size > b->end - (b->start + len)) { | 515 if (size > b->end - (b->start + len)) { |
669 need_space = 1; | 669 need_space = 1; |
670 found = 1; | 670 found = 1; |
671 } | 671 } |
672 | 672 |
673 } else if (ch == ' ' || ch == '\t' || ch == CR || ch == LF | 673 } else if (ch == ' ' || ch == '\t' || ch == CR || ch == LF |
674 || ch == ';' || ch == '{') { | 674 || ch == ';' || ch == '{') |
675 { | |
675 last_space = 1; | 676 last_space = 1; |
676 found = 1; | 677 found = 1; |
677 } | 678 } |
678 | 679 |
679 if (found) { | 680 if (found) { |
901 ngx_uint_t i; | 902 ngx_uint_t i; |
902 ngx_list_part_t *part; | 903 ngx_list_part_t *part; |
903 ngx_open_file_t *file; | 904 ngx_open_file_t *file; |
904 | 905 |
905 #if (NGX_SUPPRESS_WARN) | 906 #if (NGX_SUPPRESS_WARN) |
906 full.len = 0; | 907 ngx_str_null(&full); |
907 full.data = NULL; | |
908 #endif | 908 #endif |
909 | 909 |
910 if (name->len) { | 910 if (name->len) { |
911 full = *name; | 911 full = *name; |
912 | 912 |