Commit ae7364b

committed

Move zend_max_execution_timer_init() to php_child_init(), and call php_child_init() in pcntl_rfork()/pcntl_forkx()

1 parent c7f7412 commit ae7364bCopy full SHA for ae7364b

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,6 @@ PHP_FUNCTION(pcntl_fork)`
`299`	`299`	`}`
`300`	`300`	`} else if (id == 0) {`
`301`	`301`	`php_child_init();`
`302`		`- zend_max_execution_timer_init();`
`303`	`302`	`}`
`304`	`303`
`305`	`304`	`RETURN_LONG((zend_long) id);`
`@@ -1562,7 +1561,7 @@ PHP_FUNCTION(pcntl_rfork)`
`1562`	`1561`	`php_error_docref(NULL, E_WARNING, "Error %d", errno);`
`1563`	`1562`	`}`
`1564`	`1563`	`} else if (pid == 0) {`
`1565`		`- zend_max_execution_timer_init();`
	`1564`	`+ php_child_init();`
`1566`	`1565`	`}`
`1567`	`1566`
`1568`	`1567`	`RETURN_LONG((zend_long) pid);`
`@@ -1607,7 +1606,7 @@ PHP_FUNCTION(pcntl_forkx)`
`1607`	`1606`	`php_error_docref(NULL, E_WARNING, "Error %d", errno);`
`1608`	`1607`	`}`
`1609`	`1608`	`} else if (pid == 0) {`
`1610`		`- zend_max_execution_timer_init();`
	`1609`	`+ php_child_init();`
`1611`	`1610`	`}`
`1612`	`1611`
`1613`	`1612`	`RETURN_LONG((zend_long) pid);`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1819,6 +1819,7 @@ static void sigchld_handler(int apar)`
`1819`	`1819`	`PHPAPI void php_child_init(void)`
`1820`	`1820`	`{`
`1821`	`1821`	`refresh_memory_manager();`
	`1822`	`+ zend_max_execution_timer_init();`
`1822`	`1823`	`}`
`1823`	`1824`
`1824`	`1825`	`/* {{{ php_request_startup */`

Comments

(0)