diff options
author | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 08:51:48 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 08:51:48 +0000 |
commit | 8a9171fa30be2ad64a849e9d916b33d3c42bb2d5 (patch) | |
tree | 2069fefb24eb5f3c276443e3af4643c1cea82015 | |
parent | 575d563e22c09442c3f2f4537ee0f51ccf28d271 (diff) | |
download | nginx-8a9171fa30be2ad64a849e9d916b33d3c42bb2d5.tar.gz |
merge r3318, r3449:
perl related fixes:
*) do not log error if $r->variable was not found
*) delete ngx_http_perl_cleanup_t unused since r909
-rw-r--r-- | src/http/modules/perl/nginx.xs | 3 | ||||
-rw-r--r-- | src/http/modules/perl/ngx_http_perl_module.c | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/http/modules/perl/nginx.xs b/src/http/modules/perl/nginx.xs index 077cf0ddf..994fc4ed0 100644 --- a/src/http/modules/perl/nginx.xs +++ b/src/http/modules/perl/nginx.xs @@ -901,9 +901,6 @@ variable(r, name, value = NULL) XSRETURN_UNDEF; } - ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, - "variable \"%V\" not found", &var); - XSRETURN_UNDEF; } diff --git a/src/http/modules/perl/ngx_http_perl_module.c b/src/http/modules/perl/ngx_http_perl_module.c index 6ba5a4d9e..7688cf61d 100644 --- a/src/http/modules/perl/ngx_http_perl_module.c +++ b/src/http/modules/perl/ngx_http_perl_module.c @@ -30,12 +30,6 @@ typedef struct { } ngx_http_perl_variable_t; -typedef struct { - SV *sv; - PerlInterpreter *perl; -} ngx_http_perl_cleanup_t; - - #if (NGX_HTTP_SSI) static ngx_int_t ngx_http_perl_ssi(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ssi_ctx, ngx_str_t **params); |