From 42c7eba37801f635b6cfcb3f57e83404dbbca0b1 Mon Sep 17 00:00:00 2001 From: Hiroshi Saito Date: Wed, 12 Sep 2007 05:40:39 +0000 Subject: [PATCH] Prep Ver 08.02.0500 and Fixed build of without OpenSSL. --- configure.ac | 11 +++++++++++ docs/release.html | 5 +++++ docs/unix-compilation.html | 9 +++++---- socket.c | 9 +++++++++ version.h | 2 +- win32.mak | 2 +- win64.mak | 2 +- 7 files changed, 33 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 2d1f524..5db73fb 100644 --- a/configure.ac +++ b/configure.ac @@ -116,6 +116,17 @@ PGAC_ARG_BOOL(enable, unicode, yes, AM_CONDITIONAL(enable_unicode, [test x"$enable_unicode" = xyes]) +# +# SSL support +# + +PGAC_ARG_BOOL(enable, usessl, yes, + [ --disable-openssl do not build OpenSSL support], + [AC_DEFINE(USE_SSL, 1, + [Define to 1 to build with OpenSSL support (--enable-openssl)])]) + +AM_CONDITIONAL(enable_usessl, [test x"$enable_ssl" = xyes]) + # # Pthreads # diff --git a/docs/release.html b/docs/release.html index 8950c1b..a903b1c 100644 --- a/docs/release.html +++ b/docs/release.html @@ -11,6 +11,11 @@

psqlODBC 08.02.0500 Release


+Changes:
+1.) Correct the format of Bind message under 64bit environment.
+2.) Fixed build of without OpenSSL. +
+2.) Improve the check of updatability of queries by checking if they have multiple tables.
  • Notes: psqlODBC 08.02.0403

    • Changes:
    1.) Support SQLColAttribute for MS specific SQL_CA_SS_COLUMN_KEY. Some MS applications use this.
    diff --git a/docs/unix-compilation.html b/docs/unix-compilation.html index 34477c1..a7a3fa5 100644 --- a/docs/unix-compilation.html +++ b/docs/unix-compilation.html @@ -34,6 +34,7 @@ provide a build environment for us which is now included in psqlODBC tarballs.--with-odbcver=VERSION change default ODBC version number [0x0351]
  • --enable-pthreads (thread-safe driver on some platforms)
  • --disable-unicode (build non-Unicode driver)
    • +
  • --disable-openssl (build non-OpenSSL driver)
  • --help
    • @@ -42,10 +43,10 @@ provide a build environment for us which is now included in psqlODBC tarballs.Prerequisites

    Bootstrapping

    diff --git a/socket.c b/socket.c index e9fac02..226105e 100644 --- a/socket.c +++ b/socket.c @@ -452,6 +452,8 @@ static int SOCK_wait_for_ready(SocketClass *sock, BOOL output, int retry_count) } return ret; } + +#ifdef USE_SSL /* * The stuff for SSL. */ @@ -555,6 +557,7 @@ inolog("%s: %d get_error=%d Lasterror=%d\n", func, n, err, gerrno); return n; } +#endif /* USE_SSL */ int SOCK_get_id(SocketClass *self) @@ -730,9 +733,11 @@ SOCK_flush_output(SocketClass *self) return -1; while (self->buffer_filled_out > 0) { +#ifdef USE_SSL if (self->ssl) written = SOCK_SSL_send(self, (char *) self->buffer_out + pos, self->buffer_filled_out); else +#endif /* USE_SSL */ written = send(self->socket, (char *) self->buffer_out + pos, self->buffer_filled_out, 0); gerrno = SOCK_ERRNO; if (written < 0) @@ -776,9 +781,11 @@ SOCK_get_next_byte(SocketClass *self) */ self->buffer_read_in = 0; retry: +#ifdef USE_SSL if (self->ssl) self->buffer_filled_in = SOCK_SSL_recv(self, (char *) self->buffer_in, self->buffer_size); else +#endif /* USE_SSL */ self->buffer_filled_in = recv(self->socket, (char *) self->buffer_in, self->buffer_size, 0); gerrno = SOCK_ERRNO; @@ -849,9 +856,11 @@ SOCK_put_next_byte(SocketClass *self, UCHAR next_byte) /* buffer is full, so write it out */ do { +#ifdef USE_SSL if (self->ssl) bytes_sent = SOCK_SSL_send(self, (char *) self->buffer_out + pos, self->buffer_filled_out); else +#endif /* USE_SSL */ bytes_sent = send(self->socket, (char *) self->buffer_out + pos, self->buffer_filled_out, 0); gerrno = SOCK_ERRNO; if (bytes_sent < 0) diff --git a/version.h b/version.h index b65870a..86941fa 100644 --- a/version.h +++ b/version.h @@ -12,6 +12,6 @@ #define POSTGRESDRIVERVERSION "08.02.0500" #define POSTGRES_RESOURCE_VERSION "08.02.0500\0" #define PG_DRVFILE_VERSION 8,2,05,00 -#define PG_BUILD_VERSION "200709110001" +#define PG_BUILD_VERSION "200709120001" #endif diff --git a/win32.mak b/win32.mak index 6b2f321..24edd5d 100644 --- a/win32.mak +++ b/win32.mak @@ -69,7 +69,7 @@ LINKMT=MT !ENDIF SSL_DLL = "SSLEAY32.dll" -ADD_DEFINES = $(ADD_DEFINES) /D "SSL_DLL=\"$(SSL_DLL)\"" +ADD_DEFINES = $(ADD_DEFINES) /D "SSL_DLL=\"$(SSL_DLL)\"" /D USE_SSL !IF "$(ANSI_VERSION)" == "yes" DTCLIB = pgenlista diff --git a/win64.mak b/win64.mak index 033e957..5046783 100755 --- a/win64.mak +++ b/win64.mak @@ -68,7 +68,7 @@ SSL_LIB="C:\develop\lib\$(CPU)" !ENDIF SSL_DLL = "SSLEAY32.dll" -ADD_DEFINES = $(ADD_DEFINES) /D "SSL_DLL=\"$(SSL_DLL)\"" +ADD_DEFINES = $(ADD_DEFINES) /D "SSL_DLL=\"$(SSL_DLL)\"" /D USE_SSL !IF "$(ANSI_VERSION)" == "yes" DTCLIB = pgenlista -- 2.39.5