When trying to do some backports, it appears that 2.4 incorporates
http://svn.apache.org/viewvc?rev=609549&view=rev
(which adds bail_out_on_error()), whereas this seems missing
from trunk via:
https://svn.apache.org/viewvc?view=revision&revision=1482522
So how much of that should also be considered for 2.4 backports?
