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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 20 additions & 22 deletions
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

Lines changed: 4 additions & 4 deletions
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) \

0 commit comments

Comments
 (0)