Skip to content

Commit 020937d

Browse files
author
Harry Xi
authored
SNOW-1039347: update libsnowflakeclient 1.0.7 (#366)
1 parent ee93e3c commit 020937d

File tree

191 files changed

+2017
-6682
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+2017
-6682
lines changed

.github/workflows/scripts/build_driver.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def build_windows():
4949

5050
print ("====> build pdo driver")
5151
run_command("scripts\\run_build_pdo_snowflake.bat " + arch + " " + target + " " + vs + " " + php + " D:\\php-sdk")
52-
dll = os.path.join("D:\\php-sdk\\phpmaster", vs.replace("VS", "vc"), arch, "php-src", arch, target + "_TS", "php_pdo_snowflake.dll")
52+
dll = os.path.join("D:\\php-sdk\\phpmaster", vs, arch, "php-src", arch, target + "_TS", "php_pdo_snowflake.dll")
5353
php_ext_dir = os.path.join("c:", "tools", "php", "ext")
5454
run_command("xcopy " + dll + " " + php_ext_dir +" /I/Y/F")
5555
run_command("php -dextension=pdo_snowflake -m")

.github/workflows/scripts/test_driver.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def test_windows():
3939

4040

4141
print ("====> run test")
42-
run_tests_file = os.path.join("D:\\php-sdk\\phpmaster", vs.replace("VS", "vc"), arch, "php-src", "run-tests.php")
42+
run_tests_file = os.path.join("D:\\php-sdk\\phpmaster", vs, arch, "php-src", "run-tests.php")
4343
run_command("php.exe " + run_tests_file + " .\\tests -d extension=pdo_snowflake || ver>null")
4444
print ("====> parse test results")
4545
run_command("python .\\.github\\workflows\\scripts\\check_result.py .\\tests")
Binary file not shown.
Binary file not shown.
Binary file not shown.

libsnowflakeclient/deps-build/darwin/cmocka/lib/libcmocka.0.4.1.dylib

100755100644
File mode changed.

libsnowflakeclient/deps-build/darwin/cmocka/lib/libcmocka.0.dylib

100755100644
File mode changed.

libsnowflakeclient/deps-build/darwin/cmocka/lib/libcmocka.dylib

100755100644
File mode changed.

libsnowflakeclient/deps-build/darwin/curl/include/curl/curl.h

+20-22
Original file line numberDiff line numberDiff line change
@@ -53,28 +53,19 @@
5353
#include "curlver.h" /* libcurl version defines */
5454
#include "system.h" /* determine things run-time */
5555

56-
/*
57-
* Define CURL_WIN32 when build target is Win32 API
58-
*/
59-
60-
#if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && \
61-
!defined(__SYMBIAN32__)
62-
#define CURL_WIN32
63-
#endif
64-
6556
#include <stdio.h>
6657
#include <limits.h>
6758

68-
#if (defined(__FreeBSD__) && (__FreeBSD__ >= 2)) || defined(__MidnightBSD__)
59+
#if defined(__FreeBSD__) || defined(__MidnightBSD__)
6960
/* Needed for __FreeBSD_version or __MidnightBSD_version symbol definition */
70-
#include <osreldate.h>
61+
#include <sys/param.h>
7162
#endif
7263

7364
/* The include stuff here below is mainly for time_t! */
7465
#include <sys/types.h>
7566
#include <time.h>
7667

77-
#if defined(CURL_WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__)
68+
#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__)
7869
#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || \
7970
defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H))
8071
/* The check above prevents the winsock2 inclusion if winsock.h already was
@@ -88,7 +79,7 @@
8879
libc5-based Linux systems. Only include it on systems that are known to
8980
require it! */
9081
#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
91-
defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
82+
defined(__minix) || defined(__INTEGRITY) || \
9283
defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \
9384
defined(__CYGWIN__) || defined(AMIGA) || defined(__NuttX__) || \
9485
(defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) || \
@@ -97,11 +88,11 @@
9788
#include <sys/select.h>
9889
#endif
9990

100-
#if !defined(CURL_WIN32) && !defined(_WIN32_WCE)
91+
#if !defined(_WIN32) && !defined(_WIN32_WCE)
10192
#include <sys/socket.h>
10293
#endif
10394

104-
#if !defined(CURL_WIN32)
95+
#if !defined(_WIN32)
10596
#include <sys/time.h>
10697
#endif
10798

