summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMason S2010-04-09 00:54:56 +0000
committerPavan Deolasee2011-05-19 16:38:44 +0000
commit87911efc811252b6aca85e53b0d513d6c635c1ea (patch)
treeff0c0ba9dcb77d948170383bb71238c1dd025424
parent9b1cd1ef2e746b9d68085ecd37eabaa38e2a82f1 (diff)
Removed ifdefed code for USE_SSL in GTM, since it is currently
not supported and if used will not compile.
-rw-r--r--src/gtm/client/fe-misc.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/gtm/client/fe-misc.c b/src/gtm/client/fe-misc.c
index 66172400a5..89bdd52eb3 100644
--- a/src/gtm/client/fe-misc.c
+++ b/src/gtm/client/fe-misc.c
@@ -47,7 +47,6 @@
#include "gtm/libpq-fe.h"
#include "gtm/libpq-int.h"
-
static int gtmpqPutMsgBytes(const void *buf, size_t len, GTM_Conn *conn);
static int gtmpqSendSome(GTM_Conn *conn, int len);
static int gtmpqSocketCheck(GTM_Conn *conn, int forRead, int forWrite,
@@ -648,11 +647,6 @@ retry3:
* detect true EOF.
*/
-#ifdef USE_SSL
- if (conn->ssl)
- return 0;
-#endif
-
switch (gtmpqReadReady(conn))
{
case 0:
@@ -929,15 +923,6 @@ gtmpqSocketCheck(GTM_Conn *conn, int forRead, int forWrite, time_t end_time)
return -1;
}
-#ifdef USE_SSL
- /* Check for SSL library buffering read bytes */
- if (forRead && conn->ssl && SSL_pending(conn->ssl) > 0)
- {
- /* short-circuit the select */
- return 1;
- }
-#endif
-
/* We will retry as long as we get EINTR */
do
result = gtmpqSocketPoll(conn->sock, forRead, forWrite, end_time);