Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 3636:446f611b0a79
Test regex location if URI matches exactly to non-exact location.
Revert a feature introduced in r2028. The feature confuses mostly,
the only gain was not to test regex for a frequent request such as
"/" in "locaiton /".
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Fri, 18 Jun 2010 15:38:31 +0000 |
| parents | 40e356cf4176 |
| children | a870639d2970 |
comparison
equal
deleted
inserted
replaced
| 3635:c0113b6648de | 3636:446f611b0a79 |
|---|---|
| 1588 continue; | 1588 continue; |
| 1589 } | 1589 } |
| 1590 | 1590 |
| 1591 if (len == (size_t) node->len) { | 1591 if (len == (size_t) node->len) { |
| 1592 | 1592 |
| 1593 r->loc_conf = (node->exact) ? node->exact->loc_conf: | 1593 if (node->exact) { |
| 1594 node->inclusive->loc_conf; | 1594 r->loc_conf = node->exact->loc_conf; |
| 1595 return NGX_OK; | 1595 return NGX_OK; |
| 1596 | |
| 1597 } else { | |
| 1598 r->loc_conf = node->inclusive->loc_conf; | |
| 1599 return NGX_AGAIN; | |
| 1600 } | |
| 1596 } | 1601 } |
| 1597 | 1602 |
| 1598 /* len < node->len */ | 1603 /* len < node->len */ |
| 1599 | 1604 |
| 1600 if (len + 1 == (size_t) node->len && node->auto_redirect) { | 1605 if (len + 1 == (size_t) node->len && node->auto_redirect) { |