The question was more about whether you tried it before you made the change, to be clear. :)

There's no need to tackle both of these issues together necessarily, but yes, we should ostensibly have Zend behavior for all the functions involved here, and the prereq work is likely the same as for the above -- segment/refactor out the storage and usage of the timeouts so they can set independently.