diff options
-rw-r--r-- | CHANGES | 12 | ||||
-rw-r--r-- | docs/libcurl/curl_easy_setopt.3 | 19 | ||||
-rw-r--r-- | include/curl/curl.h | 2 | ||||
-rw-r--r-- | src/version.h | 2 |
4 files changed, 29 insertions, 6 deletions
@@ -7,10 +7,20 @@ History of Changes Daniel (12 April 2002) +- Fixed the TIMER_CONNECT to be more accurate for FTP transfers. Previously + FTP transfers got the "connect done" time set after the initial FTP commands + and not directly after the TCP/IP connect as it should. + + I also made the time stamp get set even if the connect itself fails, which + it didn't do previously. + - Jean-Philippe Barrette-LaPierre provided his patch that introduces CURLOPT_DEBUGFUNCTION and CURLOPT_DEBUGDATA. They allow a program to a set a callback to receive debug/information data. That includes headers and data - that is received and sent. + that is received and sent. CURLOPT_VERBOSE still controls it. + + By default, there is an internal debugfunction that will make things look + and work as before if not changed. Daniel (10 April 2002) - Sebastien Willemijns found out that -x didn't use the default port number as diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index 2027977e1..9e8b26904 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -2,7 +2,7 @@ .\" nroff -man [file] .\" $Id$ .\" -.TH curl_easy_setopt 3 "2 Apr 2002" "libcurl 7.9.2" "libcurl Manual" +.TH curl_easy_setopt 3 "12 Apr 2002" "libcurl 7.9.6" "libcurl Manual" .SH NAME curl_easy_setopt - Set curl easy-session options .SH SYNOPSIS @@ -35,7 +35,7 @@ The \fIhandle\fP is the return code from a \fIcurl_easy_init(3)\fP or \fIcurl_easy_duphandle(3)\fP call. .SH OPTIONS The options are listed in a sort of random order, but you'll figure it out! -.TP 0.8i +.TP 0.4i .B CURLOPT_FILE Data pointer to pass to the file write function. Note that if you specify the \fICURLOPT_WRITEFUNCTION\fP, this is the pointer you'll get as input. If you @@ -626,10 +626,23 @@ libcurl caches info for 60 seconds. (Added in libcurl 7.9.3) Pass a long. If the value is non-zero, it tells curl to use a global DNS cache that will survive between easy handles creations and deletions. This is not thread-safe and this will use a global varible. (Added in libcurl 7.9.3) +.TP +.B CURLOPT_DEBUGFUNCTION +Function pointer that should match the following prototype: \fIint +curl_debug_callback (CURL *, curl_infotype, char *, size_t, void *);\fP +This function will receive debug information if CURLOPT_VERBOSE is +enabled. The curl_infotype argument specifies what kind of information it +is. This funtion must return 0. +.TP +.B CURLOPT_DEBUGDATA +Pass a pointer to whatever you want passed in to your CURLOPT_DEBUGFUNCTION in +the last void * argument. This pointer is not used by libcurl, it is only +passed to the callback. .PP .SH RETURN VALUE CURLE_OK (zero) means that the option was set properly, non-zero means an -error occurred as \fI<curl/curl.h>\fP defines. +error occurred as \fI<curl/curl.h>\fP defines. See the \fIlibcurl-errors.3\fP +man page for the full list with descriptions. .SH "SEE ALSO" .BR curl_easy_init "(3), " curl_easy_cleanup "(3), " .SH BUGS diff --git a/include/curl/curl.h b/include/curl/curl.h index ff37d3a5b..a5354758f 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -662,7 +662,7 @@ CURLcode curl_global_init(long flags); void curl_global_cleanup(void); /* This is the version number */ -#define LIBCURL_VERSION "7.9.6-pre4" +#define LIBCURL_VERSION "7.9.6-pre5" #define LIBCURL_VERSION_NUM 0x070906 /* linked-list structure for the CURLOPT_QUOTE option (and other) */ diff --git a/src/version.h b/src/version.h index 82df757c6..f10a63472 100644 --- a/src/version.h +++ b/src/version.h @@ -1,3 +1,3 @@ #define CURL_NAME "curl" -#define CURL_VERSION "7.9.6-pre3" +#define CURL_VERSION "7.9.6-pre5" #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") " |