nginx-ranges: src/http/modules/perl/ngx_http_perl

comparison src/http/modules/perl/ngx_http_perl_module.c @ 178:87699398f955 NGINX_0_3_36

nginx 0.3.36 *) Feature: the ngx_http_addition_filter_module. *) Feature: the "proxy_pass" and "fastcgi_pass" directives may be used inside the "if" block. *) Feature: the "proxy_ignore_client_abort" and "fastcgi_ignore_client_abort" directives. *) Feature: the "$request_completion" variable. *) Feature: the ngx_http_perl_module supports the $r->request_method and $r->remote_addr. *) Feature: the ngx_http_ssi_module supports the "elif" command. *) Bugfix: the "\/" string in the expression of the "if" command of the ngx_http_ssi_module was treated incorrectly. *) Bugfix: in the regular expressions in the "if" command of the ngx_http_ssi_module. *) Bugfix: if the relative path was specified in the "client_body_temp_path", "proxy_temp_path", "fastcgi_temp_path", and "perl_modules" directives, then the directory was used relatively to a current path but not to a server prefix.

author	Igor Sysoev <http://sysoev.ru>
date	Wed, 05 Apr 2006 00:00:00 +0400
parents	1b490fc19afa
children	13710a1813ad

comparison

equal deleted inserted replaced

-:4a3ddd758222
+:87699398f955
 #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 void ngx_http_perl_handle_request(ngx_http_request_t *r);
 static ngx_int_t
 ngx_http_perl_get_interpreter(ngx_http_perl_main_conf_t *pmcf,
 PerlInterpreter **perl, ngx_log_t *log);
 static ngx_inline void
 ngx_http_perl_free_interpreter(ngx_http_perl_main_conf_t *pmcf,
 static ngx_int_t
 ngx_http_perl_handler(ngx_http_request_t *r)
 {
+ngx_int_t  rc;
+/* TODO: Win32 */
+if (r->zero_in_uri) {
+return NGX_HTTP_NOT_FOUND;
+}
+rc = ngx_http_read_client_request_body(r, ngx_http_perl_handle_request);
+if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
+return rc;
+}
+return NGX_DONE;
+}
+static void
+ngx_http_perl_handle_request(ngx_http_request_t *r)
+{
 ngx_int_t                   rc;
 ngx_str_t                   uri, args;
 ngx_http_perl_ctx_t        *ctx;
 ngx_http_perl_loc_conf_t   *plcf;
 ngx_http_perl_main_conf_t  *pmcf;
-/* TODO: Win32 */
-if (r->zero_in_uri) {
-return NGX_HTTP_NOT_FOUND;
-}
 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "perl handler");
 /* mod_perl's content handler assumes that content type was already set */
 if (ngx_http_set_content_type(r) != NGX_OK) {
-return NGX_HTTP_INTERNAL_SERVER_ERROR;
+ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+return;
 }
 ctx = ngx_http_get_module_ctx(r, ngx_http_perl_module);
 if (ctx == NULL) {
 ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_perl_ctx_t));
 if (ctx == NULL) {
-return NGX_ERROR;
+ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+	    return;
 }
 ngx_http_set_ctx(r, ctx, ngx_http_perl_module);
 }
 pmcf = ngx_http_get_module_main_conf(r, ngx_http_perl_module);
 rc = ngx_http_perl_get_interpreter(pmcf, &ctx->perl, r->connection->log);
 if (rc != NGX_OK) {
-return rc;
+ngx_http_finalize_request(r, rc);
+return;
 }
 {
 dTHXa(ctx->perl);
 "perl handler done: %i", rc);
 if (ctx->redirect_uri.len) {
 uri = ctx->redirect_uri;
 args = ctx->redirect_args;
+} else {
+uri.len = 0;
 }
 ctx->filename = NULL;
 ctx->redirect_uri.len = 0;
 if (uri.len) {
-return ngx_http_internal_redirect(r, &uri, &args);
+ngx_http_internal_redirect(r, &uri, &args);
+return;
 }
 if (rc == NGX_OK || rc == NGX_HTTP_OK) {
-return ngx_http_send_special(r, NGX_HTTP_LAST);
+ngx_http_send_special(r, NGX_HTTP_LAST);
 }
-return rc;
+ngx_http_finalize_request(r, rc);
 }
 static ngx_int_t
 ngx_http_perl_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
 #ifdef NGX_PERL_MODULES
 if (pmcf->modules.data == NULL) {
 pmcf->modules.data = NGX_PERL_MODULES;
 }
 #endif
+if (ngx_conf_full_name(cf->cycle, &pmcf->modules) != NGX_OK) {
+return NGX_CONF_ERROR;
+}
 PERL_SYS_INIT(&ngx_argc, &ngx_argv);
 pmcf->perl = ngx_http_perl_create_interpreter(pmcf, cf->log);

Mercurial > hg > nginx-ranges

comparison src/http/modules/perl/ngx_http_perl_module.c @ 178:87699398f955 NGINX_0_3_36