Download | Plain Text | No Line Numbers 

  1. diff -Naur a/sapi/fpm/fpm/fpm_children.h b/sapi/fpm/fpm/fpm_children.h
  2. --- a/sapi/fpm/fpm/fpm_children.h	2020-07-21 10:49:31.000000000 +0200
  3. +++ b/sapi/fpm/fpm/fpm_children.h	2020-07-24 12:34:37.323835331 +0200
  4. @@ -31,6 +31,7 @@
  5.  	pid_t pid;
  6.  	int scoreboard_i;
  7.  	struct zlog_stream *log_stream;
  8. +	int sigterm_sent;
  9.  };
  10.  
  11.  #endif
  12. diff -Naur a/sapi/fpm/fpm/fpm_process_ctl.c b/sapi/fpm/fpm/fpm_process_ctl.c
  13. --- a/sapi/fpm/fpm/fpm_process_ctl.c	2020-07-21 10:49:31.000000000 +0200
  14. +++ b/sapi/fpm/fpm/fpm_process_ctl.c	2020-07-24 12:34:37.323835331 +0200
  15. @@ -51,6 +51,7 @@
  16.  
  17.  static void fpm_pctl_action(struct fpm_event_s *ev, short which, void *arg) /* {{{ */
  18.  {
  19. +	ev->flags &= ~FPM_EV_PERSIST;
  20.  	fpm_pctl(FPM_PCTL_STATE_UNSPECIFIED, FPM_PCTL_ACTION_TIMEOUT);
  21.  }
  22.  /* }}} */
  23. @@ -59,6 +60,7 @@
  24.  {
  25.  	fpm_event_set_timer(&pctl_event, 0, &fpm_pctl_action, NULL);
  26.  	fpm_event_add(&pctl_event, sec * 1000);
  27. +	pctl_event.flags |= FPM_EV_PERSIST;
  28.  	return 0;
  29.  }
  30.  /* }}} */
  31. diff -Naur a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c
  32. --- a/sapi/fpm/fpm/fpm_request.c	2020-07-21 10:49:31.000000000 +0200
  33. +++ b/sapi/fpm/fpm/fpm_request.c	2020-07-24 12:34:37.324835323 +0200
  34. @@ -273,7 +273,8 @@
  35.  #endif
  36.  		if (terminate_timeout && tv.tv_sec >= terminate_timeout) {
  37.  			str_purify_filename(purified_script_filename, proc.script_filename, sizeof(proc.script_filename));
  38. -			fpm_pctl_kill(child->pid, FPM_PCTL_TERM);
  39. +			fpm_pctl_kill(child->pid, (child->sigterm_sent) ? FPM_PCTL_KILL : FPM_PCTL_TERM);
  40. +			child->sigterm_sent = 1;
  41.  
  42.  			zlog(ZLOG_WARNING, "[pool %s] child %d, script '%s' (request: \"%s %s%s%s\") execution timed out (%d.%06d sec), terminating",
  43.  				child->wp->config->name, (int) child->pid, purified_script_filename, proc.request_method, proc.request_uri,
  44.