mirror of
https://github.com/postgres/postgres.git
synced 2025-06-27 23:21:58 +03:00
Back-patch 9.4-era SSL renegotiation code into 9.3 and 9.2.
This back-patches 9.4 commits31cf1a1a4
,86029b31e
, and36a3be654
into the prior branches, along with relevant bits ofb1aebbb6a
and7ce2a45ae
. We had foreseen doing this once the code was proven, but that never did happen, probably because we got sufficiently fed up with renegotiation to disable it by default. However, we have to do something now because the prior code doesn't even compile against OpenSSL 1.1. Per discussion, the best solution seems to be to make the older branches look like 9.4. Discussion: https://postgr.es/m/20047.1492305247@sss.pgh.pa.us
This commit is contained in:
@ -551,16 +551,22 @@ prepare_for_client_read(void)
|
||||
|
||||
/*
|
||||
* client_read_ended -- get out of the client-input state
|
||||
*
|
||||
* This is called just after low-level reads. It must preserve errno!
|
||||
*/
|
||||
void
|
||||
client_read_ended(void)
|
||||
{
|
||||
if (DoingCommandRead)
|
||||
{
|
||||
int save_errno = errno;
|
||||
|
||||
ImmediateInterruptOK = false;
|
||||
|
||||
DisableNotifyInterrupt();
|
||||
DisableCatchupInterrupt();
|
||||
|
||||
errno = save_errno;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user