comparison: src/server/safs/cgi.c
src/server/safs/cgi.c
- changeset 524
- 9f1d30988231
- parent 523
- a37c3099b29d
- child 525
- 072d7794bcca
equal
deleted
inserted
replaced
| 523:a37c3099b29d | 524:9f1d30988231 |
|---|---|
| 567 } | 567 } |
| 568 log_ereport(LOG_DEBUG, "cgi-send: req: %p finish: event: %d pollout: %d wait_read: %d cgi_eof: %d fn: %s", rq, handler->events, handler->poll_out, handler->wait_read, handler->cgi_eof, event_fn); | 568 log_ereport(LOG_DEBUG, "cgi-send: req: %p finish: event: %d pollout: %d wait_read: %d cgi_eof: %d fn: %s", rq, handler->events, handler->poll_out, handler->wait_read, handler->cgi_eof, event_fn); |
| 569 | 569 |
| 570 handler->debug_finished = TRUE; | 570 handler->debug_finished = TRUE; |
| 571 | 571 |
| 572 if(handler->result == REQ_ABORTED && handler->process.pid != 0) { | |
| 573 log_ereport(LOG_FAILURE, "cgi-send: kill script: %s", handler->path); | |
| 574 killpg(handler->process.pid, SIGTERM); | |
| 575 } | |
| 576 | |
| 572 if(--handler->events > 0) { | 577 if(--handler->events > 0) { |
| 573 return 0; | 578 return 0; |
| 574 } | 579 } |
| 575 | 580 |
| 576 if(handler->poll_out) { | 581 if(handler->poll_out) { |
| 604 } else { | 609 } else { |
| 605 return 0; | 610 return 0; |
| 606 } | 611 } |
| 607 } | 612 } |
| 608 */ | 613 */ |
| 609 | |
| 610 if(handler->result == REQ_ABORTED && handler->process.pid != 0) { | |
| 611 log_ereport(LOG_FAILURE, "cgi-send: kill script: %s", handler->path); | |
| 612 killpg(handler->process.pid, SIGTERM); | |
| 613 } | |
| 614 | 614 |
| 615 log_ereport(LOG_DEBUG, "cgi-send: req: %p cgi_close", rq); | 615 log_ereport(LOG_DEBUG, "cgi-send: req: %p cgi_close", rq); |
| 616 | 616 |
| 617 int exit_code = cgi_close(&handler->process); | 617 int exit_code = cgi_close(&handler->process); |
| 618 if(exit_code != 0) { | 618 if(exit_code != 0) { |
