Mercurial > hg > nginx-vendor-0-6

comparison src/http/ngx_http_special_response.c @ 372:6639b93e81b2 NGINX_0_6_30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.6.30 *) Change: now if an "include" directive pattern does not match any file, then nginx does not issue an error. *) Feature: now the time in directives may be specified without spaces, for example, "1h50m". *) Bugfix: memory leaks if the "ssl_verify_client" directive was on. Thanks to Chavelle Vincent. *) Bugfix: the "sub_filter" directive might set text to change into output. *) Bugfix: the "error_page" directive did not take into account arguments in redirected URI. *) Bugfix: now nginx always opens files in binary mode under Cygwin. *) Bugfix: nginx could not be built on OpenBSD; bug appeared in 0.6.15.
author Igor Sysoev <http://sysoev.ru>
date Tue, 29 Apr 2008 00:00:00 +0400
parents babd3d9efb62
children d13234035cad
comparison
equal deleted inserted replaced
371:b6a2a305fdad 372:6639b93e81b2
439 439
440 r->err_status = err_page->overwrite; 440 r->err_status = err_page->overwrite;
441 441
442 r->zero_in_uri = 0; 442 r->zero_in_uri = 0;
443 443
444 args = NULL;
445
446 if (err_page->uri_lengths) { 444 if (err_page->uri_lengths) {
447 if (ngx_http_script_run(r, &u, err_page->uri_lengths->elts, 0, 445 if (ngx_http_script_run(r, &u, err_page->uri_lengths->elts, 0,
448 err_page->uri_values->elts) 446 err_page->uri_values->elts)
449 == NULL) 447 == NULL)
450 { 448 {
451 return NGX_ERROR; 449 return NGX_ERROR;
452 } 450 }
453 451
454 p = u.data; 452 p = u.data;
455 uri = &u; 453 uri = &u;
454 args = NULL;
456 455
457 if (*p == '/') { 456 if (*p == '/') {
458 457
459 last = p + uri->len; 458 last = p + uri->len;
460 459
486 } 485 }
487 } 486 }
488 487
489 } else { 488 } else {
490 uri = &err_page->uri; 489 uri = &err_page->uri;
490 args = &err_page->args;
491 } 491 }
492 492
493 if (uri->data[0] == '/') { 493 if (uri->data[0] == '/') {
494 494
495 r->method = NGX_HTTP_GET; 495 r->method = NGX_HTTP_GET;