aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--lib/sendf.c23
2 files changed, 15 insertions, 12 deletions
diff --git a/CHANGES b/CHANGES
index 1b9f35120..3f68e041d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
Changelog
+Daniel (7 December 2004)
+- Fixed so that the final error message is sent to the verbose info "stream"
+ even if no errorbuffer is set.
+
Daniel (6 December 2004)
- Dan Fandrich added the --disable-cookies option to configure to build
libcurl without cookie support. This is mainly useful if you want to build a
diff --git a/lib/sendf.c b/lib/sendf.c
index 53a0a4e6a..175323903 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -158,21 +158,20 @@ void Curl_failf(struct SessionHandle *data, const char *fmt, ...)
if(data->set.errorbuffer && !data->state.errorbuf) {
vsnprintf(data->set.errorbuffer, CURL_ERROR_SIZE, fmt, ap);
data->state.errorbuf = TRUE; /* wrote error string */
+ }
+ if(data->set.verbose) {
+ size_t len;
+
+ vsnprintf(data->state.buffer, BUFSIZE, fmt, ap);
+ len = strlen(data->state.buffer);
- if(data->set.verbose) {
- size_t len = strlen(data->set.errorbuffer);
- bool doneit=FALSE;
- if(len < CURL_ERROR_SIZE - 1) {
- doneit = TRUE;
- data->set.errorbuffer[len] = '\n';
- data->set.errorbuffer[++len] = '\0';
+ if(len < BUFSIZE - 1) {
+ data->state.buffer[len] = '\n';
+ data->state.buffer[++len] = '\0';
}
- Curl_debug(data, CURLINFO_TEXT, data->set.errorbuffer, len, NULL);
- if(doneit)
- /* cut off the newline again */
- data->set.errorbuffer[--len]=0;
- }
+ Curl_debug(data, CURLINFO_TEXT, data->state.buffer, len, NULL);
}
+
va_end(ap);
}