Mercurial > hg > nginx
comparison src/http/ngx_http_request.c @ 3239:8254055b6693 stable-0.7
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
various perl fixes:
*) fix ngx_http_send_special() for subrequests handled by perl
*) allow perl "sub{..."
*) restore environ, this fixes segfault on reconfiguration failure when
perl module creates new environment
*) optimize error handling
*) use ngx_conf_set_str_array_slot() for perl_require
*) allow several perl_modules
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 26 Oct 2009 16:22:24 +0000 |
| parents | 2efa8d2fcde1 |
| children | f678ea405737 |
comparison
equal
deleted
inserted
replaced
| 3238:415400fa0f10 | 3239:8254055b6693 |
|---|---|
| 2704 if (b == NULL) { | 2704 if (b == NULL) { |
| 2705 return NGX_ERROR; | 2705 return NGX_ERROR; |
| 2706 } | 2706 } |
| 2707 | 2707 |
| 2708 if (flags & NGX_HTTP_LAST) { | 2708 if (flags & NGX_HTTP_LAST) { |
| 2709 b->last_buf = 1; | 2709 |
| 2710 if (r == r->main && !r->post_action) { | |
| 2711 b->last_buf = 1; | |
| 2712 | |
| 2713 } else { | |
| 2714 b->sync = 1; | |
| 2715 b->last_in_chain = 1; | |
| 2716 } | |
| 2710 } | 2717 } |
| 2711 | 2718 |
| 2712 if (flags & NGX_HTTP_FLUSH) { | 2719 if (flags & NGX_HTTP_FLUSH) { |
| 2713 b->flush = 1; | 2720 b->flush = 1; |
| 2714 } | 2721 } |