More refactoring of the big function generating execute requests
Merge branch 'master' of git.php.net:php-src