Mercurial > hg > nginx
changeset 497:d7c90bb5ce83 release-0.1.23
nginx-0.1.23-RELEASE import
*) Feature: the ngx_http_ssi_filter_module and the ssi,
ssi_silent_errors, and ssi_min_file_chunk directives. The 'echo
var="HTTP_..." default=""' and 'echo var="REMOTE_ADDR"' commands are
supported.
*) Feature: the %request_time log parameter.
*) Feature: if the request has no the "Host" header line, then the
"proxy_preserve_host" directive set this header line to the first
server name of the "server_name" directive.
*) Bugfix: nginx could not be built on platforms different from i386,
amd64, sparc, and ppc; the bug had appeared in 0.1.22.
*) Bugfix: the ngx_http_autoindex_module now shows the information not
about the symlink, but about file or directory it points to.
*) Bugfix: the %apache_length parameter logged the negative length of
the response header if the no response was transferred to a client.
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Tue, 01 Mar 2005 15:20:36 +0000 |
| parents | 7ce7b31c3c83 |
| children | 58fcf570b0cb |
| files | auto/cc/gcc auto/options docs/xml/nginx/changes.xml src/core/nginx.h src/event/ngx_event_acceptex.c src/http/modules/ngx_http_autoindex_handler.c src/http/modules/ngx_http_gzip_filter.c src/http/modules/ngx_http_ssi_filter.c src/http/modules/proxy/ngx_http_proxy_upstream.c src/http/ngx_http_log_handler.c src/http/ngx_http_request.c src/http/ngx_http_request.h src/os/unix/ngx_atomic.h src/os/unix/ngx_files.h src/os/win32/ngx_atomic.h src/os/win32/ngx_files.h |
| diffstat | 16 files changed, 920 insertions(+), 619 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/cc/gcc +++ b/auto/cc/gcc @@ -3,7 +3,7 @@ # gcc 2.7.2.3, 2.8.1, 2.95.4, -# 3.0.4, 3.1.1, 3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4, 3.4.2 +# 3.0.4, 3.1.1, 3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4.0, 3.4.2 # Solaris 7's /usr/ccs/bin/as does not support "-pipe"
--- a/auto/options +++ b/auto/options @@ -48,7 +48,7 @@ NGX_HTTP_FASTCGI_TEMP_PATH= HTTP_CHARSET=YES HTTP_GZIP=YES HTTP_SSL=NO -HTTP_SSI=NO +HTTP_SSI=YES HTTP_ACCESS=YES HTTP_USERID=YES HTTP_AUTOINDEX=YES
--- a/docs/xml/nginx/changes.xml +++ b/docs/xml/nginx/changes.xml @@ -9,6 +9,81 @@ <title lang="en">nginx changelog</title> +<changes ver="0.1.23" date="01.03.2005"> + +<change type="feature"> +<para lang="ru"> +модуль ngx_http_ssi_filter_module и +директивы ssi, ssi_silent_errors и ssi_min_file_chunk. +Поддерживаются команды 'echo var="HTTP_..." default=""' и +'echo var="REMOTE_ADDR"'. +</para> +<para lang="en"> +the ngx_http_ssi_filter_module and +the ssi, ssi_silent_errors, and ssi_min_file_chunk directives. +The 'echo var="HTTP_..." default=""' and 'echo var="REMOTE_ADDR"' commands +are supported. +</para> +</change> + +<change type="feature"> +<para lang="ru"> +параметр лога %request_time. +</para> +<para lang="en"> +the %request_time log parameter. +</para> +</change> + +<change type="feature"> +<para lang="ru"> +если запрос пришёл без строки заголовка "Host", то директива +proxy_preserve_host устанавливает в качестве этого заголовка первое имя +сервера из директивы server_name. +</para> +<para lang="en"> +if the request has no the "Host" header line, then the proxy_preserve_host +directive set this header line to the first server name of the server_name +directive. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +nginx не собирался на платформах, отличных от i386, amd64, sparc и ppc; +ошибка появилась в 0.1.22. +</para> +<para lang="en"> +nginx could not be built on platforms different from i386, amd64, sparc и ppc; +bug appeared in 0.1.22. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +модуль ngx_http_autoindex_module теперь показывает информацию не о +символическом линке, а о файле или каталоге, на который он указывает. +</para> +<para lang="en"> +the ngx_http_autoindex_module now shows the information not about the symlink, +but about file or directory it points to. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +если клиенту ничего не передавалось, то параметр %apache_length +записывал в лог отрицательную длину заголовка ответа. +</para> +<para lang="en"> +the %apache_length parameter logged the negative length +of the response header if the no response was transferred to a client. +</para> +</change> + +</changes> + + <changes ver="0.1.22" date="22.02.2005"> <change type="bugfix"> @@ -19,7 +94,7 @@ </para> <para lang="en"> the ngx_http_stub_status_module showed incorrect handled connections -statictics if the proxing or FastCGI server were used. +statistics if the proxing or FastCGI server were used. </para> </change> @@ -29,7 +104,7 @@ statictics if the proxing or FastCGI ser ошибка появилась в 0.1.21. </para> <para lang="en"> -the installation pathes were incorrectly quoted on Linux and Solaris; +the installation paths were incorrectly quoted on Linux and Solaris; bug appeared in 0.1.21. </para> </change> @@ -46,7 +121,7 @@ bug appeared in 0.1.21. рабочих процессов на SMP машине. </para> <para lang="en"> -the ngx_http_stub_status_module showed incorrect statictics +the ngx_http_stub_status_module showed incorrect statistics if "rtsig" method was used or if several worker process ran on SMP. </para> </change> @@ -82,7 +157,7 @@ nginx could not be built on NetBSD 2.0. </para> <para lang="en"> the new "script_filename" and "remote_port" parameters -ofthe fastcgi_params directive. +of the fastcgi_params directive. </para> </change> @@ -91,7 +166,7 @@ ofthe fastcgi_params directive. неправильно обрабатывался поток stderr от FastCGI-сервера. </para> <para lang="en"> -the FastCGI stderr stream was handled incorreсtly. +the FastCGI stderr stream was handled incorrectly. </para> </change> @@ -420,7 +495,7 @@ segmentation fault. выделенных частей не совпадает с числом подстановок. </para> <para lang="en"> -the correct handling of the regular exporession, that +the correct handling of the regular expression, that has different number of the captures and substitutions. </para> </change> @@ -432,7 +507,7 @@ location, который передаётся FastCGI-серверу, может быть задан </para> <para lang="en"> the location, that is passed to the FastCGI server, can be -regualar expression. +regular expression. </para> </change> @@ -480,9 +555,9 @@ bug appeared in 0.1.14. то происходил segmentation fault. </para> <para lang="en"> -the same pathes in autoconfiguration paramters +the same paths in autoconfiguration parameters --http-client-body-temp-path=PATH and --http-proxy-temp-path=PATH, -or --http-client-body-temp-path=PATH nad --http-fastcgi-temp-path=PATH +or --http-client-body-temp-path=PATH and --http-fastcgi-temp-path=PATH caused segmentation fault. </para> </change> @@ -783,7 +858,7 @@ method was used. автоматическое определение групп nobody и nogroup. </para> <para lang="en"> -the autodetection of the nobody and nogroup groups. +the autodetection of the "nobody" and "nogroup" groups. </para> </change> @@ -960,7 +1035,7 @@ bug appeared in 0.1.5. использовалась конфигурация не из того location. </para> <para lang="en"> -some location directive combiations with the regular expressions caused +some location directive combinations with the regular expressions caused the wrong configuration choose. </para> </change>
--- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.1.22" +#define NGINX_VER "nginx/0.1.23" #define NGINX_VAR "NGINX" #define NGX_NEWPID_EXT ".newbin"
--- a/src/event/ngx_event_acceptex.c +++ b/src/event/ngx_event_acceptex.c @@ -7,7 +7,6 @@ #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> -#include <nginx.h> void ngx_event_acceptex(ngx_event_t *rev)
--- a/src/http/modules/ngx_http_autoindex_handler.c +++ b/src/http/modules/ngx_http_autoindex_handler.c @@ -241,7 +241,7 @@ static ngx_int_t ngx_http_autoindex_hand if (len == 2 && ngx_de_name(&dir)[0] == '.' - && ngx_de_name(&dir)[0] == '.') + && ngx_de_name(&dir)[1] == '.') { continue; } @@ -263,9 +263,20 @@ static ngx_int_t ngx_http_autoindex_hand ngx_cpystrn(last, ngx_de_name(&dir), len + 1); if (ngx_de_info(fname.data, &dir) == NGX_FILE_ERROR) { - ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno, - ngx_de_info_n " \"%s\" failed", fname.data); - return ngx_http_autoindex_error(r, &dir, dname.data); + err = ngx_errno; + + if (err != NGX_ENOENT) { + ngx_log_error(NGX_LOG_CRIT, r->connection->log, err, + ngx_de_info_n " \"%s\" failed", fname.data); + return ngx_http_autoindex_error(r, &dir, dname.data); + } + + if (ngx_de_link_info(fname.data, &dir) == NGX_FILE_ERROR) { + ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno, + ngx_de_link_info_n " \"%s\" failed", + fname.data); + return ngx_http_autoindex_error(r, &dir, dname.data); + } } }
--- a/src/http/modules/ngx_http_gzip_filter.c +++ b/src/http/modules/ngx_http_gzip_filter.c @@ -76,23 +76,23 @@ typedef struct { static ngx_int_t ngx_http_gzip_proxied(ngx_http_request_t *r, - ngx_http_gzip_conf_t *conf); + ngx_http_gzip_conf_t *conf); static void *ngx_http_gzip_filter_alloc(void *opaque, u_int items, - u_int size); + u_int size); static void ngx_http_gzip_filter_free(void *opaque, void *address); static void ngx_http_gzip_error(ngx_http_gzip_ctx_t *ctx); static u_char *ngx_http_gzip_log_ratio(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op); + ngx_http_log_op_t *op); static ngx_int_t ngx_http_gzip_add_log_formats(ngx_conf_t *cf); static ngx_int_t ngx_http_gzip_filter_init(ngx_cycle_t *cycle); static void *ngx_http_gzip_create_conf(ngx_conf_t *cf); static char *ngx_http_gzip_merge_conf(ngx_conf_t *cf, - void *parent, void *child); + void *parent, void *child); static char *ngx_http_gzip_set_types(ngx_conf_t *cf, ngx_command_t *cmd, - void *conf); + void *conf); static char *ngx_http_gzip_set_window(ngx_conf_t *cf, void *post, void *data); static char *ngx_http_gzip_set_hash(ngx_conf_t *cf, void *post, void *data); @@ -261,7 +261,8 @@ static ngx_http_output_header_filter_pt static ngx_http_output_body_filter_pt ngx_http_next_body_filter; -static ngx_int_t ngx_http_gzip_header_filter(ngx_http_request_t *r) +static ngx_int_t +ngx_http_gzip_header_filter(ngx_http_request_t *r) { ngx_uint_t i, found; ngx_http_gzip_ctx_t *ctx; @@ -357,8 +358,8 @@ static ngx_int_t ngx_http_gzip_header_fi } -static ngx_int_t ngx_http_gzip_proxied(ngx_http_request_t *r, - ngx_http_gzip_conf_t *conf) +static ngx_int_t +ngx_http_gzip_proxied(ngx_http_request_t *r, ngx_http_gzip_conf_t *conf) { time_t date, expires; @@ -437,8 +438,8 @@ static ngx_int_t ngx_http_gzip_proxied(n } -static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r, - ngx_chain_t *in) +static ngx_int_t +ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in) { int rc, wbits, memlevel; ngx_int_t last; @@ -825,7 +826,8 @@ static ngx_int_t ngx_http_gzip_body_filt } -static void *ngx_http_gzip_filter_alloc(void *opaque, u_int items, u_int size) +static void * +ngx_http_gzip_filter_alloc(void *opaque, u_int items, u_int size) { ngx_http_gzip_ctx_t *ctx = opaque; @@ -866,7 +868,8 @@ static void *ngx_http_gzip_filter_alloc( } -static void ngx_http_gzip_filter_free(void *opaque, void *address) +static void +ngx_http_gzip_filter_free(void *opaque, void *address) { #if 0 ngx_http_gzip_ctx_t *ctx = opaque; @@ -877,8 +880,9 @@ static void ngx_http_gzip_filter_free(vo } -static u_char *ngx_http_gzip_log_ratio(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_gzip_log_ratio(ngx_http_request_t *r, u_char *buf, + ngx_http_log_op_t *op) { ngx_uint_t zint, zfrac; ngx_http_gzip_ctx_t *ctx; @@ -909,7 +913,8 @@ static u_char *ngx_http_gzip_log_ratio(n } -static void ngx_http_gzip_error(ngx_http_gzip_ctx_t *ctx) +static void +ngx_http_gzip_error(ngx_http_gzip_ctx_t *ctx) { deflateEnd(&ctx->zstream); @@ -926,7 +931,8 @@ static void ngx_http_gzip_error(ngx_http } -static ngx_int_t ngx_http_gzip_add_log_formats(ngx_conf_t *cf) +static ngx_int_t +ngx_http_gzip_add_log_formats(ngx_conf_t *cf) { ngx_http_log_op_name_t *op; @@ -945,7 +951,8 @@ static ngx_int_t ngx_http_gzip_add_log_f } -static ngx_int_t ngx_http_gzip_filter_init(ngx_cycle_t *cycle) +static ngx_int_t +ngx_http_gzip_filter_init(ngx_cycle_t *cycle) { ngx_http_next_header_filter = ngx_http_top_header_filter; ngx_http_top_header_filter = ngx_http_gzip_header_filter; @@ -957,7 +964,8 @@ static ngx_int_t ngx_http_gzip_filter_in } -static void *ngx_http_gzip_create_conf(ngx_conf_t *cf) +static void * +ngx_http_gzip_create_conf(ngx_conf_t *cf) { ngx_http_gzip_conf_t *conf; @@ -987,8 +995,8 @@ static void *ngx_http_gzip_create_conf(n } -static char *ngx_http_gzip_merge_conf(ngx_conf_t *cf, - void *parent, void *child) +static char * +ngx_http_gzip_merge_conf(ngx_conf_t *cf, void *parent, void *child) { ngx_http_gzip_conf_t *prev = parent; ngx_http_gzip_conf_t *conf = child; @@ -1000,10 +1008,9 @@ static char *ngx_http_gzip_merge_conf(ng ngx_conf_merge_bufs_value(conf->bufs, prev->bufs, 4, ngx_pagesize); ngx_conf_merge_unsigned_value(conf->http_version, prev->http_version, - NGX_HTTP_VERSION_11); + NGX_HTTP_VERSION_11); ngx_conf_merge_bitmask_value(conf->proxied, prev->proxied, - (NGX_CONF_BITMASK_SET - |NGX_HTTP_GZIP_PROXIED_OFF)); + (NGX_CONF_BITMASK_SET|NGX_HTTP_GZIP_PROXIED_OFF)); ngx_conf_merge_value(conf->level, prev->level, 1); ngx_conf_merge_size_value(conf->wbits, prev->wbits, MAX_WBITS); @@ -1037,8 +1044,8 @@ static char *ngx_http_gzip_merge_conf(ng } -static char *ngx_http_gzip_set_types(ngx_conf_t *cf, ngx_command_t *cmd, - void *conf) +static char * +ngx_http_gzip_set_types(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) { ngx_http_gzip_conf_t *gcf = conf; @@ -1047,7 +1054,7 @@ static char *ngx_http_gzip_set_types(ngx ngx_http_gzip_type_t *type; if (gcf->types == NULL) { - gcf->types = ngx_array_create(cf->pool, 5, + gcf->types = ngx_array_create(cf->pool, 4, sizeof(ngx_http_gzip_type_t)); if (gcf->types == NULL) { return NGX_CONF_ERROR; @@ -1087,7 +1094,8 @@ static char *ngx_http_gzip_set_types(ngx } -static char *ngx_http_gzip_set_window(ngx_conf_t *cf, void *post, void *data) +static char * +ngx_http_gzip_set_window(ngx_conf_t *cf, void *post, void *data) { int *np = data; @@ -1110,7 +1118,8 @@ static char *ngx_http_gzip_set_window(ng } -static char *ngx_http_gzip_set_hash(ngx_conf_t *cf, void *post, void *data) +static char * +ngx_http_gzip_set_hash(ngx_conf_t *cf, void *post, void *data) { int *np = data;
--- a/src/http/modules/ngx_http_ssi_filter.c +++ b/src/http/modules/ngx_http_ssi_filter.c @@ -8,56 +8,68 @@ #include <ngx_core.h> #include <ngx_http.h> - -#define NGX_HTTP_SSI_COMMAND_LEN 31 -#define NGX_HTTP_SSI_PARAM_LEN 31 +#define NGX_HTTP_SSI_MAX_PARAMS 16 -#define NGX_HTTP_SSI_COPY 1 -#define NGX_HTTP_SSI_INVALID_COMMAND 2 -#define NGX_HTTP_SSI_INVALID_PARAM 3 -#define NGX_HTTP_SSI_INVALID_VALUE 4 -#define NGX_HTTP_SSI_LONG_VALUE 5 +#define NGX_HTTP_SSI_COMMAND_LEN 31 +#define NGX_HTTP_SSI_PARAM_LEN 31 +#define NGX_HTTP_SSI_PARAMS_N 4 + +#define NGX_HTTP_SSI_ERROR 1 typedef struct { ngx_flag_t enable; + ngx_flag_t silent_errors; + + size_t min_file_chunk; size_t value_len; } ngx_http_ssi_conf_t; typedef struct { - int dummy; -} ngx_http_ssi_command_t; - + ngx_buf_t *buf; -typedef struct { - ngx_hunk_t *buf; - - u_char *start; - u_char *last; u_char *pos; + u_char *copy_start; + u_char *copy_end; ngx_str_t command; ngx_array_t params; ngx_table_elt_t *param; + ngx_table_elt_t params_array[NGX_HTTP_SSI_PARAMS_N]; ngx_chain_t *in; ngx_chain_t *out; ngx_chain_t **last_out; - ngx_chain_t *busy; ngx_uint_t state; + ngx_uint_t saved_state; size_t saved; + size_t looked; + + size_t value_len; } ngx_http_ssi_ctx_t; -typedef ngx_int_t (*ngx_http_ssi_opcode_pt) (ngx_http_request_t *r, - ngx_http_ssi_ctx_t *ctx); +typedef ngx_int_t (*ngx_http_ssi_command_pt) (ngx_http_request_t *r, + ngx_http_ssi_ctx_t *ctx, ngx_str_t **); + typedef struct { - ngx_str_t name; - ngx_http_ssi_opcode_pt op; -} ngx_http_ssi_op_t; + ngx_str_t name; + ngx_uint_t index; + + ngx_uint_t mandatory; +} ngx_http_ssi_param_t; + + +typedef struct { + ngx_str_t name; + ngx_http_ssi_command_pt handler; + ngx_http_ssi_param_t *params; + + ngx_uint_t flush; /* unsigned flush:1; */ +} ngx_http_ssi_command_t; typedef enum { @@ -73,9 +85,9 @@ typedef enum { ssi_preequal_state, ssi_prevalue_state, ssi_double_quoted_value_state, - ssi_double_quoted_value_quote_state, ssi_quoted_value_state, - ssi_quoted_value_quote_state, + ssi_quoted_symbol_state, + ssi_postparam_state, ssi_comment_end0_state, ssi_comment_end1_state, ssi_error_state, @@ -85,23 +97,17 @@ typedef enum { static ngx_int_t ngx_http_ssi_error(ngx_http_request_t *r, - ngx_http_ssi_ctx_t *ctx); + ngx_http_ssi_ctx_t *ctx); static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r, - ngx_http_ssi_ctx_t *ctx); + ngx_http_ssi_ctx_t *ctx); static ngx_int_t ngx_http_ssi_echo(ngx_http_request_t *r, - ngx_http_ssi_ctx_t *ctx); + ngx_http_ssi_ctx_t *ctx, ngx_str_t **params); static void *ngx_http_ssi_create_conf(ngx_conf_t *cf); static char *ngx_http_ssi_merge_conf(ngx_conf_t *cf, - void *parent, void *child); -static int ngx_http_ssi_filter_init(ngx_cycle_t *cycle); - - -static ngx_http_ssi_op_t ngx_http_ssi_commands[] = { - { ngx_string("echo"), ngx_http_ssi_echo }, - { ngx_null_string, NULL } -}; + void *parent, void *child); +static ngx_int_t ngx_http_ssi_filter_init(ngx_cycle_t *cycle); static ngx_command_t ngx_http_ssi_filter_commands[] = { @@ -113,7 +119,21 @@ static ngx_command_t ngx_http_ssi_filte offsetof(ngx_http_ssi_conf_t, enable), NULL }, - ngx_null_command + { ngx_string("ssi_silent_errors"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + ngx_conf_set_flag_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_ssi_conf_t, silent_errors), + NULL }, + + { ngx_string("ssi_min_file_chunk"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_ssi_conf_t, min_file_chunk), + NULL }, + + ngx_null_command }; @@ -142,18 +162,36 @@ ngx_module_t ngx_http_ssi_filter_module }; -static int (*ngx_http_next_header_filter) (ngx_http_request_t *r); -static int (*ngx_http_next_body_filter) (ngx_http_request_t *r, - ngx_chain_t *in); +static ngx_int_t (*ngx_http_next_header_filter) (ngx_http_request_t *r); +static ngx_int_t (*ngx_http_next_body_filter) (ngx_http_request_t *r, + ngx_chain_t *in); + + +static u_char ngx_http_ssi_string[] = "<!--"; +static u_char ngx_http_ssi_error_string[] = + "[an error occurred while processing the directive]"; + +static ngx_str_t ngx_http_ssi_none = ngx_string("(none)"); -static char ssi_string[] = "<!--#"; -static char error_string[] = "[an error occurred while processing " - "the directive]"; -static char stub_string[] = "[a stub ssi string]"; +#define NGX_HTTP_SSI_ECHO_VAR 0 +#define NGX_HTTP_SSI_ECHO_DEFAULT 1 + +static ngx_http_ssi_param_t ngx_http_ssi_echo_params[] = { + { ngx_string("var"), NGX_HTTP_SSI_ECHO_VAR, 1 }, + { ngx_string("default"), NGX_HTTP_SSI_ECHO_DEFAULT, 0 }, + { ngx_null_string, 0, 0 } +}; -static int ngx_http_ssi_header_filter(ngx_http_request_t *r) +static ngx_http_ssi_command_t ngx_http_ssi_commands[] = { + { ngx_string("echo"), ngx_http_ssi_echo, ngx_http_ssi_echo_params, 0 }, + { ngx_null_string, NULL, NULL, 0 } +}; + + +static ngx_int_t +ngx_http_ssi_header_filter(ngx_http_request_t *r) { ngx_http_ssi_ctx_t *ctx; ngx_http_ssi_conf_t *conf; @@ -173,11 +211,22 @@ static int ngx_http_ssi_header_filter(ng return ngx_http_next_header_filter(r); } - ngx_http_create_ctx(r, ctx, ngx_http_ssi_filter_module, - sizeof(ngx_http_ssi_ctx_t), NGX_ERROR); + + if (!(ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_ssi_ctx_t)))) { + return NGX_ERROR; + } + + ngx_http_set_ctx(r, ctx, ngx_http_ssi_filter_module); + + ctx->value_len = conf->value_len; ctx->last_out = &ctx->out; + ctx->params.elts = ctx->params_array; + ctx->params.size = sizeof(ngx_table_elt_t); + ctx->params.nalloc = NGX_HTTP_SSI_PARAMS_N; + ctx->params.pool = r->pool; + r->headers_out.content_length_n = -1; if (r->headers_out.content_length) { r->headers_out.content_length->key.len = 0; @@ -190,20 +239,26 @@ static int ngx_http_ssi_header_filter(ng r->headers_out.last_modified = NULL; } - r->filter |= NGX_HTTP_FILTER_NEED_IN_MEMORY; + r->filter_need_in_memory = 1; + r->filter_ssi_need_in_memory = 1; return ngx_http_next_header_filter(r); } -static int ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in) +static ngx_int_t +ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in) { - size_t len; - ngx_int_t rc, found; - ngx_hunk_t *hunk; - ngx_chain_t *cl, *tl; - ngx_http_ssi_op_t *cmd; - ngx_http_ssi_ctx_t *ctx; + ngx_int_t rc; + ngx_uint_t i; + ngx_buf_t *b; + ngx_chain_t *cl; + ngx_table_elt_t *param; + ngx_http_ssi_ctx_t *ctx; + ngx_http_ssi_conf_t *conf; + ngx_http_ssi_param_t *prm; + ngx_http_ssi_command_t *cmd; + ngx_str_t *params[NGX_HTTP_SSI_MAX_PARAMS]; ctx = ngx_http_get_module_ctx(r, ngx_http_ssi_filter_module); @@ -211,7 +266,7 @@ static int ngx_http_ssi_body_filter(ngx_ return ngx_http_next_body_filter(r, in); } - /* add the incoming hunk to the chain ctx->in */ + /* add the incoming chain to the chain ctx->in */ if (in) { if (ngx_chain_add_copy(r->pool, &ctx->in, in) == NGX_ERROR) { @@ -219,35 +274,22 @@ static int ngx_http_ssi_body_filter(ngx_ } } - while (ctx->in) { - if (ctx->buf == NULL) { - ctx->buf = ctx->in->hunk; - ctx->in = ctx->in->next; + conf = ngx_http_get_module_loc_conf(r, ngx_http_ssi_filter_module); - ctx->start = ctx->buf->pos; - ctx->pos = ctx->buf->pos; - ctx->last = ctx->buf->pos; + ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "http ssi filter"); - if (ctx->saved) { - len = ctx->buf->last - ctx->buf->pos; - if (len > 5 - ctx->saved) { - len = 5 - ctx->saved; - } + b = NULL; - if (ngx_strncmp(ctx->buf->pos, &ssi_string[ctx->saved], len) - == 0) - { - if (len < 5 - ctx->saved) { - ctx->buf = NULL; - continue; + while (ctx->in) { - } else { - ctx->saved = 0; - ctx->pos += len; - ctx->state = ssi_precommand_state; - } - } - } + ctx->buf = ctx->in->buf; + ctx->in = ctx->in->next; + ctx->pos = ctx->buf->pos; + + if (ctx->state == ssi_start_state) { + ctx->copy_start = ctx->pos; + ctx->copy_end = ctx->pos; } while (ctx->pos < ctx->buf->last) { @@ -257,281 +299,230 @@ static int ngx_http_ssi_body_filter(ngx_ rc = ngx_http_ssi_parse(r, ctx); - ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "parse: %d", rc); - - if (rc == NGX_AGAIN) { - continue; + ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "parse: %d, looked: %d %p-%p", + rc, ctx->looked, ctx->copy_start, ctx->copy_end); - } else if (rc == NGX_ERROR) { + if (rc == NGX_ERROR) { return rc; + } - } else if (rc == NGX_HTTP_SSI_COPY) { + if (ctx->copy_start != ctx->copy_end) { - ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "saved: %d copy: %d", - ctx->saved, ctx->last - ctx->start); + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "saved: %d", ctx->saved); if (ctx->saved) { - - if (!(hunk = ngx_calloc_hunk(r->pool))) { + if (!(b = ngx_calloc_buf(r->pool))) { return NGX_ERROR; } - hunk->type = NGX_HUNK_IN_MEMORY|NGX_HUNK_TEMP; - hunk->pos = ssi_string; - hunk->last = ssi_string + ctx->saved; + b->memory = 1; + b->pos = ngx_http_ssi_string; + b->last = ngx_http_ssi_string + ctx->saved; - ngx_alloc_link_and_set_hunk(cl, hunk, r->pool, NGX_ERROR); + if (!(cl = ngx_alloc_chain_link(r->pool))) { + return NGX_ERROR; + } + cl->buf = b; *ctx->last_out = cl; ctx->last_out = &cl->next; ctx->saved = 0; } - if (!(hunk = ngx_calloc_hunk(r->pool))) { - return NGX_ERROR; - } - - hunk->type = NGX_HUNK_IN_MEMORY|NGX_HUNK_TEMP|NGX_HUNK_RECYCLED; - hunk->pos = ctx->start; - hunk->last = ctx->last; - hunk->shadow = ctx->buf; - - ngx_alloc_link_and_set_hunk(cl, hunk, r->pool, NGX_ERROR); - - *ctx->last_out = cl; - ctx->last_out = &cl->next; - - if (ctx->pos == ctx->buf->last) { - ctx->saved = ctx->pos - ctx->last; - } - - continue; - - } else if (rc >= NGX_HTTP_SSI_INVALID_COMMAND) { - - ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "saved: %d error: %d", - ctx->saved, rc); - - if (ngx_http_ssi_error(r, ctx) == NGX_ERROR) { + if (!(b = ngx_calloc_buf(r->pool))) { return NGX_ERROR; } - if (rc == NGX_HTTP_SSI_INVALID_COMMAND) { - ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, - "invalid SSI command \"%s\" found", - ctx->command.data); + ngx_memcpy(b, ctx->buf, sizeof(ngx_buf_t)); - } else if (rc == NGX_HTTP_SSI_INVALID_PARAM) { - ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, - "invalid parameter \"%s\" found " - "in SSI command \"%s\"", - ctx->param->key.data, ctx->command.data); - } - -#if 0 - } else if (rc == NGX_HTTP_SSI_INVALID_COMMAND) { - } else if (rc == NGX_HTTP_SSI_INVALID_PARAM) { - } else if (rc == NGX_HTTP_SSI_INVALID_VALUE) { - } else if (rc == NGX_HTTP_SSI_LONG_VALUE) { -#endif - - } else { + b->last_buf = 0; + b->pos = ctx->copy_start; + b->last = ctx->copy_end; - found = 0; - - for (cmd = ngx_http_ssi_commands; cmd->name.len; cmd++) { - if (ctx->command.len != cmd->name.len) { - continue; - } + if (b->in_file) { - if (ngx_strncmp(ctx->command.data, cmd->name.data, - cmd->name.len) != 0) - { - continue; - } - - found = 1; + if (conf->min_file_chunk < (size_t) (b->last - b->pos)) { + b->file_last = b->file_pos + (b->last - b->start); + b->file_pos += b->pos - b->start; - if (cmd->op(r, ctx) == NGX_ERROR) { - return NGX_ERROR; - } - } - - if (!found) { - if (ngx_http_ssi_error(r, ctx) == NGX_ERROR) { - return NGX_ERROR; + } else { + b->in_file = 0; } } -#if 0 - if (!(hunk = ngx_calloc_hunk(r->pool))) { + if (!(cl = ngx_alloc_chain_link(r->pool))) { return NGX_ERROR; } - hunk->type = NGX_HUNK_IN_MEMORY|NGX_HUNK_TEMP; - hunk->pos = stub_string; - hunk->last = stub_string + sizeof(stub_string) - 1; - - ngx_alloc_link_and_set_hunk(cl, hunk, r->pool, NGX_ERROR); - + cl->buf = b; + cl->next = NULL; *ctx->last_out = cl; ctx->last_out = &cl->next; -#endif } - } + + if (ctx->state == ssi_start_state) { + ctx->copy_start = ctx->pos; + ctx->copy_end = ctx->pos; - ctx->buf = NULL; - } + } else { + ctx->copy_start = NULL; + ctx->copy_end = NULL; + } + + if (rc == NGX_AGAIN) { + continue; + } - if (ctx->out) { - if (ngx_http_next_body_filter(r, ctx->out) == NGX_ERROR) { - return NGX_ERROR; - } + + if (rc == NGX_OK) { + + for (cmd = ngx_http_ssi_commands; cmd->handler; cmd++) { + if (cmd->name.len == 0) { + cmd = (ngx_http_ssi_command_t *) cmd->handler; + } - if (ctx->busy == NULL) { - ctx->busy = ctx->out; + if (cmd->name.len != ctx->command.len + || ngx_strncmp(cmd->name.data, ctx->command.data, + ctx->command.len) != 0) + { + continue; + } - } else { - for (tl = ctx->busy; /* void */ ; tl = tl->next) { - if (tl->next == NULL) { - tl->next = ctx->out; break; } - } - } - - ctx->out = NULL; - ctx->last_out = &ctx->out; + + if (cmd->name.len == 0) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "invalid SSI command: \"%V\"", &ctx->command); + goto ssi_error; + } + + ngx_memzero(params, + NGX_HTTP_SSI_MAX_PARAMS * sizeof(ngx_str_t *)); + + param = ctx->params.elts; + + + for (i = 0; i < ctx->params.nelts; i++) { + + for (prm = cmd->params; prm->name.len; prm++) { + + if (param[i].key.len != prm->name.len + || ngx_strncmp(param[i].key.data, prm->name.data, + prm->name.len) != 0) + { + continue; + } + + if (params[prm->index]) { + ngx_log_error(NGX_LOG_ERR, + r->connection->log, 0, + "duplicate \"%V\" parameter " + "in \"%V\" SSI command", + ¶m[i].key, &ctx->command); - while (ctx->busy) { - if (ngx_hunk_size(ctx->busy->hunk) != 0) { - break; - } + goto ssi_error; + } + + params[prm->index] = ¶m[i].value; - /* TODO: NGX_HUNK_ZEROCOPY_BUSY */ + break; + } + + if (prm->name.len == 0) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "invalid parameter name: \"%V\" " + "in \"%V\" SSI command", + ¶m[i].key, &ctx->command); - hunk = ctx->busy->hunk->shadow; - if (hunk) { - hunk->pos = ctx->busy->hunk->pos; + goto ssi_error; + } + } - len = hunk->last - hunk->pos; - if (len < 5 && ngx_strncmp(hunk->pos, ssi_string, len) == 0) { - hunk->pos = hunk->last; + for (prm = cmd->params; prm->name.len; prm++) { + if (prm->mandatory && params[prm->index] == 0) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "mandatory \"%V\" parameter is absent " + "in \"%V\" SSI command", + &prm->name, &ctx->command); + + goto ssi_error; + } + } + + if (cmd->handler(r, ctx, params) == NGX_OK) { + continue; } } - ctx->busy = ctx->busy->next; - } - } + + /* rc == NGX_HTTP_SSI_ERROR */ + +ssi_error: + + if (conf->silent_errors) { + continue; + } - return NGX_OK; -} + if (!(b = ngx_calloc_buf(r->pool))) { + return NGX_ERROR; + } + b->memory = 1; + b->pos = ngx_http_ssi_error_string; + b->last = ngx_http_ssi_error_string + + sizeof(ngx_http_ssi_error_string) - 1; -static ngx_int_t ngx_http_ssi_error(ngx_http_request_t *r, - ngx_http_ssi_ctx_t *ctx) -{ - ngx_hunk_t *hunk; - ngx_chain_t *cl; + if (!(cl = ngx_alloc_chain_link(r->pool))) { + return NGX_ERROR; + } + + cl->buf = b; + cl->next = NULL; + *ctx->last_out = cl; + ctx->last_out = &cl->next; - if (!(hunk = ngx_calloc_hunk(r->pool))) { - return NGX_ERROR; + continue; + } + + ctx->buf->pos = ctx->buf->last; + + if (b && ctx->buf->last_buf) { + b->last_buf = 1; + } + + ctx->saved = ctx->looked; } - hunk->type = NGX_HUNK_IN_MEMORY|NGX_HUNK_TEMP; - hunk->pos = error_string; - hunk->last = error_string + sizeof(error_string) - 1; - - ngx_alloc_link_and_set_hunk(cl, hunk, r->pool, NGX_ERROR); - - *ctx->last_out = cl; - ctx->last_out = &cl->next; - - return NGX_OK; -} - - -#if 0 - -static int ngx_http_ssi_copy_opcode(ngx_http_request_t *r, - ngx_http_ssi_ctx_t *ctx, void *data) -{ - ngx_http_ssi_copy_t *copy = data; - - ngx_hunk_t *h; - ngx_chain_t chain; - - h = ctx->incoming->hunk; - - if (ctx->looked == 0 && ctx->pos == h->last) { - chain.hunk = h; - chain.next = NULL; - - return next_body_filter(r, &chain); - } - - if (ctx->hunk == NULL) { - ngx_test_null(ctx->hunk, ngx_calloc_hunk(r->pool), NGX_ERROR); - ctx->hunk->type = h->type & NGX_HUNK_STORAGE; + if (ctx->out == NULL) { + return NGX_OK; } - - if (h->type & NGX_HUNK_FILE) { - if (copy->start <= h->file_pos) { - ctx->hunk->file_pos = h->file_pos; - } else if (copy->start < h->file_last) { - ctx->hunk->file_pos = copy->file_pos; - } - - if (copy->end >= h->file_last) { - ctx->hunk->file_last = h->file_last; - } else if (copy->end > h->file_pos) { - } - - } + rc = ngx_http_next_body_filter(r, ctx->out); - if (h->type & NGX_HUNK_IN_MEMORY) { - if (copy->start <= ctx->offset + (h->pos - h->start)) { - ctx->hunk->pos = h->pos; - } else if (copy->start < ctx->offset + (h->last - h->start)) { - ctx->hunk->pos = h->start + (copy->start - ctx->offset); - } + ctx->out = NULL; + ctx->last_out = &ctx->out; - if (copy->end >= ctx->offset + (h->last - h->start) { - ctx->hunk->last = h->last; - } else if (copy->end > ctx->offset + (h->pos - h->start)) { - ctx->hunk->last = h->start + (copy->end - ctx->offset); - } - } - - /* TODO: NGX_HUNK_FLUSH */ - - if ((h->type & NGX_HUNK_LAST) && ctx->hunk->last == h->last) - - /* LAST */ + return rc; } -#endif - static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx) { - u_char *p, *last, *end, ch; - ngx_http_ssi_conf_t *conf; + u_char *p, *last, *copy_end, ch; + size_t looked; ngx_http_ssi_state_e state; - conf = ngx_http_get_module_loc_conf(r, ngx_http_ssi_filter_module); + state = ctx->state; + looked = ctx->looked; + last = ctx->buf->last; + copy_end = ctx->copy_end; - state = ctx->state; - end = ctx->buf->last; - last = NULL; - - for (p = ctx->pos; p < end; p++) { + for (p = ctx->pos; p < last; p++) { ch = *p; @@ -539,23 +530,30 @@ ngx_http_ssi_parse(ngx_http_request_t *r /* the tight loop */ - for ( /* void */ ; p < end; p++) { + for ( /* void */ ; p < last; ch = *(++p)) { if (ch != '<') { continue; } - last = p; + copy_end = p; + looked = 1; state = ssi_tag_state; - break; + + goto tag_started; } - if (p == end) { - ctx->last = p; - ctx->pos = p; - ctx->state = ssi_start_state; + ctx->pos = p; + ctx->looked = looked; + ctx->copy_end = p; - return NGX_HTTP_SSI_COPY; + if (ctx->copy_start == NULL) { + ctx->copy_start = ctx->buf->pos; } + + return NGX_AGAIN; + +tag_started: + continue; } switch (state) { @@ -566,14 +564,17 @@ ngx_http_ssi_parse(ngx_http_request_t *r case ssi_tag_state: switch (ch) { case '!': + looked = 2; state = ssi_comment0_state; break; case '<': - last = p; + copy_end = p; break; default: + copy_end = p; + looked = 0; state = ssi_start_state; break; } @@ -583,15 +584,19 @@ ngx_http_ssi_parse(ngx_http_request_t *r case ssi_comment0_state: switch (ch) { case '-': + looked = 3; state = ssi_comment1_state; break; case '<': - last = p; + copy_end = p; + looked = 1; state = ssi_tag_state; break; default: + copy_end = p; + looked = 0; state = ssi_start_state; break; } @@ -601,15 +606,19 @@ ngx_http_ssi_parse(ngx_http_request_t *r case ssi_comment1_state: switch (ch) { case '-': + looked = 4; state = ssi_sharp_state; break; case '<': - last = p; + copy_end = p; + looked = 1; state = ssi_tag_state; break; default: + copy_end = p; + looked = 0; state = ssi_start_state; break; } @@ -619,17 +628,22 @@ ngx_http_ssi_parse(ngx_http_request_t *r case ssi_sharp_state: switch (ch) { case '#': - ctx->last = last; - ctx->pos = p; - ctx->state = ssi_precommand_state; + if (ctx->copy_start) { + ctx->saved = 0; + } + looked = 0; + state = ssi_precommand_state; break; case '<': - last = p; + copy_end = p; + looked = 1; state = ssi_tag_state; break; default: + copy_end = p; + looked = 0; state = ssi_start_state; break; } @@ -646,13 +660,14 @@ ngx_http_ssi_parse(ngx_http_request_t *r default: ctx->command.len = 1; - ctx->command.data = - ngx_palloc(r->pool, NGX_HTTP_SSI_COMMAND_LEN); + ctx->command.data = ngx_palloc(r->pool, + NGX_HTTP_SSI_COMMAND_LEN + 1); if (ctx->command.data == NULL) { return NGX_ERROR; } ctx->command.data[0] = ch; + ctx->params.nelts = 0; state = ssi_command_state; break; } @@ -673,14 +688,16 @@ ngx_http_ssi_parse(ngx_http_request_t *r break; default: - if (ctx->command.len == NGX_HTTP_SSI_COMMAND_LEN) { - ctx->pos = p; - ctx->state = ssi_error_state; + ctx->command.data[ctx->command.len++] = ch; - return NGX_HTTP_SSI_INVALID_COMMAND; + if (ctx->command.len == NGX_HTTP_SSI_COMMAND_LEN) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "the \"%V\" SSI command is too long", + &ctx->command); + + state = ssi_error_state; + break; } - - ctx->command.data[ctx->command.len++] = ch; } break; @@ -698,28 +715,22 @@ ngx_http_ssi_parse(ngx_http_request_t *r break; default: - if (ctx->params.elts == NULL) { - if (ngx_array_init(&ctx->params = r->pool, - 4, sizeof(ngx_table_elt_t)) = NGX_ERROR) - { - return NGX_ERROR; - } - } - if (!(ctx->param = ngx_array_push(&ctx->params))) { return NGX_ERROR; } ctx->param->key.len = 1; - ctx->param->key.data = - ngx_palloc(r->pool, NGX_HTTP_SSI_PARAM_LEN); + ctx->param->key.data = ngx_palloc(r->pool, + NGX_HTTP_SSI_PARAM_LEN + 1); if (ctx->param->key.data == NULL) { return NGX_ERROR; } + ctx->param->key.data[0] = ch; ctx->param->value.len = 0; - ctx->param->value.data = ngx_palloc(r->pool, conf->value_len); + ctx->param->value.data = ngx_palloc(r->pool, + ctx->value_len + 1); if (ctx->param->value.data == NULL) { return NGX_ERROR; } @@ -744,20 +755,25 @@ ngx_http_ssi_parse(ngx_http_request_t *r break; case '-': - ctx->pos = p; - ctx->state = ssi_error_end0_state; + state = ssi_error_end0_state; - return NGX_HTTP_SSI_INVALID_PARAM; + ctx->param->key.data[ctx->param->key.len++] = ch; + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "invalid \"%V\" parameter in \"%V\" SSI command", + &ctx->param->key, &ctx->command); + break; default: - if (ctx->param->key.len == NGX_HTTP_SSI_PARAM_LEN) { - ctx->pos = p; - ctx->state = ssi_error_state; + ctx->param->key.data[ctx->param->key.len++] = ch; - return NGX_HTTP_SSI_INVALID_PARAM; + if (ctx->param->key.len == NGX_HTTP_SSI_PARAM_LEN) { + state = ssi_error_state; + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "too long \"%V\" parameter in " + "\"%V\" SSI command", + &ctx->param->key, &ctx->command); + break; } - - ctx->param->key.data[ctx->param->key.len++] = ch; } break; @@ -774,18 +790,18 @@ ngx_http_ssi_parse(ngx_http_request_t *r state = ssi_prevalue_state; break; - case '-': - ctx->pos = p; - ctx->state = ssi_error_end0_state; - - return NGX_HTTP_SSI_INVALID_PARAM; + default: + if (ch == '-') { + state = ssi_error_end0_state; + } else { + state = ssi_error_state; + } - default: - ctx->last = last; - ctx->pos = p; - ctx->state = ssi_error_state; - - return NGX_HTTP_SSI_INVALID_PARAM; + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "unexpected \"%c\" symbol after \"%V\" " + "parameter in \"%V\" SSI command", + ch, &ctx->param->key, &ctx->command); + break; } break; @@ -806,19 +822,18 @@ ngx_http_ssi_parse(ngx_http_request_t *r state = ssi_quoted_value_state; break; - case '-': - ctx->last = last; - ctx->pos = p; - ctx->state = ssi_error_end0_state; - - return NGX_HTTP_SSI_INVALID_VALUE; + default: + if (ch == '-') { + state = ssi_error_end0_state; + } else { + state = ssi_error_state; + } - default: - ctx->last = last; - ctx->pos = p; - ctx->state = ssi_error_state; - - return NGX_HTTP_SSI_INVALID_VALUE; + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "unexpected \"%c\" symbol before value of " + "\"%V\" parameter in \"%V\" SSI command", + ch, &ctx->param->key, &ctx->command); + break; } break; @@ -826,77 +841,98 @@ ngx_http_ssi_parse(ngx_http_request_t *r case ssi_double_quoted_value_state: switch (ch) { case '\\': - state = ssi_double_quoted_value_quote_state; + ctx->saved_state = ssi_double_quoted_value_state; + state = ssi_quoted_symbol_state; break; case '"': - state = ssi_preparam_state; + state = ssi_postparam_state; break; default: - if (ctx->param->value.len >= conf->value_len) { - ctx->last = last; - ctx->pos = p; - ctx->state = ssi_error_state; + ctx->param->value.data[ctx->param->value.len++] = ch; - return NGX_HTTP_SSI_LONG_VALUE; + if (ctx->param->value.len == ctx->value_len) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "too long \"%V\" value of \"%V\" parameter " + "in \"%V\" SSI command", + &ctx->param->value, &ctx->param->key, + &ctx->command); + state = ssi_error_state; + break; } - - ctx->param->value.data[ctx->param->value.len++] = ch; } break; - case ssi_double_quoted_value_quote_state: - if (ctx->param->value.len >= conf->value_len) { - ctx->last = last; - ctx->pos = p; - ctx->state = ssi_error_state; - - return NGX_HTTP_SSI_LONG_VALUE; - } - - ctx->param->value.data[ctx->param->value.len++] = ch; - - state = ssi_double_quoted_value_state; - break; - case ssi_quoted_value_state: switch (ch) { case '\\': - state = ssi_quoted_value_quote_state; + ctx->saved_state = ssi_quoted_value_state; + state = ssi_quoted_symbol_state; break; case '\'': - state = ssi_preparam_state; + state = ssi_postparam_state; break; default: - if (ctx->param->value.len >= conf->value_len) { - ctx->last = last; - ctx->pos = p; - ctx->state = ssi_error_state; + ctx->param->value.data[ctx->param->value.len++] = ch; - return NGX_HTTP_SSI_LONG_VALUE; + if (ctx->param->value.len == ctx->value_len) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "too long \"%V\" value of \"%V\" parameter " + "in \"%V\" SSI command", + &ctx->param->value, &ctx->param->key, + &ctx->command); + state = ssi_error_state; + break; } - - ctx->param->value.data[ctx->param->value.len++] = ch; } break; - case ssi_quoted_value_quote_state: - if (ctx->param->value.len >= conf->value_len) { - ctx->last = last; - ctx->pos = p; - ctx->state = ssi_error_state; + case ssi_quoted_symbol_state: + ctx->param->value.data[ctx->param->value.len++] = ch; - return NGX_HTTP_SSI_LONG_VALUE; + if (ctx->param->value.len == ctx->value_len) { + if (ctx->param->value.len == ctx->value_len) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "too long \"%V\" value of \"%V\" parameter " + "in \"%V\" SSI command", + &ctx->param->value, &ctx->param->key, + &ctx->command); + state = ssi_error_state; + break; + } } - ctx->param->value.data[ctx->param->value.len++] = ch; + state = ctx->saved_state; + break; + + case ssi_postparam_state: + switch (ch) { + case ' ': + case CR: + case LF: + case '\t': + state = ssi_preparam_state; + break; - state = ssi_quoted_value_state; + case '-': + state = ssi_comment_end0_state; + break; + + default: + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "unexpected \"%c\" symbol after \"%V\" value " + "of \"%V\" parameter in \"%V\" SSI command", + ch, &ctx->param->value, &ctx->param->key, + &ctx->command); + state = ssi_error_state; + break; + } + break; case ssi_comment_end0_state: @@ -906,11 +942,11 @@ ngx_http_ssi_parse(ngx_http_request_t *r break; default: - ctx->last = last; - ctx->pos = p; - ctx->state = ssi_error_state; - - return NGX_HTTP_SSI_INVALID_COMMAND; + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "unexpected \"%c\" symbol in \"%V\" SSI command", + ch, &ctx->command); + state = ssi_error_state; + break; } break; @@ -919,17 +955,22 @@ ngx_http_ssi_parse(ngx_http_request_t *r switch (ch) { case '>': ctx->state = ssi_start_state; - ctx->start = p; - ctx->pos = p; + ctx->pos = p + 1; + ctx->looked = looked; + ctx->copy_end = copy_end; + + if (ctx->copy_start == NULL && copy_end) { + ctx->copy_start = ctx->buf->pos; + } return NGX_OK; default: - ctx->last = last; - ctx->pos = p; - ctx->state = ssi_error_state; - - return NGX_HTTP_SSI_INVALID_COMMAND; + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "unexpected \"%c\" symbol in \"%V\" SSI command", + ch, &ctx->command); + state = ssi_error_state; + break; } break; @@ -963,10 +1004,15 @@ ngx_http_ssi_parse(ngx_http_request_t *r switch (ch) { case '>': ctx->state = ssi_start_state; - ctx->start = p; - ctx->pos = p; + ctx->pos = p + 1; + ctx->looked = looked; + ctx->copy_end = copy_end; - return NGX_AGAIN; + if (ctx->copy_start == NULL && copy_end) { + ctx->copy_start = ctx->buf->pos; + } + + return NGX_HTTP_SSI_ERROR; default: state = ssi_error_state; @@ -978,21 +1024,115 @@ ngx_http_ssi_parse(ngx_http_request_t *r } ctx->state = state; - ctx->last = last; ctx->pos = p; + ctx->looked = looked; - return NGX_HTTP_SSI_COPY; + ctx->copy_end = (state == ssi_start_state) ? p : copy_end; + + if (ctx->copy_start == NULL && ctx->copy_end) { + ctx->copy_start = ctx->buf->pos; + } + + return NGX_AGAIN; } -static ngx_int_t ngx_http_ssi_echo(ngx_http_request_t *r, - ngx_http_ssi_ctx_t *ctx) +static ngx_int_t +ngx_http_ssi_echo(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx, + ngx_str_t **params) { + u_char ch; + ngx_uint_t i, n; + ngx_buf_t *b; + ngx_str_t *var, *value; + ngx_chain_t *cl; + ngx_list_part_t *part; + ngx_table_elt_t *header; + + var = params[NGX_HTTP_SSI_ECHO_VAR]; + value = NULL; + + if (var->len > 5 && ngx_strncmp(var->data, "HTTP_", 5) == 0) { + + part = &r->headers_in.headers.part; + header = part->elts; + + for (i = 0; /* void */ ; i++) { + + if (i >= part->nelts) { + if (part->next == NULL) { + break; + } + + part = part->next; + header = part->elts; + i = 0; + } + + for (n = 0; n + 5 < var->len && n < header[i].key.len; n++) + { + ch = header[i].key.data[n]; + + if (ch >= 'a' && ch <= 'z') { + ch &= ~0x20; + + } else if (ch == '-') { + ch = '_'; + } + + if (var->data[n + 5] != ch) { + break; + } + } + + if (n + 5 == var->len) { + value = &header[i].value; + break; + } + } + + } else if (var->len == sizeof("REMOTE_ADDR") - 1 + && ngx_strncmp(var->data, "REMOTE_ADDR", + sizeof("REMOTE_ADDR") - 1) == 0) + { + value = &r->connection->addr_text; + } + + + if (value == NULL) { + value = params[NGX_HTTP_SSI_ECHO_DEFAULT]; + } + + if (value == NULL) { + value = &ngx_http_ssi_none; + + } else if (value->len == 0) { + return NGX_OK; + } + + if (!(b = ngx_calloc_buf(r->pool))) { + return NGX_HTTP_SSI_ERROR; + } + + if (!(cl = ngx_alloc_chain_link(r->pool))) { + return NGX_HTTP_SSI_ERROR; + } + + b->memory = 1; + b->pos = value->data; + b->last = value->data + value->len; + + cl->buf = b; + cl->next = NULL; + *ctx->last_out = cl; + ctx->last_out = &cl->next; + return NGX_OK; } -static void *ngx_http_ssi_create_conf(ngx_conf_t *cf) +static void * +ngx_http_ssi_create_conf(ngx_conf_t *cf) { ngx_http_ssi_conf_t *conf; @@ -1001,26 +1141,33 @@ static void *ngx_http_ssi_create_conf(ng } conf->enable = NGX_CONF_UNSET; + conf->silent_errors = NGX_CONF_UNSET; + + conf->min_file_chunk = NGX_CONF_UNSET_SIZE; conf->value_len = NGX_CONF_UNSET_SIZE; return conf; } -static char *ngx_http_ssi_merge_conf(ngx_conf_t *cf, - void *parent, void *child) +static char * +ngx_http_ssi_merge_conf(ngx_conf_t *cf, void *parent, void *child) { ngx_http_ssi_conf_t *prev = parent; ngx_http_ssi_conf_t *conf = child; ngx_conf_merge_value(conf->enable, prev->enable, 0); + ngx_conf_merge_value(conf->silent_errors, prev->silent_errors, 0); + + ngx_conf_merge_size_value(conf->min_file_chunk, prev->min_file_chunk, 1024); ngx_conf_merge_size_value(conf->value_len, prev->value_len, 256); return NGX_CONF_OK; } -static int ngx_http_ssi_filter_init(ngx_cycle_t *cycle) +static ngx_int_t +ngx_http_ssi_filter_init(ngx_cycle_t *cycle) { ngx_http_next_header_filter = ngx_http_top_header_filter; ngx_http_top_header_filter = ngx_http_ssi_header_filter;
--- a/src/http/modules/proxy/ngx_http_proxy_upstream.c +++ b/src/http/modules/proxy/ngx_http_proxy_upstream.c @@ -145,10 +145,18 @@ static ngx_chain_t *ngx_http_proxy_creat } - if (p->lcf->preserve_host && r->headers_in.host) { - len += sizeof(host_header) - 1 - + r->headers_in.host_name_len + sizeof(":") - 1 + uc->port_text.len - + sizeof(CRLF) - 1; + if (p->lcf->preserve_host) { + if (r->headers_in.host) { + len += sizeof(host_header) - 1 + + r->headers_in.host_name_len + sizeof(":") - 1 + + uc->port_text.len + sizeof(CRLF) - 1; + + } else { + len += sizeof(host_header) - 1 + + r->server_name.len + sizeof(":") - 1 + + uc->port_text.len + sizeof(CRLF) - 1; + } + } else { len += sizeof(host_header) - 1 + uc->host_header.len + sizeof(CRLF) - 1; @@ -278,9 +286,14 @@ static ngx_chain_t *ngx_http_proxy_creat b->last = ngx_cpymem(b->last, host_header, sizeof(host_header) - 1); - if (p->lcf->preserve_host && r->headers_in.host) { - b->last = ngx_cpymem(b->last, r->headers_in.host->value.data, - r->headers_in.host_name_len); + if (p->lcf->preserve_host) { + if (r->headers_in.host) { + b->last = ngx_cpymem(b->last, r->headers_in.host->value.data, + r->headers_in.host_name_len); + } else { + b->last = ngx_cpymem(b->last, r->server_name.data, + r->server_name.len); + } if (!uc->default_port) { *b->last++ = ':';
--- a/src/http/ngx_http_log_handler.c +++ b/src/http/ngx_http_log_handler.c @@ -11,93 +11,91 @@ static u_char *ngx_http_log_addr(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op); + ngx_http_log_op_t *op); static u_char *ngx_http_log_connection(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op); + ngx_http_log_op_t *op); static u_char *ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op); + ngx_http_log_op_t *op); static u_char *ngx_http_log_time(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op); + ngx_http_log_op_t *op); static u_char *ngx_http_log_msec(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op); + ngx_http_log_op_t *op); +static u_char *ngx_http_log_request_time(ngx_http_request_t *r, u_char *buf, + ngx_http_log_op_t *op); static u_char *ngx_http_log_status(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op); + ngx_http_log_op_t *op); static u_char *ngx_http_log_length(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op); + ngx_http_log_op_t *op); static u_char *ngx_http_log_apache_length(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op); + ngx_http_log_op_t *op); static u_char *ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op); + ngx_http_log_op_t *op); static size_t ngx_http_log_request_getlen(ngx_http_request_t *r, - uintptr_t data); + uintptr_t data); static u_char *ngx_http_log_request(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op); + ngx_http_log_op_t *op); static ngx_int_t ngx_http_log_header_in_compile(ngx_http_log_op_t *op, - ngx_str_t *value); + ngx_str_t *value); static size_t ngx_http_log_header_in_getlen(ngx_http_request_t *r, - uintptr_t data); + uintptr_t data); static u_char *ngx_http_log_header_in(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op); + ngx_http_log_op_t *op); static size_t ngx_http_log_unknown_header_in_getlen(ngx_http_request_t *r, - uintptr_t data); + uintptr_t data); static u_char *ngx_http_log_unknown_header_in(ngx_http_request_t *r, - u_char *buf, - ngx_http_log_op_t *op); + u_char *buf, ngx_http_log_op_t *op); static ngx_int_t ngx_http_log_header_out_compile(ngx_http_log_op_t *op, - ngx_str_t *value); + ngx_str_t *value); static size_t ngx_http_log_header_out_getlen(ngx_http_request_t *r, - uintptr_t data); + uintptr_t data); static u_char *ngx_http_log_header_out(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op); + ngx_http_log_op_t *op); static size_t ngx_http_log_unknown_header_out_getlen(ngx_http_request_t *r, - uintptr_t data); + uintptr_t data); static u_char *ngx_http_log_unknown_header_out(ngx_http_request_t *r, - u_char *buf, - ngx_http_log_op_t *op); + u_char *buf, ngx_http_log_op_t *op); static u_char *ngx_http_log_connection_header_out(ngx_http_request_t *r, - u_char *buf, - ngx_http_log_op_t *op); + u_char *buf, ngx_http_log_op_t *op); static u_char *ngx_http_log_transfer_encoding_header_out(ngx_http_request_t *r, - u_char *buf, - ngx_http_log_op_t *op); + u_char *buf, ngx_http_log_op_t *op); static ngx_table_elt_t *ngx_http_log_unknown_header(ngx_list_t *headers, - ngx_str_t *value); + ngx_str_t *value); static ngx_int_t ngx_http_log_set_formats(ngx_conf_t *cf); static void *ngx_http_log_create_main_conf(ngx_conf_t *cf); static void *ngx_http_log_create_loc_conf(ngx_conf_t *cf); static char *ngx_http_log_merge_loc_conf(ngx_conf_t *cf, void *parent, - void *child); + void *child); static char *ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, - void *conf); + void *conf); static char *ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, - void *conf); + void *conf); static ngx_int_t ngx_http_log_parse_format(ngx_conf_t *cf, ngx_array_t *ops, - ngx_str_t *line); + ngx_str_t *line); static ngx_command_t ngx_http_log_commands[] = { - {ngx_string("log_format"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_2MORE, - ngx_http_log_set_format, - NGX_HTTP_MAIN_CONF_OFFSET, - 0, - NULL}, + { ngx_string("log_format"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_2MORE, + ngx_http_log_set_format, + NGX_HTTP_MAIN_CONF_OFFSET, + 0, + NULL }, - {ngx_string("access_log"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12, - ngx_http_log_set_log, - NGX_HTTP_LOC_CONF_OFFSET, - 0, - NULL}, + { ngx_string("access_log"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12, + ngx_http_log_set_log, + NGX_HTTP_LOC_CONF_OFFSET, + 0, + NULL }, - ngx_null_command + ngx_null_command }; @@ -141,6 +139,8 @@ ngx_http_log_op_name_t ngx_http_log_fmt_ { ngx_string("time"), sizeof("28/Sep/1970:12:00:00 +0600") - 1, NULL, NULL, ngx_http_log_time }, { ngx_string("msec"), NGX_TIME_T_LEN + 4, NULL, NULL, ngx_http_log_msec }, + { ngx_string("request_time"), NGX_TIME_T_LEN, NULL, NULL, + ngx_http_log_request_time }, { ngx_string("status"), 3, NULL, NULL, ngx_http_log_status }, { ngx_string("length"), NGX_OFF_T_LEN, NULL, NULL, ngx_http_log_length }, { ngx_string("apache_length"), NGX_OFF_T_LEN, @@ -164,7 +164,8 @@ ngx_http_log_op_name_t ngx_http_log_fmt_ }; -ngx_int_t ngx_http_log_handler(ngx_http_request_t *r) +ngx_int_t +ngx_http_log_handler(ngx_http_request_t *r) { ngx_uint_t i, l; u_char *line, *p; @@ -228,8 +229,9 @@ ngx_int_t ngx_http_log_handler(ngx_http_ } -static u_char *ngx_http_log_copy_short(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_copy_short(ngx_http_request_t *r, u_char *buf, + ngx_http_log_op_t *op) { size_t len; uintptr_t data; @@ -246,30 +248,32 @@ static u_char *ngx_http_log_copy_short(n } -static u_char *ngx_http_log_copy_long(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_copy_long(ngx_http_request_t *r, u_char *buf, + ngx_http_log_op_t *op) { return ngx_cpymem(buf, (u_char *) op->data, op->len); } -static u_char *ngx_http_log_addr(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_addr(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) { return ngx_cpymem(buf, r->connection->addr_text.data, r->connection->addr_text.len); } -static u_char *ngx_http_log_connection(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_connection(ngx_http_request_t *r, u_char *buf, + ngx_http_log_op_t *op) { return ngx_sprintf(buf, "%ui", r->connection->number); } -static u_char *ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) { if (r->pipeline) { *buf = 'p'; @@ -281,16 +285,16 @@ static u_char *ngx_http_log_pipe(ngx_htt } -static u_char *ngx_http_log_time(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_time(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) { return ngx_cpymem(buf, ngx_cached_http_log_time.data, ngx_cached_http_log_time.len); } -static u_char *ngx_http_log_msec(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_msec(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) { struct timeval tv; @@ -300,51 +304,75 @@ static u_char *ngx_http_log_msec(ngx_htt } -static size_t ngx_http_log_request_getlen(ngx_http_request_t *r, - uintptr_t data) +static u_char * +ngx_http_log_request_time(ngx_http_request_t *r, u_char *buf, + ngx_http_log_op_t *op) +{ + time_t elapsed; + + elapsed = ngx_time() - r->start_time; + + return ngx_sprintf(buf, "%T", elapsed); +} + + +static size_t +ngx_http_log_request_getlen(ngx_http_request_t *r, uintptr_t data) { return r->request_line.len; } -static u_char *ngx_http_log_request(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_request(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) { return ngx_cpymem(buf, r->request_line.data, r->request_line.len); } -static u_char *ngx_http_log_status(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_status(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) { return ngx_sprintf(buf, "%ui", r->err_status ? r->err_status : r->headers_out.status); } -static u_char *ngx_http_log_length(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_length(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) { return ngx_sprintf(buf, "%O", r->connection->sent); } -static u_char *ngx_http_log_apache_length(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_apache_length(ngx_http_request_t *r, u_char *buf, + ngx_http_log_op_t *op) { - return ngx_sprintf(buf, "%O", r->connection->sent - r->header_size); + off_t length; + + length = r->connection->sent - r->header_size; + + if (length > 0) { + return ngx_sprintf(buf, "%O", length); + } + + *buf = '0'; + + return buf + 1; } -static u_char *ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf, + ngx_http_log_op_t *op) { return ngx_sprintf(buf, "%z", r->request_length); } -static ngx_int_t ngx_http_log_header_in_compile(ngx_http_log_op_t *op, - ngx_str_t *value) +static ngx_int_t +ngx_http_log_header_in_compile(ngx_http_log_op_t *op, ngx_str_t *value) { ngx_uint_t i; @@ -375,8 +403,8 @@ static ngx_int_t ngx_http_log_header_in_ } -static size_t ngx_http_log_header_in_getlen(ngx_http_request_t *r, - uintptr_t data) +static size_t +ngx_http_log_header_in_getlen(ngx_http_request_t *r, uintptr_t data) { ngx_table_elt_t *h; @@ -390,8 +418,9 @@ static size_t ngx_http_log_header_in_get } -static u_char *ngx_http_log_header_in(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_header_in(ngx_http_request_t *r, u_char *buf, + ngx_http_log_op_t *op) { ngx_table_elt_t *h; @@ -407,8 +436,8 @@ static u_char *ngx_http_log_header_in(ng } -static size_t ngx_http_log_unknown_header_in_getlen(ngx_http_request_t *r, - uintptr_t data) +static size_t +ngx_http_log_unknown_header_in_getlen(ngx_http_request_t *r, uintptr_t data) { ngx_table_elt_t *h; @@ -422,9 +451,9 @@ static size_t ngx_http_log_unknown_heade } -static u_char *ngx_http_log_unknown_header_in(ngx_http_request_t *r, - u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_unknown_header_in(ngx_http_request_t *r, u_char *buf, + ngx_http_log_op_t *op) { ngx_table_elt_t *h; @@ -441,8 +470,8 @@ static u_char *ngx_http_log_unknown_head } -static ngx_int_t ngx_http_log_header_out_compile(ngx_http_log_op_t *op, - ngx_str_t *value) +static ngx_int_t +ngx_http_log_header_out_compile(ngx_http_log_op_t *op, ngx_str_t *value) { ngx_uint_t i; @@ -455,7 +484,7 @@ static ngx_int_t ngx_http_log_header_out } if (ngx_strncasecmp(ngx_http_headers_out[i].name.data, value->data, - value->len) == 0) + value->len) == 0) { op->getlen = ngx_http_log_header_out_getlen; op->run = ngx_http_log_header_out; @@ -493,8 +522,8 @@ static ngx_int_t ngx_http_log_header_out } -static size_t ngx_http_log_header_out_getlen(ngx_http_request_t *r, - uintptr_t data) +static size_t +ngx_http_log_header_out_getlen(ngx_http_request_t *r, uintptr_t data) { ngx_table_elt_t *h; @@ -540,8 +569,9 @@ static size_t ngx_http_log_header_out_ge } -static u_char *ngx_http_log_header_out(ngx_http_request_t *r, u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_header_out(ngx_http_request_t *r, u_char *buf, + ngx_http_log_op_t *op) { ngx_table_elt_t *h; @@ -594,8 +624,8 @@ static u_char *ngx_http_log_header_out(n } -static size_t ngx_http_log_unknown_header_out_getlen(ngx_http_request_t *r, - uintptr_t data) +static size_t +ngx_http_log_unknown_header_out_getlen(ngx_http_request_t *r, uintptr_t data) { ngx_table_elt_t *h; @@ -610,9 +640,9 @@ static size_t ngx_http_log_unknown_heade } -static u_char *ngx_http_log_unknown_header_out(ngx_http_request_t *r, - u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_unknown_header_out(ngx_http_request_t *r, u_char *buf, + ngx_http_log_op_t *op) { ngx_table_elt_t *h; @@ -629,8 +659,8 @@ static u_char *ngx_http_log_unknown_head } -static ngx_table_elt_t *ngx_http_log_unknown_header(ngx_list_t *headers, - ngx_str_t *value) +static ngx_table_elt_t * +ngx_http_log_unknown_header(ngx_list_t *headers, ngx_str_t *value) { ngx_uint_t i; ngx_list_part_t *part; @@ -664,9 +694,9 @@ static ngx_table_elt_t *ngx_http_log_unk } -static u_char *ngx_http_log_connection_header_out(ngx_http_request_t *r, - u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_connection_header_out(ngx_http_request_t *r, u_char *buf, + ngx_http_log_op_t *op) { if (r->keepalive) { return ngx_cpymem(buf, "keep-alive", sizeof("keep-alive") - 1); @@ -677,9 +707,9 @@ static u_char *ngx_http_log_connection_h } -static u_char *ngx_http_log_transfer_encoding_header_out(ngx_http_request_t *r, - u_char *buf, - ngx_http_log_op_t *op) +static u_char * +ngx_http_log_transfer_encoding_header_out(ngx_http_request_t *r, u_char *buf, + ngx_http_log_op_t *op) { if (r->chunked) { return ngx_cpymem(buf, "chunked", sizeof("chunked") - 1); @@ -691,7 +721,8 @@ static u_char *ngx_http_log_transfer_enc } -static ngx_int_t ngx_http_log_set_formats(ngx_conf_t *cf) +static ngx_int_t +ngx_http_log_set_formats(ngx_conf_t *cf) { ngx_http_log_op_name_t *op; @@ -702,7 +733,8 @@ static ngx_int_t ngx_http_log_set_format } -static void *ngx_http_log_create_main_conf(ngx_conf_t *cf) +static void * +ngx_http_log_create_main_conf(ngx_conf_t *cf) { ngx_http_log_main_conf_t *conf; @@ -713,23 +745,26 @@ static void *ngx_http_log_create_main_co return NGX_CONF_ERROR; } - ngx_init_array(conf->formats, cf->pool, 5, sizeof(ngx_http_log_fmt_t), - NGX_CONF_ERROR); + if (ngx_array_init(&conf->formats, cf->pool, 4, sizeof(ngx_http_log_fmt_t)) + == NGX_ERROR) + { + return NGX_CONF_ERROR; + } cf->args->nelts = 0; - if (!(value = ngx_push_array(cf->args))) { + if (!(value = ngx_array_push(cf->args))) { return NGX_CONF_ERROR; } - if (!(value = ngx_push_array(cf->args))) { + if (!(value = ngx_array_push(cf->args))) { return NGX_CONF_ERROR; } value->len = sizeof("combined") - 1; value->data = (u_char *) "combined"; - if (!(value = ngx_push_array(cf->args))) { + if (!(value = ngx_array_push(cf->args))) { return NGX_CONF_ERROR; } @@ -744,7 +779,8 @@ static void *ngx_http_log_create_main_co } -static void *ngx_http_log_create_loc_conf(ngx_conf_t *cf) +static void * +ngx_http_log_create_loc_conf(ngx_conf_t *cf) { ngx_http_log_loc_conf_t *conf; @@ -756,8 +792,8 @@ static void *ngx_http_log_create_loc_con } -static char *ngx_http_log_merge_loc_conf(ngx_conf_t *cf, void *parent, - void *child) +static char * +ngx_http_log_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) { ngx_http_log_loc_conf_t *prev = parent; ngx_http_log_loc_conf_t *conf = child; @@ -808,8 +844,8 @@ static char *ngx_http_log_merge_loc_conf } -static char *ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, - void *conf) +static char * +ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) { ngx_http_log_loc_conf_t *llcf = conf; @@ -867,8 +903,8 @@ static char *ngx_http_log_set_log(ngx_co } -static char *ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, - void *conf) +static char * +ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) { ngx_http_log_main_conf_t *lmcf = conf;
--- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -422,6 +422,8 @@ static void ngx_http_init_request(ngx_ev c->single_connection = 1; r->connection = c; + r->start_time = ngx_time(); + r->file.fd = NGX_INVALID_FILE; r->headers_in.content_length_n = -1;
--- a/src/http/ngx_http_request.h +++ b/src/http/ngx_http_request.h @@ -275,7 +275,8 @@ struct ngx_http_request_s { ngx_http_request_body_t *request_body; - time_t lingering_time; + time_t lingering_time; + time_t start_time; ngx_uint_t method; ngx_uint_t http_version;
--- a/src/os/unix/ngx_atomic.h +++ b/src/os/unix/ngx_atomic.h @@ -388,6 +388,7 @@ ngx_atomic_cmp_set(ngx_atomic_t *lock, n typedef int32_t ngx_atomic_int_t; typedef uint32_t ngx_atomic_uint_t; typedef volatile ngx_atomic_uint_t ngx_atomic_t; +#define NGX_ATOMIC_T_LEN sizeof("-2147483648") - 1 #define ngx_atomic_inc(x) ++(*(x)) #define ngx_atomic_dec(x) --(*(x))
--- a/src/os/unix/ngx_files.h +++ b/src/os/unix/ngx_files.h @@ -18,7 +18,7 @@ #define ngx_open_file(name, access, create) \ - open((const char *) name, access|create, 0644) + open((const char *) name, access|create, 0644) #define ngx_open_file_n "open()" #define NGX_FILE_RDONLY O_RDONLY @@ -46,10 +46,10 @@ ssize_t ngx_read_file(ngx_file_t *file, ssize_t ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, - off_t offset); + off_t offset); ssize_t ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *ce, - off_t offset, ngx_pool_t *pool); + off_t offset, ngx_pool_t *pool); #define ngx_rename_file rename @@ -86,7 +86,7 @@ ngx_int_t ngx_open_dir(ngx_str_t *name, #define ngx_read_dir(d) \ - (((d)->de = readdir((d)->dir)) ? NGX_OK : NGX_ERROR) + (((d)->de = readdir((d)->dir)) ? NGX_OK : NGX_ERROR) #define ngx_read_dir_n "readdir()" @@ -104,10 +104,13 @@ ngx_int_t ngx_open_dir(ngx_str_t *name, #else #define ngx_de_namelen(dir) ngx_strlen((dir)->de->d_name) #endif -#define ngx_de_info(name, dir) lstat((const char *) name, &(dir)->info) +#define ngx_de_info(name, dir) stat((const char *) name, &(dir)->info) #define ngx_de_info_n "stat()" +#define ngx_de_link_info(name, dir) lstat((const char *) name, &(dir)->info) +#define ngx_de_link_info_n "lstat()" #define ngx_de_is_dir(dir) (S_ISDIR((dir)->info.st_mode)) #define ngx_de_is_file(dir) (S_ISREG((dir)->info.st_mode)) +#define ngx_de_is_link(dir) (S_ISLNK((dir)->info.st_mode)) #define ngx_de_size(dir) (dir)->info.st_size #define ngx_de_mtime(dir) (dir)->info.st_mtime
--- a/src/os/win32/ngx_atomic.h +++ b/src/os/win32/ngx_atomic.h @@ -14,8 +14,9 @@ #define NGX_HAVE_ATOMIC_OPS 1 -typedef uint32_t ngx_atomic_int_t; -typedef volatile ngx_atomic_int_t ngx_atomic_t; +typedef int32_t ngx_atomic_int_t; +typedef uint32_t ngx_atomic_uint_t; +typedef volatile ngx_atomic_uint_t ngx_atomic_t; #define NGX_ATOMIC_T_LEN sizeof("-2147483648") - 1
--- a/src/os/win32/ngx_files.h +++ b/src/os/win32/ngx_files.h @@ -29,11 +29,11 @@ #define ngx_open_file(name, access, create) \ - CreateFile((const char *) name, access, \ - FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, \ - NULL, create, FILE_FLAG_BACKUP_SEMANTICS, NULL) + CreateFile((const char *) name, access, \ + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, \ + NULL, create, FILE_FLAG_BACKUP_SEMANTICS, NULL) /* - NULL, OPEN_EXISTING, 0, NULL) + NULL, OPEN_EXISTING, 0, NULL) */ #define ngx_open_file_n "CreateFile()" @@ -49,14 +49,14 @@ ngx_int_t ngx_file_append_mode(ngx_fd_t #define ngx_open_tempfile(name, persistent) \ - CreateFile((const char *) name, \ - GENERIC_READ|GENERIC_WRITE, \ - FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, \ - NULL, \ - CREATE_NEW, \ - persistent ? 0: \ - FILE_ATTRIBUTE_TEMPORARY|FILE_FLAG_DELETE_ON_CLOSE, \ - NULL); + CreateFile((const char *) name, \ + GENERIC_READ|GENERIC_WRITE, \ + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, \ + NULL, \ + CREATE_NEW, \ + persistent ? 0: \ + FILE_ATTRIBUTE_TEMPORARY|FILE_FLAG_DELETE_ON_CLOSE, \ + NULL); #define ngx_open_tempfile_n "CreateFile()" @@ -72,7 +72,7 @@ ngx_int_t ngx_file_append_mode(ngx_fd_t #define ngx_rename_file MoveFile #define ngx_rename_file_n "MoveFile()" ngx_int_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, - ngx_pool_t *pool); + ngx_pool_t *pool); ngx_int_t ngx_file_info(u_char *filename, ngx_file_info_t *fi); @@ -88,7 +88,7 @@ ngx_int_t ngx_file_info(u_char *filename #define ngx_file_size(fi) \ - (((off_t) (fi)->nFileSizeHigh << 32) | (fi)->nFileSizeLow) + (((off_t) (fi)->nFileSizeHigh << 32) | (fi)->nFileSizeLow) #define ngx_file_uniq(fi) (*(ngx_file_uniq_t *) &(fi)->nFileIndexHigh) @@ -134,17 +134,20 @@ ngx_int_t ngx_read_dir(ngx_dir_t *dir); #define ngx_de_namelen(dir) ngx_strlen((dir)->fd.cFileName) #define ngx_de_info(name, dir) NGX_OK #define ngx_de_info_n "dummy()" +#define ngx_de_link_info(name, dir) NGX_OK +#define ngx_de_link_info_n "dummy()" #define ngx_de_is_dir(dir) \ - ((dir)->fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + ((dir)->fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) #define ngx_de_is_file(dir) \ - !((dir)->fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + !((dir)->fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) +#define ngx_de_is_link(dir) 0 #define ngx_de_size(dir) \ - (((off_t) (dir)->fd.nFileSizeHigh << 32) | (dir)->fd.nFileSizeLow) + (((off_t) (dir)->fd.nFileSizeHigh << 32) | (dir)->fd.nFileSizeLow) /* 116444736000000000 is commented in src/os/win32/ngx_time.c */ #define ngx_de_mtime(dir) \ - (time_t) (((((unsigned __int64) \ + (time_t) (((((unsigned __int64) \ (dir)->fd.ftLastWriteTime.dwHighDateTime << 32) \ | (dir)->fd.ftLastWriteTime.dwLowDateTime) \ - 116444736000000000) / 10000000) @@ -155,10 +158,10 @@ ssize_t ngx_read_file(ngx_file_t *file, #define ngx_read_file_n "ReadFile()" ssize_t ngx_write_file(ngx_file_t *file, u_char *buf, size_t size, - off_t offset); + off_t offset); ssize_t ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *ce, - off_t offset, ngx_pool_t *pool); + off_t offset, ngx_pool_t *pool); #endif /* _NGX_FILES_H_INCLUDED_ */