Adjust end of request support to also look at the protocol version

before being enabled.

Author: anthony-tuininga

src/oracledb/impl/thin/capabilities.pyx

@@ -50,17 +50,27 @@ cdef class Capabilities:
         self.sdu = 8192                 # initial value to use
 
     cdef void _adjust_for_protocol(self, uint16_t protocol_version,
-                                   uint16_t protocol_options):
+                                   uint16_t protocol_options, uint32_t flags):
+        """
+        Adjust the capabilities of the protocol based on the server's response
+        to the initial connection request.
+        """
         self.protocol_version = protocol_version
         self.supports_oob = protocol_options & TNS_GSO_CAN_RECV_ATTENTION
+        if flags & TNS_ACCEPT_FLAG_FAST_AUTH:
+            self.supports_fast_auth = True
+        if protocol_version >= TNS_VERSION_MIN_END_OF_RESPONSE \
+                and flags & TNS_ACCEPT_FLAG_HAS_END_OF_REQUEST:
+            self.compile_caps[TNS_CCAP_TTC4] |= TNS_CCAP_END_OF_REQUEST
+            self.supports_end_of_request = True
 
     @cython.boundscheck(False)
     cdef void _adjust_for_server_compile_caps(self, bytearray server_caps):
         if server_caps[TNS_CCAP_FIELD_VERSION] < self.ttc_field_version:
             self.ttc_field_version = server_caps[TNS_CCAP_FIELD_VERSION]
             self.compile_caps[TNS_CCAP_FIELD_VERSION] = self.ttc_field_version
         if self.ttc_field_version < TNS_CCAP_FIELD_VERSION_23_4 \
-                or not server_caps[TNS_CCAP_TTC4] & TNS_CCAP_END_OF_REQUEST:
+                and self.supports_end_of_request:
             self.compile_caps[TNS_CCAP_TTC4] ^= TNS_CCAP_END_OF_REQUEST
             self.supports_end_of_request = False
 
@@ -114,8 +124,7 @@ cdef class Capabilities:
         self.compile_caps[TNS_CCAP_TTC2] = TNS_CCAP_ZLNP
         self.compile_caps[TNS_CCAP_OCI2] = TNS_CCAP_DRCP
         self.compile_caps[TNS_CCAP_CLIENT_FN] = TNS_CCAP_CLIENT_FN_MAX
-        self.compile_caps[TNS_CCAP_TTC4] = TNS_CCAP_INBAND_NOTIFICATION | \
-                TNS_CCAP_END_OF_REQUEST
+        self.compile_caps[TNS_CCAP_TTC4] = TNS_CCAP_INBAND_NOTIFICATION
         self.compile_caps[TNS_CCAP_TTC5] = TNS_CCAP_VECTOR_SUPPORT
 
     @cython.boundscheck(False)

src/oracledb/impl/thin/constants.pxi

@@ -571,7 +571,7 @@ cdef enum:
     TNS_VERSION_MIN_ACCEPTED = 315      # 12.1
     TNS_VERSION_MIN_LARGE_SDU = 315
     TNS_VERSION_MIN_OOB_CHECK = 318
-    TNS_VERSION_MIN_UUID = 319
+    TNS_VERSION_MIN_END_OF_RESPONSE = 319
 
 # control packet types
 cdef enum:

src/oracledb/impl/thin/messages.pyx

@@ -1827,7 +1827,7 @@ cdef class ConnectMessage(Message):
         cdef:
             uint16_t protocol_version, protocol_options
             const char_type *redirect_data
-            uint32_t flags
+            uint32_t flags = 0
             bytes db_uuid
         if buf._current_packet.packet_type == TNS_PACKET_TYPE_REDIRECT:
             if not self.read_redirect_data_len:
@@ -1851,11 +1851,8 @@ cdef class ConnectMessage(Message):
             if protocol_version >= TNS_VERSION_MIN_OOB_CHECK:
                 buf.skip_raw_bytes(5)
                 buf.read_uint32(&flags)
-                if flags & TNS_ACCEPT_FLAG_FAST_AUTH:
-                    buf._caps.supports_fast_auth = True
-                if flags & TNS_ACCEPT_FLAG_HAS_END_OF_REQUEST:
-                    buf._caps.supports_end_of_request = True
-            buf._caps._adjust_for_protocol(protocol_version, protocol_options)
+            buf._caps._adjust_for_protocol(protocol_version, protocol_options,
+                                           flags)
             buf._transport._full_packet_size = True
         elif buf._current_packet.packet_type == TNS_PACKET_TYPE_REFUSE:
             response = self.error_info.message