Commit ed9430a

Applailuuu1994

authored and

committed

Fix hard_timeout when zend-max-execution-timers is enabled

1 parent 901f71e commit ed9430aCopy full SHA for ed9430a

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ PHP NEWS`
`5`	`5`	`- Core:`
`6`	`6`	`. Fixed bug GH-19765 (object_properties_load() bypasses readonly property`
`7`	`7`	`checks). (timwolla)`
	`8`	`+ . Fixed hard_timeout with --enable-zend-max-execution-timers. (Appla)`
`8`	`9`
`9`	`10`	`- Standard:`
`10`	`11`	`. Fixed bug GH-12265 (Cloning an object breaks serialization recursion).`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1531,7 +1531,9 @@ static void zend_set_timeout_ex(zend_long seconds, bool reset_signals) /* {{{ */`
`1531`	`1531`	`return;`
`1532`	`1532`	`}`
`1533`	`1533`	`#elif defined(ZEND_MAX_EXECUTION_TIMERS)`
`1534`		`- zend_max_execution_timer_settime(seconds);`
	`1534`	`+ if (seconds > 0) {`
	`1535`	`+ zend_max_execution_timer_settime(seconds);`
	`1536`	`+ }`
`1535`	`1537`
`1536`	`1538`	`if (reset_signals) {`
`1537`	`1539`	`sigset_t sigset;`
`@@ -1618,7 +1620,9 @@ void zend_unset_timeout(void) /* {{{ */`
`1618`	`1620`	`tq_timer = NULL;`
`1619`	`1621`	`}`
`1620`	`1622`	`#elif ZEND_MAX_EXECUTION_TIMERS`
`1621`		`- zend_max_execution_timer_settime(0);`
	`1623`	`+ if (EG(timeout_seconds)) {`
	`1624`	`+ zend_max_execution_timer_settime(0);`
	`1625`	`+ }`
`1622`	`1626`	`#elif defined(HAVE_SETITIMER)`
`1623`	`1627`	`if (EG(timeout_seconds)) {`
`1624`	`1628`	`struct itimerval no_timeout;`

Comments

(0)