nginx-0.3.30-RELEASE import
*) Change: the ECONNABORTED error log level was changed to "error" from
"crit".
*) Bugfix: the ngx_http_perl_module could not be build without the
ngx_http_ssi_filter_module.
*) Bugfix: nginx could not be built on i386 platform, if the PIC was
used; the bug had appeared in 0.3.27.
diff --git a/src/http/modules/perl/ngx_http_perl_module.c b/src/http/modules/perl/ngx_http_perl_module.c
index 04f7787..069c216 100644
--- a/src/http/modules/perl/ngx_http_perl_module.c
+++ b/src/http/modules/perl/ngx_http_perl_module.c
@@ -34,8 +34,11 @@
} ngx_http_perl_variable_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);
+#endif
+
static ngx_int_t
ngx_http_perl_get_interpreter(ngx_http_perl_main_conf_t *pmcf,
PerlInterpreter **perl, ngx_log_t *log);
@@ -142,6 +145,8 @@
};
+#if (NGX_HTTP_SSI)
+
#define NGX_HTTP_PERL_SSI_SUB 0
#define NGX_HTTP_PERL_SSI_ARG 1
@@ -152,11 +157,12 @@
{ ngx_null_string, 0, 0, 0 }
};
-
static ngx_http_ssi_command_t ngx_http_perl_ssi_command = {
ngx_string("perl"), ngx_http_perl_ssi, ngx_http_perl_ssi_params, 0, 1
};
+#endif
+
static void
ngx_http_perl_xs_init(pTHX)
@@ -310,6 +316,8 @@
}
+#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)
@@ -385,6 +393,8 @@
return rc;
}
+#endif
+
static ngx_int_t
ngx_http_perl_get_interpreter(ngx_http_perl_main_conf_t *pmcf,
@@ -763,6 +773,7 @@
static ngx_int_t
ngx_http_perl_preconfiguration(ngx_conf_t *cf)
{
+#if (NGX_HTTP_SSI)
ngx_int_t rc;
ngx_http_ssi_main_conf_t *smcf;
@@ -780,6 +791,7 @@
return NGX_ERROR;
}
+#endif
return NGX_OK;
}