ruby-oci8 2.2.10 → 2.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ca16dcc5691bc79740b2b6e308315d013c3f482f991325f70a129a7cf34de0c
-  data.tar.gz: c953f017dab68ed7c2a3934ec29b7312c401516a04b44d32f53c83b0015988b9
+  metadata.gz: 1fedff79278c31d88dee698417671fb84c334ad61d08595662fcef4c792742eb
+  data.tar.gz: 8af51646f9e6c4f96be8baaf15582b1e510f8655ed4c4f06cc45f0ab2599e8ea
 SHA512:
-  metadata.gz: 3c54d89e2b858e9dcd874d3f9351c707443d1171154c1d9145f3ddd0931e3168809fc3e91ef1cbc1dca2e6b4e699e5eb2e5d05a7e320cfb0926359a71ff9b3d9
-  data.tar.gz: 611469d0047283c54b7110090bcd9e45a677c3afaba9f6b1c6c4efbaca8afd3092ee1b871d28149459fa82f52f12e36d71bae6cb99e37be0c5ecb148ae300ead
+  metadata.gz: f3efe23976439e355436b273d28778a1658d01c1d0c57809e3d992600efc98d0455f44936b711026d7eb4dc9599dda6477367edb49823d125a4cc6d2ef3f2349
+  data.tar.gz: 9ff212eccdc0e737f648aaab32f4958e47f5c551823d6d9613b89cf8f5195561980f5cc5c0d34c7a88e591c045b601ff779cb5a7b562ca26c0efbaa532e198f2

data/NEWS

@@ -1,5 +1,14 @@
 # @markup markdown
 
+2.2.11 (2022-02-22)
+===================
+
+- Fix "No DLL is not foud to hook" when `OCI8.properties[:tcp_keepalive_time]` is set and Oracle client is 21c on Windows.
+
+  (reported at rsim/oracle-enhanced#2262)
+
+- Fix "OCI8.properties[:tcp_keepalive_time] isn't available" error when ruby version is 3.1 on Windows.
+
 2.2.10 (2022-01-12)
 ===================
 

data/ext/oci8/extconf.rb

@@ -72,7 +72,7 @@ $objs = ["oci8lib.o", "env.o", "error.o", "oci8.o", "ocihandle.o",
          "ocinumber.o", "ocidatetime.o", "object.o", "apiwrap.o",
          "encoding.o", "oranumber_util.o", "thread_util.o", "util.o"]
 
-if RUBY_PLATFORM =~ /mswin32|cygwin|mingw32|bccwin32/
+if RUBY_PLATFORM =~ /mswin32|cygwin|mingw/
   $defs << "-DUSE_WIN32_C"
   $objs << "win32.o"
 end
@@ -148,7 +148,7 @@ end
 print "checking for plthook... "
 STDOUT.flush
 case RUBY_PLATFORM
-when /mswin32|cygwin|mingw32|bccwin32/
+when /mswin32|cygwin|mingw/
   plthook_src = "plthook_win32.c"
 when /darwin/
   plthook_src = "plthook_osx.c"

data/ext/oci8/hook_funcs.c

@@ -170,6 +170,38 @@ static int WSAAPI hook_WSARecv(SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount
     return rv;
 }
 
+static int is_target_dll(MODULEENTRY32 *me)
+{
+    static const char *basenames[] = {
+        "orantcp", // ORACLE_HOME-based client
+        "oraociei", // instant client basic
+        "oraociicus", // instant client basic lite
+        NULL,
+    };
+    const char **basename = basenames;
+    while (*basename != NULL) {
+        if (strnicmp(me->szModule, *basename, strlen(*basename)) == 0) {
+            break;
+        }
+        basename++;
+    }
+    if (*basename == NULL) {
+        return 0;
+    }
+    // basename{zero_or_more_digits}.dll
+    const char *p = me->szModule + strlen(*basename);
+    while ('0' <= *p && *p <= '9') {
+        p++;
+    }
+    if (stricmp(p, ".dll") != 0) {
+        return 0;
+    }
+    if (GetProcAddress((HMODULE)me->modBaseAddr, "nttini") == NULL) {
+        return 0;
+    }
+    return 1;
+}
+
 void oci8_install_hook_functions()
 {
     static int hook_functions_installed = 0;
@@ -217,22 +249,11 @@ void oci8_install_hook_functions()
     me.dwSize = sizeof(me);
     if (Module32First(hSnapshot, &me)) {
         do {
-            const char *p = NULL;
-            if (strnicmp(me.szModule, "orantcp", 7) == 0) { // ORACLE_HOME-based client
-                p = me.szModule + 7;
-            } else if (strnicmp(me.szModule, "oraociei", 8) == 0) { // instant client basic
-                p = me.szModule + 8;
-            } else if (strnicmp(me.szModule, "oraociicus", 10) == 0) { // instant client basic lite
-                p = me.szModule + 10;
-            }
-            if (p != NULL && ('1' <= *p && *p <= '9') && ('0' <= *(p + 1) && *(p + 1) <= '9')
-                && stricmp(p + 2, ".dll") == 0) {
-                if (GetProcAddress((HMODULE)me.modBaseAddr, "nttini") != NULL) {
-                    module_found = TRUE;
-                    if (replace_functions(me.modBaseAddr, me.szExePath, tcp_functions) != 0) {
-                        CloseHandle(hSnapshot);
-                        rb_raise(rb_eRuntimeError, "Hook error: %s", hook_errmsg);
-                    }
+            if (is_target_dll(&me)) {
+                module_found = TRUE;
+                if (replace_functions(me.modBaseAddr, me.szExePath, tcp_functions) != 0) {
+                    CloseHandle(hSnapshot);
+                    rb_raise(rb_eRuntimeError, "Hook error: %s", hook_errmsg);
                 }
             }
         } while (Module32Next(hSnapshot, &me));

data/lib/oci8/check_load_error.rb

@@ -4,7 +4,7 @@ class OCI8
   module Util
 
     case RUBY_PLATFORM
-    when /mswin32|cygwin|mingw32|bccwin32/
+    when /mswin32|cygwin|mingw/
 
       require 'fiddle/import'
       require 'fiddle/types'

data/lib/oci8/version.rb

@@ -1,3 +1,3 @@
 class OCI8
-  VERSION = "2.2.10"
+  VERSION = "2.2.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-oci8
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.2.11
 platform: ruby
 authors:
 - Kubo Takehiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies: []
 description: 'ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available
   with Oracle 10g or later including Oracle Instant Client.