@@ -132,7 +123,7 @@ extern char sf_enable_getaddrinfo_lock;
132123

133124
#ifdef CURL_STATICLIB
134125
# define CURL_EXTERN
135-
#elif defined(CURL_WIN32) || defined(__SYMBIAN32__) || \
126+
#elif defined(_WIN32) || \
136127
(__has_declspec_attribute(dllexport) && \
137128
__has_declspec_attribute(dllimport))
138129
# if defined(BUILDING_LIBCURL)
@@ -148,7 +139,7 @@ extern char sf_enable_getaddrinfo_lock;
148139

149140
#ifndef curl_socket_typedef
150141
/* socket typedef */
151-
#if defined(CURL_WIN32) && !defined(__LWIP_OPT_H__) && !defined(LWIP_HDR_OPT_H)
142+
#if defined(_WIN32) && !defined(__LWIP_OPT_H__) && !defined(LWIP_HDR_OPT_H)
152143
typedef SOCKET curl_socket_t;
153144
#define CURL_SOCKET_BAD INVALID_SOCKET
154145
#else
@@ -644,6 +635,7 @@ typedef enum {
644635
CURLE_PROXY, /* 97 - proxy handshake error */
645636
CURLE_SSL_CLIENTCERT, /* 98 - client-side certificate required */
646637
CURLE_UNRECOVERABLE_POLL, /* 99 - poll/select returned fatal error */
638+
CURLE_TOO_LARGE, /* 100 - a value/data met its maximum */
647639
CURL_LAST /* never use! */
648640
} CURLcode;
649641

@@ -1858,7 +1850,8 @@ typedef enum {
18581850
/* allow GSSAPI credential delegation */
18591851
CURLOPT(CURLOPT_GSSAPI_DELEGATION, CURLOPTTYPE_VALUES, 210),
18601852

1861-
/* Set the name servers to use for DNS resolution */
1853+
/* Set the name servers to use for DNS resolution.
1854+
* Only supported by the c-ares DNS backend */
18621855
CURLOPT(CURLOPT_DNS_SERVERS, CURLOPTTYPE_STRINGPOINT, 211),
18631856

18641857
/* Time-out accept operations (currently for FTP only) after this amount
@@ -2214,14 +2207,17 @@ typedef enum {
22142207
/* set a specific client IP for HAProxy PROXY protocol header? */
22152208
CURLOPT(CURLOPT_HAPROXY_CLIENT_IP, CURLOPTTYPE_STRINGPOINT, 323),
22162209

2210+
/* millisecond version */
2211+
CURLOPT(CURLOPT_SERVER_RESPONSE_TIMEOUT_MS, CURLOPTTYPE_LONG, 324),
2212+
22172213
/* Snowflake options. True if enabling ocsp check */
2218-
CURLOPT(CURLOPT_SSL_SF_OCSP_CHECK, CURLOPTTYPE_LONG, 324),
2214+
CURLOPT(CURLOPT_SSL_SF_OCSP_CHECK, CURLOPTTYPE_LONG, 325),
22192215

22202216
/* Snowflake options. True if soft fail is enabled */
2221-
CURLOPT(CURLOPT_SSL_SF_OCSP_FAIL_OPEN, CURLOPTTYPE_LONG, 325),
2217+
CURLOPT(CURLOPT_SSL_SF_OCSP_FAIL_OPEN, CURLOPTTYPE_LONG, 326),
22222218

22232219
/* Snowflake options. True if OOB telemetry is enabled. Defaults to false */
2224-
CURLOPT(CURLOPT_SSL_SF_OOB_ENABLE, CURLOPTTYPE_LONG, 326),
2220+
CURLOPT(CURLOPT_SSL_SF_OOB_ENABLE, CURLOPTTYPE_LONG, 327),
22252221

22262222
CURLOPT_LASTENTRY /* the last unused */
22272223
} CURLoption;
@@ -2954,7 +2950,8 @@ typedef enum {
29542950
CURLINFO_CAPATH = CURLINFO_STRING + 62,
29552951
CURLINFO_XFER_ID = CURLINFO_OFF_T + 63,
29562952
CURLINFO_CONN_ID = CURLINFO_OFF_T + 64,
2957-
CURLINFO_LASTONE = 64
2953+
CURLINFO_QUEUE_TIME_T = CURLINFO_OFF_T + 65,
2954+
CURLINFO_LASTONE = 65
29582955
} CURLINFO;
29592956

