Commit4e86f1b

committed

Put SSL_pending() call behind the new internal SSL API.

It seems likely that any SSL implementation will need a similar call, notjust OpenSSL.

1 parent6d6cade commit4e86f1bCopy full SHA for 4e86f1b

File tree

+12

-2

lines changed

+12

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1054,9 +1054,9 @@ pqSocketCheck(PGconn *conn, int forRead, int forWrite, time_t end_time)`
`1054`	`1054`	`return-1;`
`1055`	`1055`	`}`
`1056`	`1056`
`1057`		`-#ifdefUSE_OPENSSL`
	`1057`	`+#ifdefUSE_SSL`
`1058`	`1058`	`/* Check for SSL library buffering read bytes */`
`1059`		`-if (forRead&&conn->ssl&&SSL_pending(conn->ssl)>0)`
	`1059`	`+if (forRead&&conn->ssl_in_use&&pgtls_read_pending(conn)>0)`
`1060`	`1060`	`{`
`1061`	`1061`	`/* short-circuit the select */`
`1062`	`1062`	`return1;`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,15 @@ pgtls_open_client(PGconn *conn)`
`186`	`186`	`returnopen_client_SSL(conn);`
`187`	`187`	`}`
`188`	`188`
	`189`	`+/*`
	`190`	`+ * Is there unread data waiting in the SSL read buffer?`
	`191`	`+ */`
	`192`	`+bool`
	`193`	`+pgtls_read_pending(PGconn*conn)`
	`194`	`+{`
	`195`	`+returnSSL_pending(conn->ssl);`
	`196`	`+}`
	`197`	`+`
`189`	`198`	`/*`
`190`	`199`	`*Read data from a secure connection.`
`191`	`200`	`*`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -641,6 +641,7 @@ extern int pgtls_init(PGconn *conn);`
`641`	`641`	`externPostgresPollingStatusTypepgtls_open_client(PGconn*conn);`
`642`	`642`	`externvoidpgtls_close(PGconn*conn);`
`643`	`643`	`externssize_tpgtls_read(PGconnconn,voidptr,size_tlen);`
	`644`	`+externboolpgtls_read_pending(PGconn*conn);`
`644`	`645`	`externssize_tpgtls_write(PGconnconn,constvoidptr,size_tlen);`
`645`	`646`
`646`	`647`	`/*`

Comments

(0)