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

hlinnaka · hlinnaka · commit 4e86f1b16da8 · 2014-12-01T17:45:04.000+02:00
It seems likely that any SSL implementation will need a similar call, not
just OpenSSL.
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
@@ -1054,9 +1054,9 @@ pqSocketCheck(PGconn *conn, int forRead, int forWrite, time_t end_time)
 		return -1;
 	}
 
-#ifdef USE_OPENSSL
+#ifdef USE_SSL
 	/* Check for SSL library buffering read bytes */
-	if (forRead && conn->ssl && SSL_pending(conn->ssl) > 0)
+	if (forRead && conn->ssl_in_use && pgtls_read_pending(conn) > 0)
 	{
 		/* short-circuit the select */
 		return 1;
diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c
@@ -186,6 +186,15 @@ pgtls_open_client(PGconn *conn)
 	return open_client_SSL(conn);
 }
 
+/*
+ *  Is there unread data waiting in the SSL read buffer?
+ */
+bool
+pgtls_read_pending(PGconn *conn)
+{
+	return SSL_pending(conn->ssl);
+}
+
 /*
  *	Read data from a secure connection.
  *
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
@@ -641,6 +641,7 @@ extern int pgtls_init(PGconn *conn);
 extern PostgresPollingStatusType pgtls_open_client(PGconn *conn);
 extern void pgtls_close(PGconn *conn);
 extern ssize_t pgtls_read(PGconn *conn, void *ptr, size_t len);
+extern bool pgtls_read_pending(PGconn *conn);
 extern ssize_t pgtls_write(PGconn *conn, const void *ptr, size_t len);
 
 /*

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`		`-#ifdef USE_OPENSSL`
	`1057`	`+#ifdef USE_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`	`return 1;`