Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_fastcgi_module.c @ 510:24b676623d4f NGINX_0_8_7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.7 *) Change: minimum supported OpenSSL version is 0.9.7. *) Change: the "ask" parameter of the "ssl_verify_client" directive was changed to the "optional" parameter and now it checks a client certificate if it was offered. Thanks to Brice Figureau. *) Feature: the $ssl_client_verify variable. Thanks to Brice Figureau. *) Feature: the "ssl_crl" directive. Thanks to Brice Figureau. *) Feature: the "proxy" parameter of the "geo" directive. *) Feature: the "image_filter" directive supports variables for setting size. *) Bugfix: the $ssl_client_cert variable usage corrupted memory; the bug had appeared in 0.7.7. Thanks to Sergey Zhuravlev. *) Bugfix: "proxy_pass_header" and "fastcgi_pass_header" directives did not pass to a client the "X-Accel-Redirect", "X-Accel-Limit-Rate", "X-Accel-Buffering", and "X-Accel-Charset" lines from backend response header. Thanks to Maxim Dounin. *) Bugfix: in handling "Last-Modified" and "Accept-Ranges" backend response header lines; the bug had appeared in 0.7.44. Thanks to Maxim Dounin. *) Bugfix: the "[alert] zero size buf" error if subrequest returns an empty response; the bug had appeared in 0.8.5.
author Igor Sysoev <http://sysoev.ru>
date Mon, 27 Jul 2009 00:00:00 +0400
parents 207ae3ff0444
children 6557aef8a4b2
comparison
equal deleted inserted replaced
509:41f4e459ace8 510:24b676623d4f
541 "ngx_http_fastcgi_module does not support " 541 "ngx_http_fastcgi_module does not support "
542 "subrequest in memory"); 542 "subrequest in memory");
543 return NGX_HTTP_INTERNAL_SERVER_ERROR; 543 return NGX_HTTP_INTERNAL_SERVER_ERROR;
544 } 544 }
545 545
546 if (ngx_http_upstream_create(r) != NGX_OK) {
547 return NGX_HTTP_INTERNAL_SERVER_ERROR;
548 }
549
546 f = ngx_pcalloc(r->pool, sizeof(ngx_http_fastcgi_ctx_t)); 550 f = ngx_pcalloc(r->pool, sizeof(ngx_http_fastcgi_ctx_t));
547 if (f == NULL) { 551 if (f == NULL) {
548 return NGX_ERROR; 552 return NGX_HTTP_INTERNAL_SERVER_ERROR;
549 } 553 }
550 554
551 ngx_http_set_ctx(r, f, ngx_http_fastcgi_module); 555 ngx_http_set_ctx(r, f, ngx_http_fastcgi_module);
552
553 u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t));
554 if (u == NULL) {
555 return NGX_HTTP_INTERNAL_SERVER_ERROR;
556 }
557
558 r->upstream = u;
559 556
560 flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module); 557 flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module);
561 558
562 if (flcf->fastcgi_lengths) { 559 if (flcf->fastcgi_lengths) {
563 if (ngx_http_fastcgi_eval(r, flcf) != NGX_OK) { 560 if (ngx_http_fastcgi_eval(r, flcf) != NGX_OK) {
564 return NGX_HTTP_INTERNAL_SERVER_ERROR; 561 return NGX_HTTP_INTERNAL_SERVER_ERROR;
565 } 562 }
566 } 563 }
567 564
565 u = r->upstream;
566
568 u->schema.len = sizeof("fastcgi://") - 1; 567 u->schema.len = sizeof("fastcgi://") - 1;
569 u->schema.data = (u_char *) "fastcgi://"; 568 u->schema.data = (u_char *) "fastcgi://";
570
571 u->peer.log = r->connection->log;
572 u->peer.log_error = NGX_ERROR_ERR;
573 #if (NGX_THREADS)
574 u->peer.lock = &r->connection->lock;
575 #endif
576 569
577 u->output.tag = (ngx_buf_tag_t) &ngx_http_fastcgi_module; 570 u->output.tag = (ngx_buf_tag_t) &ngx_http_fastcgi_module;
578 571
579 u->conf = &flcf->upstream; 572 u->conf = &flcf->upstream;
580 573
2436 if (flcf->upstream.upstream || flcf->fastcgi_lengths) { 2429 if (flcf->upstream.upstream || flcf->fastcgi_lengths) {
2437 return "is duplicate"; 2430 return "is duplicate";
2438 } 2431 }
2439 2432
2440 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); 2433 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
2434
2441 clcf->handler = ngx_http_fastcgi_handler; 2435 clcf->handler = ngx_http_fastcgi_handler;
2436
2437 if (clcf->name.data[clcf->name.len - 1] == '/') {
2438 clcf->auto_redirect = 1;
2439 }
2442 2440
2443 value = cf->args->elts; 2441 value = cf->args->elts;
2444 2442
2445 url = &value[1]; 2443 url = &value[1];
2446 2444
2471 u.no_resolve = 1; 2469 u.no_resolve = 1;
2472 2470
2473 flcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0); 2471 flcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0);
2474 if (flcf->upstream.upstream == NULL) { 2472 if (flcf->upstream.upstream == NULL) {
2475 return NGX_CONF_ERROR; 2473 return NGX_CONF_ERROR;
2476 }
2477
2478 if (clcf->name.data[clcf->name.len - 1] == '/') {
2479 clcf->auto_redirect = 1;
2480 } 2474 }
2481 2475
2482 return NGX_CONF_OK; 2476 return NGX_CONF_OK;
2483 } 2477 }
2484 2478