Updated patches for new cURL version.
This commit is contained in:
parent
1256478ac4
commit
59b2459310
@ -2,7 +2,7 @@
|
|||||||
1 file changed, 9 insertions(+)
|
1 file changed, 9 insertions(+)
|
||||||
|
|
||||||
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
|
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
|
||||||
index 0ae1466..3e54e51 100644
|
index 40ac4e3..a5ed701 100644
|
||||||
--- a/src/tool_getparam.c
|
--- a/src/tool_getparam.c
|
||||||
+++ b/src/tool_getparam.c
|
+++ b/src/tool_getparam.c
|
||||||
@@ -23,6 +23,10 @@
|
@@ -23,6 +23,10 @@
|
||||||
@ -16,7 +16,7 @@ index 0ae1466..3e54e51 100644
|
|||||||
#include "strcase.h"
|
#include "strcase.h"
|
||||||
|
|
||||||
#include "curlx.h"
|
#include "curlx.h"
|
||||||
@@ -554,8 +558,13 @@ static void cleanarg(argv_item_t str)
|
@@ -558,8 +562,13 @@ static void cleanarg(argv_item_t str)
|
||||||
* argument out so that the username:password is not displayed in the
|
* argument out so that the username:password is not displayed in the
|
||||||
* system process list */
|
* system process list */
|
||||||
if(str) {
|
if(str) {
|
||||||
|
@ -2,10 +2,10 @@
|
|||||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/tool_operate.c b/src/tool_operate.c
|
diff --git a/src/tool_operate.c b/src/tool_operate.c
|
||||||
index 007a5e0..0358fcf 100644
|
index e4b53e2..5441e3d 100644
|
||||||
--- a/src/tool_operate.c
|
--- a/src/tool_operate.c
|
||||||
+++ b/src/tool_operate.c
|
+++ b/src/tool_operate.c
|
||||||
@@ -3015,11 +3015,15 @@ static CURLcode cacertpaths(struct OperationConfig *config)
|
@@ -3005,11 +3005,15 @@ static CURLcode cacertpaths(struct OperationConfig *config)
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
if(!env) {
|
if(!env) {
|
||||||
#if defined(CURL_CA_SEARCH_SAFE)
|
#if defined(CURL_CA_SEARCH_SAFE)
|
||||||
|
@ -2,10 +2,10 @@
|
|||||||
1 file changed, 9 insertions(+), 7 deletions(-)
|
1 file changed, 9 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
|
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
|
||||||
index d79e869f0..93eb2a428 100644
|
index 651ec8e..406f774 100644
|
||||||
--- a/src/tool_parsecfg.c
|
--- a/src/tool_parsecfg.c
|
||||||
+++ b/src/tool_parsecfg.c
|
+++ b/src/tool_parsecfg.c
|
||||||
@@ -57,7 +57,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
|
@@ -55,7 +55,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! */
|
||||||
@ -14,7 +14,7 @@ index d79e869f0..93eb2a428 100644
|
|||||||
if(curlrc) {
|
if(curlrc) {
|
||||||
file = fopen(curlrc, FOPEN_READTEXT);
|
file = fopen(curlrc, FOPEN_READTEXT);
|
||||||
if(!file) {
|
if(!file) {
|
||||||
@@ -68,14 +68,16 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
|
@@ -66,14 +66,16 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
|
||||||
}
|
}
|
||||||
#ifdef _WIN32 /* Windows */
|
#ifdef _WIN32 /* Windows */
|
||||||
else {
|
else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user