Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.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 | 61962127b166 |
comparison
equal
deleted
inserted
replaced
| 3238:415400fa0f10 | 3239:8254055b6693 |
|---|---|
| 2896 return; | 2896 return; |
| 2897 } | 2897 } |
| 2898 | 2898 |
| 2899 r->connection->log->action = "sending to client"; | 2899 r->connection->log->action = "sending to client"; |
| 2900 | 2900 |
| 2901 if (rc == 0 && r == r->main && !r->post_action) { | 2901 if (rc == 0) { |
| 2902 rc = ngx_http_send_special(r, NGX_HTTP_LAST); | 2902 rc = ngx_http_send_special(r, NGX_HTTP_LAST); |
| 2903 } | 2903 } |
| 2904 | 2904 |
| 2905 ngx_http_finalize_request(r, rc); | 2905 ngx_http_finalize_request(r, rc); |
| 2906 } | 2906 } |