Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_core_module.c @ 526:0161f3197817 NGINX_0_8_15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.15 *) Security: a segmentation fault might occur in worker process while specially crafted request handling. Thanks to Chris Ries. *) Bugfix: if names .domain.tld, .sub.domain.tld, and .domain-some.tld were defined, then the name .sub.domain.tld was matched by .domain.tld. *) Bugfix: in transparency support in the ngx_http_image_filter_module. *) Bugfix: in file AIO. *) Bugfix: in X-Accel-Redirect usage; the bug had appeared in 0.8.11. *) Bugfix: in embedded perl module; the bug had appeared in 0.8.11.
author Igor Sysoev <http://sysoev.ru>
date Mon, 14 Sep 2009 00:00:00 +0400
parents 80f7156c2965
children 4c5d2c627a6c
comparison
equal deleted inserted replaced
525:1b64f9884263 526:0161f3197817
992 if (r->uri_changes == 0) { 992 if (r->uri_changes == 0) {
993 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, 993 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
994 "rewrite or internal redirection cycle " 994 "rewrite or internal redirection cycle "
995 "while processing \"%V\"", &r->uri); 995 "while processing \"%V\"", &r->uri);
996 996
997 r->main->count++;
997 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); 998 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
998 return NGX_OK; 999 return NGX_OK;
999 } 1000 }
1000 1001
1001 r->phase_handler = ph->next; 1002 r->phase_handler = ph->next;
2170 if (r->uri_changes == 0) { 2171 if (r->uri_changes == 0) {
2171 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, 2172 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
2172 "rewrite or internal redirection cycle " 2173 "rewrite or internal redirection cycle "
2173 "while internal redirect to \"%V\"", uri); 2174 "while internal redirect to \"%V\"", uri);
2174 2175
2176 r->main->count++;
2175 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); 2177 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
2176 return NGX_DONE; 2178 return NGX_DONE;
2177 } 2179 }
2178 2180
2179 r->uri = *uri; 2181 r->uri = *uri;
3547 #if (NGX_PCRE) 3549 #if (NGX_PCRE)
3548 { 3550 {
3549 ngx_str_t err; 3551 ngx_str_t err;
3550 u_char errstr[NGX_MAX_CONF_ERRSTR]; 3552 u_char errstr[NGX_MAX_CONF_ERRSTR];
3551 3553
3554 if (value[i].len == 1) {
3555 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3556 "empty regex in server name \"%V\"", &value[i]);
3557 return NGX_CONF_ERROR;
3558 }
3559
3552 err.len = NGX_MAX_CONF_ERRSTR; 3560 err.len = NGX_MAX_CONF_ERRSTR;
3553 err.data = errstr; 3561 err.data = errstr;
3554 3562
3555 value[i].len--; 3563 value[i].len--;
3556 value[i].data++; 3564 value[i].data++;