Mercurial > hg > nginx-ranges
comparison src/http/modules/perl/ngx_http_perl_module.c @ 635:e67b227c8dbb default tip
Merge with current.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 Apr 2011 04:07:55 +0400 |
parents | ff463db0be31 |
children |
comparison
equal
deleted
inserted
replaced
578:f3a9e57d2e17 | 635:e67b227c8dbb |
---|---|
166 | 166 |
167 | 167 |
168 static ngx_int_t | 168 static ngx_int_t |
169 ngx_http_perl_handler(ngx_http_request_t *r) | 169 ngx_http_perl_handler(ngx_http_request_t *r) |
170 { | 170 { |
171 if (r->zero_in_uri) { | |
172 return NGX_HTTP_NOT_FOUND; | |
173 } | |
174 | |
175 r->main->count++; | 171 r->main->count++; |
176 | 172 |
177 ngx_http_perl_handle_request(r); | 173 ngx_http_perl_handle_request(r); |
178 | 174 |
179 return NGX_DONE; | 175 return NGX_DONE; |
479 m = ngx_array_push(pmcf->modules); | 475 m = ngx_array_push(pmcf->modules); |
480 if (m == NULL) { | 476 if (m == NULL) { |
481 return NGX_CONF_ERROR; | 477 return NGX_CONF_ERROR; |
482 } | 478 } |
483 | 479 |
484 m->len = sizeof(NGX_PERL_MODULES) - 1; | 480 ngx_str_set(m, NGX_PERL_MODULES); |
485 m->data = NGX_PERL_MODULES; | |
486 } | 481 } |
487 #endif | 482 #endif |
488 | 483 |
489 if (pmcf->modules != NGX_CONF_UNSET_PTR) { | 484 if (pmcf->modules != NGX_CONF_UNSET_PTR) { |
490 m = pmcf->modules->elts; | 485 m = pmcf->modules->elts; |