diff options
Diffstat (limited to 'test.patch')
-rw-r--r-- | test.patch | 22 |
1 files changed, 20 insertions, 2 deletions
@@ -88,7 +88,7 @@ index 9f1dd67ec..7e8da6df2 100644 | |||
88 | static void tls_xwrite(tls_state_t *tls, int len) | 88 | static void tls_xwrite(tls_state_t *tls, int len) |
89 | { | 89 | { |
90 | diff --git a/networking/wget.c b/networking/wget.c | 90 | diff --git a/networking/wget.c b/networking/wget.c |
91 | index 6a64836fb..b92f22d3e 100644 | 91 | index 6a64836fb..6a82f1fa4 100644 |
92 | --- a/networking/wget.c | 92 | --- a/networking/wget.c |
93 | +++ b/networking/wget.c | 93 | +++ b/networking/wget.c |
94 | @@ -689,6 +689,7 @@ static void reset_beg_range_to_zero(void) | 94 | @@ -689,6 +689,7 @@ static void reset_beg_range_to_zero(void) |
@@ -117,7 +117,7 @@ index 6a64836fb..b92f22d3e 100644 | |||
117 | + fflush_all(); | 117 | + fflush_all(); |
118 | + | 118 | + |
119 | + struct tls *ctx = tls_client(); | 119 | + struct tls *ctx = tls_client(); |
120 | + if(tls == NULL) | 120 | + if(ctx == NULL) |
121 | + bb_error_msg_and_die("Out of memory"); | 121 | + bb_error_msg_and_die("Out of memory"); |
122 | + struct tls_config *config = tls_config_new(); | 122 | + struct tls_config *config = tls_config_new(); |
123 | + if(config == NULL) | 123 | + if(config == NULL) |
@@ -134,3 +134,21 @@ index 6a64836fb..b92f22d3e 100644 | |||
134 | #endif | 134 | #endif |
135 | 135 | ||
136 | #if ENABLE_FEATURE_WGET_HTTPS | 136 | #if ENABLE_FEATURE_WGET_HTTPS |
137 | diff --git a/win32/mingw.c b/win32/mingw.c | ||
138 | index 87e7ca602..7bad3e4fa 100644 | ||
139 | --- a/win32/mingw.c | ||
140 | +++ b/win32/mingw.c | ||
141 | @@ -1214,11 +1214,13 @@ elevation_state(void) | ||
142 | return elevated | (enabled << 1); | ||
143 | } | ||
144 | |||
145 | +/* | ||
146 | int getuid(void) | ||
147 | { | ||
148 | return elevation_state() == (ELEVATED_PRIVILEGE | ADMIN_ENABLED) ? | ||
149 | 0 : DEFAULT_UID; | ||
150 | } | ||
151 | +*/ | ||
152 | |||
153 | struct passwd *getpwnam(const char *name) | ||
154 | { | ||