Updated patches for new cURL version.
This commit is contained in:
parent
d73b98d03f
commit
e0031db78a
@ -1,8 +1,11 @@
|
|||||||
diff --git "a/D:\\_Sandbox\\curl\\curl-x86\\lib\\getenv.c.orig" "b/D:\\_Sandbox\\curl\\curl-x86\\lib\\getenv.c"
|
lib/getenv.c | 49 +++++++++++++++++++++++++++++++++----------------
|
||||||
index 92c5350..1d3b0cb 100644
|
1 file changed, 33 insertions(+), 16 deletions(-)
|
||||||
--- "a/lib/getenv.c"
|
|
||||||
+++ "b/lib/getenv.c"
|
diff --git a/lib/getenv.c b/lib/getenv.c
|
||||||
@@ -24,25 +24,23 @@
|
index 5f00fd1..3eff07a 100644
|
||||||
|
--- a/lib/getenv.c
|
||||||
|
+++ b/lib/getenv.c
|
||||||
|
@@ -26,25 +26,23 @@
|
||||||
|
|
||||||
#include <curl/curl.h>
|
#include <curl/curl.h>
|
||||||
#include "curl_memory.h"
|
#include "curl_memory.h"
|
||||||
@ -34,7 +37,7 @@ index 92c5350..1d3b0cb 100644
|
|||||||
if(!tmp) {
|
if(!tmp) {
|
||||||
free(buf);
|
free(buf);
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -53,25 +51,44 @@ static char *GetEnv(const char *variable)
|
@@ -55,25 +53,44 @@ static char *GetEnv(const char *variable)
|
||||||
|
|
||||||
/* It's possible for rc to be 0 if the variable was found but empty.
|
/* It's possible for rc to be 0 if the variable was found but empty.
|
||||||
Since getenv doesn't make that distinction we ignore it as well. */
|
Since getenv doesn't make that distinction we ignore it as well. */
|
||||||
|
@ -1,8 +1,11 @@
|
|||||||
diff --git "a/D:\\_Sandbox\\curl\\curl-src\\lib\\curl_threads.h.orig" "b/D:\\_Sandbox\\curl\\curl-src\\lib\\curl_threads.h"
|
lib/curl_threads.h | 8 +-------
|
||||||
index e10b7a1..22fdb49 100644
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||||
--- "a/lib/curl_threads.h"
|
|
||||||
+++ "b/lib/curl_threads.h"
|
diff --git a/lib/curl_threads.h b/lib/curl_threads.h
|
||||||
@@ -37,13 +37,7 @@
|
index 63392f6..8a40108 100644
|
||||||
|
--- a/lib/curl_threads.h
|
||||||
|
+++ b/lib/curl_threads.h
|
||||||
|
@@ -39,13 +39,7 @@
|
||||||
# define curl_mutex_t CRITICAL_SECTION
|
# define curl_mutex_t CRITICAL_SECTION
|
||||||
# define curl_thread_t HANDLE
|
# define curl_thread_t HANDLE
|
||||||
# define curl_thread_t_null (HANDLE)0
|
# define curl_thread_t_null (HANDLE)0
|
||||||
|
@ -1,8 +1,11 @@
|
|||||||
|
src/tool_doswin.c | 49 ++++++++++++++++++++++++++++++++++---------------
|
||||||
|
1 file changed, 34 insertions(+), 15 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/tool_doswin.c b/src/tool_doswin.c
|
diff --git a/src/tool_doswin.c b/src/tool_doswin.c
|
||||||
index 9b6a7d5..93d0814 100644
|
index d8695e9..27dc9b6 100644
|
||||||
--- a/src/tool_doswin.c
|
--- a/src/tool_doswin.c
|
||||||
+++ b/src/tool_doswin.c
|
+++ b/src/tool_doswin.c
|
||||||
@@ -612,6 +612,37 @@ char **__crt0_glob_function(char *arg)
|
@@ -614,6 +614,37 @@ char **__crt0_glob_function(char *arg)
|
||||||
* HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\SafeProcessSearchMode
|
* HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\SafeProcessSearchMode
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -40,7 +43,7 @@ index 9b6a7d5..93d0814 100644
|
|||||||
CURLcode FindWin32CACert(struct OperationConfig *config,
|
CURLcode FindWin32CACert(struct OperationConfig *config,
|
||||||
curl_sslbackend backend,
|
curl_sslbackend backend,
|
||||||
const TCHAR *bundle_file)
|
const TCHAR *bundle_file)
|
||||||
@@ -627,21 +658,9 @@ CURLcode FindWin32CACert(struct OperationConfig *config,
|
@@ -629,21 +660,9 @@ CURLcode FindWin32CACert(struct OperationConfig *config,
|
||||||
if((curlinfo->features & CURL_VERSION_SSL) &&
|
if((curlinfo->features & CURL_VERSION_SSL) &&
|
||||||
backend != CURLSSLBACKEND_SCHANNEL) {
|
backend != CURLSSLBACKEND_SCHANNEL) {
|
||||||
|
|
||||||
|
@ -1,8 +1,11 @@
|
|||||||
diff --git "a/src/tool_parsecfg.c" "b/src/tool_parsecfg.c"
|
src/tool_parsecfg.c | 42 ++++++++++++++++--------------------------
|
||||||
index 3630cec..8a44369 100644
|
1 file changed, 16 insertions(+), 26 deletions(-)
|
||||||
--- "a/src/tool_parsecfg.c"
|
|
||||||
+++ "b/src/tool_parsecfg.c"
|
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
|
||||||
@@ -45,29 +45,20 @@ static const char *unslashquote(const char *line, char *param);
|
index a166757..6a00b80 100644
|
||||||
|
--- a/src/tool_parsecfg.c
|
||||||
|
+++ b/src/tool_parsecfg.c
|
||||||
|
@@ -47,29 +47,20 @@ static const char *unslashquote(const char *line, char *param);
|
||||||
static bool my_get_line(FILE *fp, struct curlx_dynbuf *, bool *error);
|
static bool my_get_line(FILE *fp, struct curlx_dynbuf *, bool *error);
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
@ -44,7 +47,7 @@ index 3630cec..8a44369 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -87,7 +78,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
|
@@ -89,7 +80,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
|
||||||
|
|
||||||
if(!filename) {
|
if(!filename) {
|
||||||
/* NULL means load .curlrc from homedir! */
|
/* NULL means load .curlrc from homedir! */
|
||||||
@ -53,7 +56,7 @@ index 3630cec..8a44369 100644
|
|||||||
if(curlrc) {
|
if(curlrc) {
|
||||||
file = fopen(curlrc, FOPEN_READTEXT);
|
file = fopen(curlrc, FOPEN_READTEXT);
|
||||||
if(!file) {
|
if(!file) {
|
||||||
@@ -98,14 +89,13 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
|
@@ -100,14 +91,13 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
|
||||||
}
|
}
|
||||||
#ifdef WIN32 /* Windows */
|
#ifdef WIN32 /* Windows */
|
||||||
else {
|
else {
|
||||||
|
Loading…
Reference in New Issue
Block a user