29602957
/* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
@@ -3233,6 +3230,7 @@ CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);
32333230
#include "options.h"
32343231
#include "header.h"
32353232
#include "websockets.h"
3233+
#include "mprintf.h"
32363234

32373235
/* the typechecker doesn't work in C++ (yet) */
32383236
#if defined(__GNUC__) && defined(__GNUC_MINOR__) && \

libsnowflakeclient/deps-build/darwin/curl/include/curl/curlver.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232

3333
/* This is the version number of the libcurl package from which this header
3434
file origins: */
35-
#define LIBCURL_VERSION "8.4.0"
35+
#define LIBCURL_VERSION "8.6.0"
3636

3737
/* The numeric version number is also available "in parts" by using these
3838
defines: */
3939
#define LIBCURL_VERSION_MAJOR 8
40-
#define LIBCURL_VERSION_MINOR 4
40+
#define LIBCURL_VERSION_MINOR 6
4141
#define LIBCURL_VERSION_PATCH 0
4242

4343
/* This is the numeric version of the libcurl version number, meant for easier
@@ -59,7 +59,7 @@
5959
CURL_VERSION_BITS() macro since curl's own configure script greps for it
6060
and needs it to contain the full number.
6161
*/
62-
#define LIBCURL_VERSION_NUM 0x080400
62+
#define LIBCURL_VERSION_NUM 0x080600
6363

6464
/*
6565
* This is the date and time when the full source package was created. The
@@ -70,7 +70,7 @@
7070
*
7171
* "2007-11-23"
7272
*/
73-
#define LIBCURL_TIMESTAMP "2023-10-11"
73+
#define LIBCURL_TIMESTAMP "2024-01-31"
7474

7575
#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z))
7676
#define CURL_AT_LEAST_VERSION(x,y,z) \

libsnowflakeclient/deps-build/darwin/curl/include/curl/mprintf.h

+13-5
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,27 @@ extern "C" {
3434

3535
#if (defined(__GNUC__) || defined(__clang__)) && \
3636
defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
37-
!defined(__MINGW32__) && !defined(CURL_NO_FMT_CHECKS)
38-
#define CURL_TEMP_PRINTF(a,b) __attribute__ ((format(printf, a, b)))
37+
!defined(CURL_NO_FMT_CHECKS)
38+
#if defined(__MINGW32__) && !defined(__clang__)
39+
#define CURL_TEMP_PRINTF(fmt, arg) \
40+
__attribute__((format(gnu_printf, fmt, arg)))
3941
#else
40-
#define CURL_TEMP_PRINTF(a,b)
42+
#define CURL_TEMP_PRINTF(fmt, arg) \
43+
__attribute__((format(printf, fmt, arg)))
44+
#endif
45+
#else
46+
#define CURL_TEMP_PRINTF(fmt, arg)
4147
#endif
4248

43-
CURL_EXTERN int curl_mprintf(const char *format, ...) CURL_TEMP_PRINTF(1, 2);
49+
CURL_EXTERN int curl_mprintf(const char *format, ...)
50+
CURL_TEMP_PRINTF(1, 2);
4451
CURL_EXTERN int curl_mfprintf(FILE *fd, const char *format, ...)
4552
CURL_TEMP_PRINTF(2, 3);
4653
CURL_EXTERN int curl_msprintf(char *buffer, const char *format, ...)
4754
CURL_TEMP_PRINTF(2, 3);
4855
CURL_EXTERN int curl_msnprintf(char *buffer, size_t maxlength,
49-
const char *format, ...) CURL_TEMP_PRINTF(3, 4);
56+
const char *format, ...)
57+
CURL_TEMP_PRINTF(3, 4);
5058
CURL_EXTERN int curl_mvprintf(const char *format, va_list args)
5159
CURL_TEMP_PRINTF(1, 0);
5260
CURL_EXTERN int curl_mvfprintf(FILE *fd, const char *format, va_list args)

libsnowflakeclient/deps-build/darwin/curl/include/curl/system.h

+12-37
Original file line numberDiff line numberDiff line change
@@ -141,29 +141,6 @@
141141
# define CURL_TYPEOF_CURL_SOCKLEN_T int
142142
# endif
143143

