comparison src/http/modules/ngx_http_ssi_filter_module.c @ 328:26ff8d6b618d NGINX_0_5_34

nginx 0.5.34 *) Change: now the full request line instead of URI only is written to error_log. *) Feature: Cygwin compatibility. Thanks to Vladimir Kutakov. *) Feature: the "merge_slashes" directive. *) Feature: the "gzip_vary" directive. *) Feature: the "server_tokens" directive. *) Feature: the "access_log" directive may be used inside the "limit_except" block. *) Bugfix: if the $server_protocol was used in FastCGI parameters and a request line length was near to the "client_header_buffer_size" directive value, then nginx issued an alert "fastcgi: the request record is too big". *) Bugfix: if a plain text HTTP/0.9 version request was made to HTTPS server, then nginx returned usual response. *) Bugfix: URL double escaping in a redirect of the "msie_refresh" directive; bug appeared in 0.5.28. *) Bugfix: a segmentation fault might occur in worker process if subrequests were used. *) Bugfix: the big responses may be transferred truncated if SSL and gzip were used. *) Bugfix: compatibility with mget. *) Bugfix: nginx did not unescape URI in the "include" SSI command. *) Bugfix: the segmentation fault was occurred on start or while reconfiguration if variable was used in the "charset" or "source_charset" directives. *) Bugfix: nginx returned the 400 response on requests like "GET http://www.domain.com HTTP/1.0". Thanks to James Oakley. *) Bugfix: a segmentation fault occurred in worker process if $date_local and $date_gmt were used outside the ngx_http_ssi_filter_module. *) Bugfix: a segmentation fault might occur in worker process if debug log was enabled. Thanks to Andrei Nigmatulin. *) Bugfix: ngx_http_memcached_module did not set $upstream_response_time. Thanks to Maxim Dounin. *) Bugfix: a worker process may got caught in an endless loop, if the memcached was used.
author Igor Sysoev <http://sysoev.ru>
date Thu, 13 Dec 2007 00:00:00 +0300
parents f70f2f565fe0
children 2eea67ed0bc2
comparison
equal deleted inserted replaced
327:cb962a94cd7b 328:26ff8d6b618d
301 301
302 302
303 static ngx_http_variable_t ngx_http_ssi_vars[] = { 303 static ngx_http_variable_t ngx_http_ssi_vars[] = {
304 304
305 { ngx_string("date_local"), NULL, ngx_http_ssi_date_gmt_local_variable, 0, 305 { ngx_string("date_local"), NULL, ngx_http_ssi_date_gmt_local_variable, 0,
306 NGX_HTTP_VAR_NOCACHABLE, 0 }, 306 NGX_HTTP_VAR_NOCACHEABLE, 0 },
307 307
308 { ngx_string("date_gmt"), NULL, ngx_http_ssi_date_gmt_local_variable, 1, 308 { ngx_string("date_gmt"), NULL, ngx_http_ssi_date_gmt_local_variable, 1,
309 NGX_HTTP_VAR_NOCACHABLE, 0 }, 309 NGX_HTTP_VAR_NOCACHEABLE, 0 },
310 310
311 { ngx_null_string, NULL, NULL, 0, 0, 0 } 311 { ngx_null_string, NULL, NULL, 0, 0, 0 }
312 }; 312 };
313 313
314 314
1856 1856
1857 static ngx_int_t 1857 static ngx_int_t
1858 ngx_http_ssi_include(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx, 1858 ngx_http_ssi_include(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
1859 ngx_str_t **params) 1859 ngx_str_t **params)
1860 { 1860 {
1861 u_char *dst, *src;
1862 size_t len;
1861 ngx_int_t rc, key; 1863 ngx_int_t rc, key;
1862 ngx_str_t *uri, *file, *wait, *set, *stub, args; 1864 ngx_str_t *uri, *file, *wait, *set, *stub, args;
1863 ngx_buf_t *b; 1865 ngx_buf_t *b;
1864 ngx_uint_t flags, i; 1866 ngx_uint_t flags, i;
1865 ngx_chain_t *cl, *tl, **ll, *out; 1867 ngx_chain_t *cl, *tl, **ll, *out;
1925 1927
1926 if (rc != NGX_OK) { 1928 if (rc != NGX_OK) {
1927 return rc; 1929 return rc;
1928 } 1930 }
1929 1931
1932 dst = uri->data;
1933 src = uri->data;
1934
1935 ngx_unescape_uri(&dst, &src, uri->len, NGX_UNESCAPE_URI);
1936
1937 len = (uri->data + uri->len) - src;
1938 if (len) {
1939 dst = ngx_copy(dst, src, len);
1940 }
1941
1942 uri->len = dst - uri->data;
1943
1944 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
1945 "ssi include: \"%V\"", uri);
1946
1930 args.len = 0; 1947 args.len = 0;
1931 args.data = NULL; 1948 args.data = NULL;
1932 flags = 0; 1949 flags = 0;
1933
1934 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
1935 "ssi include: \"%V\"", uri);
1936 1950
1937 if (ngx_http_parse_unsafe_uri(r, uri, &args, &flags) != NGX_OK) { 1951 if (ngx_http_parse_unsafe_uri(r, uri, &args, &flags) != NGX_OK) {
1938 return NGX_HTTP_SSI_ERROR; 1952 return NGX_HTTP_SSI_ERROR;
1939 } 1953 }
1940 1954
2639 ngx_time_t *tp; 2653 ngx_time_t *tp;
2640 struct tm tm; 2654 struct tm tm;
2641 char buf[NGX_HTTP_SSI_DATE_LEN]; 2655 char buf[NGX_HTTP_SSI_DATE_LEN];
2642 2656
2643 v->valid = 1; 2657 v->valid = 1;
2644 v->no_cachable = 0; 2658 v->no_cacheable = 0;
2645 v->not_found = 0; 2659 v->not_found = 0;
2646 2660
2647 tp = ngx_timeofday(); 2661 tp = ngx_timeofday();
2648 2662
2649 ctx = ngx_http_get_module_ctx(r, ngx_http_ssi_filter_module); 2663 ctx = ngx_http_get_module_ctx(r, ngx_http_ssi_filter_module);
2650 2664
2651 if (ctx->timefmt.len == sizeof("%s") - 1 2665 if (ctx == NULL
2652 && ctx->timefmt.data[0] == '%' && ctx->timefmt.data[1] == 's') 2666 || (ctx->timefmt.len == sizeof("%s") - 1
2667 && ctx->timefmt.data[0] == '%' && ctx->timefmt.data[1] == 's'))
2653 { 2668 {
2654 v->data = ngx_palloc(r->pool, NGX_TIME_T_LEN); 2669 v->data = ngx_palloc(r->pool, NGX_TIME_T_LEN);
2655 if (v->data == NULL) { 2670 if (v->data == NULL) {
2656 return NGX_ERROR; 2671 return NGX_ERROR;
2657 } 2672 }