core: Simpler connection close logic if discarding the request body fails. If ap_discard_request_body() sets AP_CONN_CLOSE by itself it simplifies and allows to consolidate end_output_stream() and error_output_stream(). Merge r1898683 from trunk. Submitted by: ylavic, rpluem Reviewed by: ylavic, rpluem, covener