144-
#elif defined(__SYMBIAN32__)
145-
# if defined(__EABI__) /* Treat all ARM compilers equally */
146-
# define CURL_TYPEOF_CURL_OFF_T long long
147-
# define CURL_FORMAT_CURL_OFF_T "lld"
148-
# define CURL_FORMAT_CURL_OFF_TU "llu"
149-
# define CURL_SUFFIX_CURL_OFF_T LL
150-
# define CURL_SUFFIX_CURL_OFF_TU ULL
151-
# elif defined(__CW32__)
152-
# pragma longlong on
153-
# define CURL_TYPEOF_CURL_OFF_T long long
154-
# define CURL_FORMAT_CURL_OFF_T "lld"
155-
# define CURL_FORMAT_CURL_OFF_TU "llu"
156-
# define CURL_SUFFIX_CURL_OFF_T LL
157-
# define CURL_SUFFIX_CURL_OFF_TU ULL
158-
# elif defined(__VC32__)
159-
# define CURL_TYPEOF_CURL_OFF_T __int64
160-
# define CURL_FORMAT_CURL_OFF_T "lld"
161-
# define CURL_FORMAT_CURL_OFF_TU "llu"
162-
# define CURL_SUFFIX_CURL_OFF_T LL
163-
# define CURL_SUFFIX_CURL_OFF_TU ULL
164-
# endif
165-
# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
166-
167144
#elif defined(macintosh)
168145
# include <ConditionalMacros.h>
169146
# if TYPE_LONGLONG
@@ -201,14 +178,14 @@
201178
# define CURL_TYPEOF_CURL_SOCKLEN_T int
202179

203180
#elif defined(__MINGW32__)
181+
# include <inttypes.h>
204182
# define CURL_TYPEOF_CURL_OFF_T long long
205-
# define CURL_FORMAT_CURL_OFF_T "I64d"
206-
# define CURL_FORMAT_CURL_OFF_TU "I64u"
183+
# define CURL_FORMAT_CURL_OFF_T PRId64
184+
# define CURL_FORMAT_CURL_OFF_TU PRIu64
207185
# define CURL_SUFFIX_CURL_OFF_T LL
208186
# define CURL_SUFFIX_CURL_OFF_TU ULL
209-
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
187+
# define CURL_TYPEOF_CURL_SOCKLEN_T int
210188
# define CURL_PULL_SYS_TYPES_H 1
211-
# define CURL_PULL_WS2TCPIP_H 1
212189

213190
#elif defined(__VMS)
214191
# if defined(__VAX)
@@ -370,7 +347,14 @@
370347
/* ===================================== */
371348

372349
#elif defined(_MSC_VER)
373-
# if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
350+
# if (_MSC_VER >= 1800)
351+
# include <inttypes.h>
352+
# define CURL_TYPEOF_CURL_OFF_T __int64
353+
# define CURL_FORMAT_CURL_OFF_T PRId64
354+
# define CURL_FORMAT_CURL_OFF_TU PRIu64
355+
# define CURL_SUFFIX_CURL_OFF_T i64
356+
# define CURL_SUFFIX_CURL_OFF_TU ui64
357+
# elif (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
374358
# define CURL_TYPEOF_CURL_OFF_T __int64
375359
# define CURL_FORMAT_CURL_OFF_T "I64d"
376360
# define CURL_FORMAT_CURL_OFF_TU "I64u"
@@ -432,15 +416,6 @@
432416
#define CURL_PULL_SYS_POLL_H
433417
#endif
434418

435-
436-
/* CURL_PULL_WS2TCPIP_H is defined above when inclusion of header file */
437-
/* ws2tcpip.h is required here to properly make type definitions below. */
438-
#ifdef CURL_PULL_WS2TCPIP_H
439-
# include <winsock2.h>
440-
# include <windows.h>
441-
# include <ws2tcpip.h>
442-
#endif
443-
444419
/* CURL_PULL_SYS_TYPES_H is defined above when inclusion of header file */
445420
/* sys/types.h is required here to properly make type definitions below. */
446421
#ifdef CURL_PULL_SYS_TYPES_H

libsnowflakeclient/deps-build/darwin/curl/include/curl/urlapi.h

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ typedef enum {
6363
CURLUE_BAD_SLASHES, /* 28 */
6464
CURLUE_BAD_USER, /* 29 */
6565
CURLUE_LACKS_IDN, /* 30 */
66+
CURLUE_TOO_LARGE, /* 31 */
6667
CURLUE_LAST
6768
} CURLUcode;
6869

Binary file not shown.
Binary file not shown.

libsnowflakeclient/deps-build/darwin/openssl/ct_log_list.cnf

-9
This file was deleted.

libsnowflakeclient/deps-build/darwin/openssl/ct_log_list.cnf.dist

-9
This file was deleted.

libsnowflakeclient/deps-build/darwin/openssl/fipsmodule.cnf

-5
This file was deleted.

libsnowflakeclient/deps-build/darwin/openssl/include/openssl/bio.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ int BIO_meth_set_puts(BIO_METHOD *biom,
867867
int (*puts) (BIO *, const char *));
868868
int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int);
869869
int BIO_meth_set_gets(BIO_METHOD *biom,
870-
int (*gets) (BIO *, char *, int));
870+
int (*ossl_gets) (BIO *, char *, int));
871871
long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *);
872872
int BIO_meth_set_ctrl(BIO_METHOD *biom,
873873
long (*ctrl) (BIO *, int, long, void *));

libsnowflakeclient/deps-build/darwin/openssl/include/openssl/cmserr.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Generated by util/mkerr.pl DO NOT EDIT
3-
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
3+
* Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
44
*
55
* Licensed under the Apache License 2.0 (the "License"). You may not use
66
* this file except in compliance with the License. You can obtain a copy
@@ -113,6 +113,7 @@
113113
# define CMS_R_UNSUPPORTED_LABEL_SOURCE 193
114114
# define CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE 155
115115
# define CMS_R_UNSUPPORTED_RECIPIENT_TYPE 154
116+
# define CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM 195
116117
# define CMS_R_UNSUPPORTED_TYPE 156
117118
# define CMS_R_UNWRAP_ERROR 157
118119
# define CMS_R_UNWRAP_FAILURE 180

libsnowflakeclient/deps-build/darwin/openssl/include/openssl/conferr.h

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
# define CONF_R_NUMBER_TOO_LARGE 121
3939
# define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124
4040
# define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111
41+
# define CONF_R_RECURSIVE_SECTION_REFERENCE 126
4142
# define CONF_R_RELATIVE_PATH 125
4243
# define CONF_R_SSL_COMMAND_SECTION_EMPTY 117
4344
# define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118

libsnowflakeclient/deps-build/darwin/openssl/include/openssl/dh.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ DECLARE_ASN1_ITEM(DHparams)
141141
# define DH_GENERATOR_3 3
142142
# define DH_GENERATOR_5 5
143143

144-
/* DH_check error codes */
144+
/* DH_check error codes, some of them shared with DH_check_pub_key */
145145
/*
146146
* NB: These values must align with the equivalently named macros in
147147
* internal/ffc.h.
@@ -151,10 +151,10 @@ DECLARE_ASN1_ITEM(DHparams)
151151
# define DH_UNABLE_TO_CHECK_GENERATOR 0x04
152152
# define DH_NOT_SUITABLE_GENERATOR 0x08
153153
# define DH_CHECK_Q_NOT_PRIME 0x10
154-
# define DH_CHECK_INVALID_Q_VALUE 0x20
154+
# define DH_CHECK_INVALID_Q_VALUE 0x20 /* +DH_check_pub_key */
155155
# define DH_CHECK_INVALID_J_VALUE 0x40
156156
# define DH_MODULUS_TOO_SMALL 0x80
157-
# define DH_MODULUS_TOO_LARGE 0x100
157+
# define DH_MODULUS_TOO_LARGE 0x100 /* +DH_check_pub_key */
158158

159159
/* DH_check_pub_key error codes */
160160
# define DH_CHECK_PUBKEY_TOO_SMALL 0x01

libsnowflakeclient/deps-build/darwin/openssl/include/openssl/dherr.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Generated by util/mkerr.pl DO NOT EDIT
3-
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
3+
* Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
44
*
55
* Licensed under the Apache License 2.0 (the "License"). You may not use
66
* this file except in compliance with the License. You can obtain a copy
@@ -50,6 +50,7 @@
5050
# define DH_R_NO_PRIVATE_VALUE 100
5151
# define DH_R_PARAMETER_ENCODING_ERROR 105
5252
# define DH_R_PEER_KEY_ERROR 111
53+
# define DH_R_Q_TOO_LARGE 130
5354
# define DH_R_SHARED_INFO_ERROR 113
5455
# define DH_R_UNABLE_TO_CHECK_GENERATOR 121
5556

0 commit comments

Comments
 (0)