From e09eda9c7cae314b55a11ca6f03f84fbcd04cead Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 17 Jan 2001 13:19:01 +0000 Subject: download and highlevel are replaced with transfer --- lib/transfer.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 lib/transfer.h (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h new file mode 100644 index 000000000..ef3d6da02 --- /dev/null +++ b/lib/transfer.h @@ -0,0 +1,44 @@ +#ifndef __TRANSFER_H +#define __TRANSFER_H +/***************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 2000, Daniel Stenberg, , et al. + * + * In order to be useful for every potential user, curl and libcurl are + * dual-licensed under the MPL and the MIT/X-derivate licenses. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the MPL or the MIT/X-derivate + * licenses. You may pick one of these licenses. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + * $Id$ + *****************************************************************************/ +CURLcode curl_transfer(CURL *curl); + +CURLcode +Curl_Transfer (struct connectdata *data, + int sockfd, /* socket to read from or -1 */ + int size, /* -1 if unknown at this point */ + bool getheader, /* TRUE if header parsing is wanted */ + long *bytecountp, /* return number of bytes read */ + int writesockfd, /* socket to write to, it may very well be + the same we read from. -1 disables */ + long *writebytecountp /* return number of bytes written */ +); + +#ifdef _OLDCURL +/* "hackish" define to make sources compile without too much human editing. + Don't use "Tranfer()" anymore! */ +#define Transfer(a,b,c,d,e,f,g) Curl_Transfer(a,b,c,d,e,f,g) +#endif + +#endif -- cgit v1.2.1 From 1efec6572e461216d202d198bd088f455fa6e759 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 9 Mar 2001 15:17:09 +0000 Subject: curl_transfer became Curl_perform() to better match the public name and use the correct prefix --- lib/transfer.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index ef3d6da02..8237bec2b 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -22,8 +22,9 @@ * * $Id$ *****************************************************************************/ -CURLcode curl_transfer(CURL *curl); +CURLcode Curl_perform(CURL *curl); +/* This sets up a forthcoming transfer */ CURLcode Curl_Transfer (struct connectdata *data, int sockfd, /* socket to read from or -1 */ -- cgit v1.2.1 From 4c2ca97d6d50ec9ea48893659a8af6de954e26dd Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 11 May 2001 11:38:42 +0000 Subject: removed unused #ifdef'ed section --- lib/transfer.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 8237bec2b..0cda6adbb 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -35,11 +35,4 @@ Curl_Transfer (struct connectdata *data, the same we read from. -1 disables */ long *writebytecountp /* return number of bytes written */ ); - -#ifdef _OLDCURL -/* "hackish" define to make sources compile without too much human editing. - Don't use "Tranfer()" anymore! */ -#define Transfer(a,b,c,d,e,f,g) Curl_Transfer(a,b,c,d,e,f,g) -#endif - #endif -- cgit v1.2.1 From 4999087879be21cc2f0a65edc9f2dd4f877b94d5 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 15 Aug 2001 06:54:51 +0000 Subject: modified the Curl_perform() proto --- lib/transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 0cda6adbb..3254a966b 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -22,7 +22,7 @@ * * $Id$ *****************************************************************************/ -CURLcode Curl_perform(CURL *curl); +CURLcode Curl_perform(struct UrlData *data); /* This sets up a forthcoming transfer */ CURLcode -- cgit v1.2.1 From 0ece1b5c34c049a3226f7dd793cf75e470c46e4d Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 30 Aug 2001 22:48:34 +0000 Subject: Major rename and redesign of the internal "backbone" structs. Details will be posted in a minute to the libcurl list. --- lib/transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 3254a966b..c35f7c6fb 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -22,7 +22,7 @@ * * $Id$ *****************************************************************************/ -CURLcode Curl_perform(struct UrlData *data); +CURLcode Curl_perform(struct SessionHandle *data); /* This sets up a forthcoming transfer */ CURLcode -- cgit v1.2.1 From 8b6314ccfbe48bba2cd560812dd1841425f3bd79 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 3 Jan 2002 15:01:22 +0000 Subject: merged the multi-dev branch back into MAIN again --- lib/transfer.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index c35f7c6fb..6f616c8ad 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2000, Daniel Stenberg, , et al. + * Copyright (C) 2001, Daniel Stenberg, , et al. * * In order to be useful for every potential user, curl and libcurl are * dual-licensed under the MPL and the MIT/X-derivate licenses. @@ -24,6 +24,17 @@ *****************************************************************************/ CURLcode Curl_perform(struct SessionHandle *data); +CURLcode Curl_pretransfer(struct SessionHandle *data); +CURLcode Curl_posttransfer(struct SessionHandle *data); + +CURLcode Curl_readwrite(struct connectdata *conn, bool *done); +void Curl_single_fdset(struct connectdata *conn, + fd_set *read_fd_set, + fd_set *write_fd_set, + fd_set *exc_fd_set, + int *max_fd); +CURLcode Curl_readwrite_init(struct connectdata *conn); + /* This sets up a forthcoming transfer */ CURLcode Curl_Transfer (struct connectdata *data, -- cgit v1.2.1 From 974f314f5785156af6983675aeb28313cc8ba2ea Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 19 Mar 2002 07:54:55 +0000 Subject: copyright string (year) update --- lib/transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 6f616c8ad..0e640ce83 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2001, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2002, Daniel Stenberg, , et al. * * In order to be useful for every potential user, curl and libcurl are * dual-licensed under the MPL and the MIT/X-derivate licenses. -- cgit v1.2.1 From ba4e69bebc8f7f32f3bc7faa1e13e7580754075b Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 3 Sep 2002 11:52:59 +0000 Subject: updated source code boilerplate/header --- lib/transfer.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 0e640ce83..cdcbf0f71 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -1,6 +1,6 @@ #ifndef __TRANSFER_H #define __TRANSFER_H -/***************************************************************************** +/*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | * / __| | | | |_) | | @@ -9,19 +9,19 @@ * * Copyright (C) 1998 - 2002, Daniel Stenberg, , et al. * - * In order to be useful for every potential user, curl and libcurl are - * dual-licensed under the MPL and the MIT/X-derivate licenses. - * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the MPL or the MIT/X-derivate - * licenses. You may pick one of these licenses. + * furnished to do so, under the terms of the COPYING file. * * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * * $Id$ - *****************************************************************************/ + ***************************************************************************/ CURLcode Curl_perform(struct SessionHandle *data); CURLcode Curl_pretransfer(struct SessionHandle *data); -- cgit v1.2.1 From 5f649a16495646c638cc9f56a4c102a71e3fd49a Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 7 Oct 2002 13:38:34 +0000 Subject: Move the URL concat code to Curl_follow(), and added a proto for that function. For Location: following. --- lib/transfer.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index cdcbf0f71..c2c2fdeb7 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -23,10 +23,9 @@ * $Id$ ***************************************************************************/ CURLcode Curl_perform(struct SessionHandle *data); - CURLcode Curl_pretransfer(struct SessionHandle *data); CURLcode Curl_posttransfer(struct SessionHandle *data); - +CURLcode Curl_follow(struct SessionHandle *data, char *newurl); CURLcode Curl_readwrite(struct connectdata *conn, bool *done); void Curl_single_fdset(struct connectdata *conn, fd_set *read_fd_set, -- cgit v1.2.1 From f26a338a54e04d0a6907f5d2479d8b0fa9daf297 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 16 Jan 2003 21:08:12 +0000 Subject: copyright year update in the source header --- lib/transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index c2c2fdeb7..e849698d6 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2002, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2003, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms -- cgit v1.2.1 From b60e0fa97ed7ddc66d0ad6d00dfd78319bb6ad36 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 5 Jan 2004 22:29:29 +0000 Subject: David J Meyer's large file support. --- lib/transfer.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index e849698d6..64aa34085 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -38,11 +38,11 @@ CURLcode Curl_readwrite_init(struct connectdata *conn); CURLcode Curl_Transfer (struct connectdata *data, int sockfd, /* socket to read from or -1 */ - int size, /* -1 if unknown at this point */ + off_t size, /* -1 if unknown at this point */ bool getheader, /* TRUE if header parsing is wanted */ - long *bytecountp, /* return number of bytes read */ + off_t *bytecountp, /* return number of bytes read */ int writesockfd, /* socket to write to, it may very well be the same we read from. -1 disables */ - long *writebytecountp /* return number of bytes written */ + off_t *writebytecountp /* return number of bytes written */ ); #endif -- cgit v1.2.1 From 053f6c85efd0bf698f73343989474d672d0563a8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 7 Jan 2004 09:19:33 +0000 Subject: updated year in the copyright string --- lib/transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 64aa34085..cd89a9a04 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2003, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms -- cgit v1.2.1 From b791e158f0e04a518dea19fdaf0bfbf71b343c64 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 22 Jan 2004 12:45:50 +0000 Subject: use curl_off_t instead of off_t! --- lib/transfer.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index cd89a9a04..d1b1a7697 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -38,11 +38,11 @@ CURLcode Curl_readwrite_init(struct connectdata *conn); CURLcode Curl_Transfer (struct connectdata *data, int sockfd, /* socket to read from or -1 */ - off_t size, /* -1 if unknown at this point */ + curl_off_t size, /* -1 if unknown at this point */ bool getheader, /* TRUE if header parsing is wanted */ - off_t *bytecountp, /* return number of bytes read */ + curl_off_t *bytecountp, /* return number of bytes read */ int writesockfd, /* socket to write to, it may very well be the same we read from. -1 disables */ - off_t *writebytecountp /* return number of bytes written */ + curl_off_t *writecountp /* return number of bytes written */ ); #endif -- cgit v1.2.1 From ce5805a955c5a79d85792caad47594987f0e0b26 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 9 Mar 2004 22:52:50 +0000 Subject: Use curl_socket_t instead of int for holding sockets. The typedefs and defines are in setup.h. --- lib/transfer.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index d1b1a7697..cc6eca0df 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -37,12 +37,14 @@ CURLcode Curl_readwrite_init(struct connectdata *conn); /* This sets up a forthcoming transfer */ CURLcode Curl_Transfer (struct connectdata *data, - int sockfd, /* socket to read from or -1 */ + curl_socket_t sockfd, /* socket to read from or + CURL_SOCKET_BAD */ curl_off_t size, /* -1 if unknown at this point */ bool getheader, /* TRUE if header parsing is wanted */ curl_off_t *bytecountp, /* return number of bytes read */ - int writesockfd, /* socket to write to, it may very well be - the same we read from. -1 disables */ + curl_socket_t writesockfd, /* socket to write to, it may very + well be the same we read from. + CURL_SOCKET_BAD disables */ curl_off_t *writecountp /* return number of bytes written */ ); #endif -- cgit v1.2.1 From 7225b1400236c786add1516e38676d65a7bbd327 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 10 Mar 2004 16:01:47 +0000 Subject: curl_socket_t mistakes cleanup --- lib/transfer.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index cc6eca0df..c99c20347 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -37,14 +37,13 @@ CURLcode Curl_readwrite_init(struct connectdata *conn); /* This sets up a forthcoming transfer */ CURLcode Curl_Transfer (struct connectdata *data, - curl_socket_t sockfd, /* socket to read from or - CURL_SOCKET_BAD */ + int sockindex, /* socket index to read from or -1 */ curl_off_t size, /* -1 if unknown at this point */ bool getheader, /* TRUE if header parsing is wanted */ curl_off_t *bytecountp, /* return number of bytes read */ - curl_socket_t writesockfd, /* socket to write to, it may very - well be the same we read from. - CURL_SOCKET_BAD disables */ + int writesockindex, /* socket index to write to, it may + very well be the same we read from. + -1 disables */ curl_off_t *writecountp /* return number of bytes written */ ); #endif -- cgit v1.2.1 From fd802db39f77fa3985d20e461742bf24644065d6 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 25 May 2004 21:47:29 +0000 Subject: initial support for "uploading" to file:// URLs --- lib/transfer.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index c99c20347..422bb064c 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -1,10 +1,10 @@ #ifndef __TRANSFER_H #define __TRANSFER_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. @@ -12,7 +12,7 @@ * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -27,15 +27,17 @@ CURLcode Curl_pretransfer(struct SessionHandle *data); CURLcode Curl_posttransfer(struct SessionHandle *data); CURLcode Curl_follow(struct SessionHandle *data, char *newurl); CURLcode Curl_readwrite(struct connectdata *conn, bool *done); -void Curl_single_fdset(struct connectdata *conn, +void Curl_single_fdset(struct connectdata *conn, fd_set *read_fd_set, fd_set *write_fd_set, fd_set *exc_fd_set, int *max_fd); CURLcode Curl_readwrite_init(struct connectdata *conn); +int Curl_fillreadbuffer(struct connectdata *conn, int bytes); + /* This sets up a forthcoming transfer */ -CURLcode +CURLcode Curl_Transfer (struct connectdata *data, int sockindex, /* socket index to read from or -1 */ curl_off_t size, /* -1 if unknown at this point */ -- cgit v1.2.1 From ea81dd9e2e163f096df884b22e823f1a0e8569f0 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 3 Jun 2004 11:41:05 +0000 Subject: Alexander Krasnostavsky's FTP third party transfer (proxy) support --- lib/transfer.h | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 422bb064c..ddcca06c1 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -24,6 +24,7 @@ ***************************************************************************/ CURLcode Curl_perform(struct SessionHandle *data); CURLcode Curl_pretransfer(struct SessionHandle *data); +CURLcode Curl_pretransfersec(struct connectdata *conn); CURLcode Curl_posttransfer(struct SessionHandle *data); CURLcode Curl_follow(struct SessionHandle *data, char *newurl); CURLcode Curl_readwrite(struct connectdata *conn, bool *done); -- cgit v1.2.1 From 8e287210577223b7d6dfb66034eca77c24a58b7f Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 21 Jun 2004 14:07:38 +0000 Subject: The read callback can now return CURL_READFUNC_ABORT to stop a transfer. --- lib/transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index ddcca06c1..4ebf07532 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -35,7 +35,7 @@ void Curl_single_fdset(struct connectdata *conn, int *max_fd); CURLcode Curl_readwrite_init(struct connectdata *conn); -int Curl_fillreadbuffer(struct connectdata *conn, int bytes); +CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp); /* This sets up a forthcoming transfer */ CURLcode -- cgit v1.2.1 From 39af394a1c3ae1d8ac71ad263a7c524988702c2e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 6 Oct 2004 07:50:18 +0000 Subject: removed tabs and trailing whitespace from source --- lib/transfer.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 4ebf07532..1b7eb828f 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -40,11 +40,11 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp); /* This sets up a forthcoming transfer */ CURLcode Curl_Transfer (struct connectdata *data, - int sockindex, /* socket index to read from or -1 */ - curl_off_t size, /* -1 if unknown at this point */ - bool getheader, /* TRUE if header parsing is wanted */ - curl_off_t *bytecountp, /* return number of bytes read */ - int writesockindex, /* socket index to write to, it may + int sockindex, /* socket index to read from or -1 */ + curl_off_t size, /* -1 if unknown at this point */ + bool getheader, /* TRUE if header parsing is wanted */ + curl_off_t *bytecountp, /* return number of bytes read */ + int writesockindex, /* socket index to write to, it may very well be the same we read from. -1 disables */ curl_off_t *writecountp /* return number of bytes written */ -- cgit v1.2.1 From 3e1caa61859a6057a65eb7c1585d47e05026c4f2 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 24 Nov 2004 16:11:35 +0000 Subject: HTTP "auth done right". See lib/README.httpauth --- lib/transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 1b7eb828f..78a3e046b 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -34,7 +34,7 @@ void Curl_single_fdset(struct connectdata *conn, fd_set *exc_fd_set, int *max_fd); CURLcode Curl_readwrite_init(struct connectdata *conn); - +CURLcode Curl_readrewind(struct connectdata *conn); CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp); /* This sets up a forthcoming transfer */ -- cgit v1.2.1 From 29102befa66e009c668d6a51cc41051a273d4703 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 11 Jan 2005 14:00:45 +0000 Subject: Cyrill Osterwalder posted a detailed analysis about a bug that occurs when using a custom Host: header and curl fails to send a request on a re-used persistent connection and thus creates a new connection and resends it. It then sent two Host: headers. Cyrill's analysis was posted here: http://curl.haxx.se/mail/archive-2005-01/0022.html --- lib/transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 78a3e046b..86301d60a 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -26,7 +26,7 @@ CURLcode Curl_perform(struct SessionHandle *data); CURLcode Curl_pretransfer(struct SessionHandle *data); CURLcode Curl_pretransfersec(struct connectdata *conn); CURLcode Curl_posttransfer(struct SessionHandle *data); -CURLcode Curl_follow(struct SessionHandle *data, char *newurl); +CURLcode Curl_follow(struct SessionHandle *data, char *newurl, bool retry); CURLcode Curl_readwrite(struct connectdata *conn, bool *done); void Curl_single_fdset(struct connectdata *conn, fd_set *read_fd_set, -- cgit v1.2.1 From 8dbaf534c89764100028137c3633f9fc6d38a5bd Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 29 Jan 2005 22:31:06 +0000 Subject: Using the multi interface, and doing a requsted a re-used connection that gets closed just after the request has been sent failed and did not re-issue a request on a fresh reconnect like the easy interface did. Now it does! (define CURL_MULTIEASY, run test case 160) --- lib/transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 86301d60a..6607b0915 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -36,7 +36,7 @@ void Curl_single_fdset(struct connectdata *conn, CURLcode Curl_readwrite_init(struct connectdata *conn); CURLcode Curl_readrewind(struct connectdata *conn); CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp); - +bool Curl_retry_request(struct connectdata *conn, char **url); /* This sets up a forthcoming transfer */ CURLcode Curl_Transfer (struct connectdata *data, -- cgit v1.2.1 From 0a3065a2f25a27774319400fee294cf98d88a969 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 14 Feb 2005 09:30:40 +0000 Subject: Rename Curl_pretransfersec() to *_second_connect() since it does not just do pretransfer stuff like Curl_pretransfer(). --- lib/transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 6607b0915..4be9f3667 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -24,7 +24,7 @@ ***************************************************************************/ CURLcode Curl_perform(struct SessionHandle *data); CURLcode Curl_pretransfer(struct SessionHandle *data); -CURLcode Curl_pretransfersec(struct connectdata *conn); +CURLcode Curl_second_connect(struct connectdata *conn); CURLcode Curl_posttransfer(struct SessionHandle *data); CURLcode Curl_follow(struct SessionHandle *data, char *newurl, bool retry); CURLcode Curl_readwrite(struct connectdata *conn, bool *done); -- cgit v1.2.1 From ab4086bc244bf3267976e9f0193e5ed4430190d8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 31 Mar 2005 07:02:02 +0000 Subject: Updated the copyright year since changes have been this year. --- lib/transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 4be9f3667..e7f71ba30 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2005, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms -- cgit v1.2.1 From 686d90745be4417127050ad4b36d0a5403def200 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 10 Apr 2006 15:00:53 +0000 Subject: First curl_multi_socket() commit. Should primarily be considered as an internal code rearrange to fit the future better. --- lib/transfer.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index e7f71ba30..3f4878cd7 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -28,11 +28,9 @@ CURLcode Curl_second_connect(struct connectdata *conn); CURLcode Curl_posttransfer(struct SessionHandle *data); CURLcode Curl_follow(struct SessionHandle *data, char *newurl, bool retry); CURLcode Curl_readwrite(struct connectdata *conn, bool *done); -void Curl_single_fdset(struct connectdata *conn, - fd_set *read_fd_set, - fd_set *write_fd_set, - fd_set *exc_fd_set, - int *max_fd); +int Curl_single_getsock(struct connectdata *conn, + curl_socket_t *socks, + int numsocks); CURLcode Curl_readwrite_init(struct connectdata *conn); CURLcode Curl_readrewind(struct connectdata *conn); CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp); -- cgit v1.2.1 From b7eeb6e67fca686f840eacd6b8394edb58b07482 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 7 Sep 2006 21:49:20 +0000 Subject: Major overhaul introducing http pipelining support and shared connection cache within the multi handle. --- lib/transfer.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 3f4878cd7..88cb3dd99 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -35,9 +35,10 @@ CURLcode Curl_readwrite_init(struct connectdata *conn); CURLcode Curl_readrewind(struct connectdata *conn); CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp); bool Curl_retry_request(struct connectdata *conn, char **url); + /* This sets up a forthcoming transfer */ CURLcode -Curl_Transfer (struct connectdata *data, +Curl_setup_transfer (struct connectdata *data, int sockindex, /* socket index to read from or -1 */ curl_off_t size, /* -1 if unknown at this point */ bool getheader, /* TRUE if header parsing is wanted */ -- cgit v1.2.1 From 772a985dc3318214443ddd2ad6541d520f089368 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 27 Oct 2006 03:47:57 +0000 Subject: Update copyright year, since the file has been modified --- lib/transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 88cb3dd99..3c415cc72 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2005, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2006, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms -- cgit v1.2.1 From f19d333ef6b067809cb2b0c153fbd3f5db4321a1 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 21 Feb 2007 21:59:40 +0000 Subject: - Ravi Pratap provided work on libcurl making pipelining more robust and fixing some bugs: o Don't mix GET and POST requests in a pipeline o Fix the order in which requests are dispatched from the pipeline o Fixed several curl bugs with pipelining when the server is returning chunked encoding: * Added states to chunked parsing for final CRLF * Rewind buffer after parsing chunk with data remaining * Moved chunked header initializing to a spot just before receiving headers --- lib/transfer.h | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 3c415cc72..d99ba070b 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -32,6 +32,7 @@ int Curl_single_getsock(struct connectdata *conn, curl_socket_t *socks, int numsocks); CURLcode Curl_readwrite_init(struct connectdata *conn); +void Curl_pre_readwrite(struct connectdata *conn); CURLcode Curl_readrewind(struct connectdata *conn); CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp); bool Curl_retry_request(struct connectdata *conn, char **url); -- cgit v1.2.1 From 584f3639e36f991c0962b9b88165decdc1c8d2c9 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 3 Apr 2007 18:25:18 +0000 Subject: update copyright year --- lib/transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index d99ba070b..7a08b334e 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2006, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2007, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms -- cgit v1.2.1 From 8cf0814a143d99de813fbd1653b785252b4c58a6 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Mon, 27 Aug 2007 06:31:28 +0000 Subject: Fixed some minor type mismatches and missing consts mainly found by splint. --- lib/transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 7a08b334e..a2fcd11e2 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -28,7 +28,7 @@ CURLcode Curl_second_connect(struct connectdata *conn); CURLcode Curl_posttransfer(struct SessionHandle *data); CURLcode Curl_follow(struct SessionHandle *data, char *newurl, bool retry); CURLcode Curl_readwrite(struct connectdata *conn, bool *done); -int Curl_single_getsock(struct connectdata *conn, +int Curl_single_getsock(const struct connectdata *conn, curl_socket_t *socks, int numsocks); CURLcode Curl_readwrite_init(struct connectdata *conn); -- cgit v1.2.1 From 50feea3eef87f1c07b954ad3020fdb836c7f279f Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 15 Nov 2007 21:45:45 +0000 Subject: Rearranged code and changed Curl_readwrite_init() and Curl_pre_readwrite() into do_init() and do_complete() which now are called first and last in the DO function. It simplified the flow in multi.c and the functions got more sensible names! --- lib/transfer.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index a2fcd11e2..c368c4682 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -31,8 +31,6 @@ CURLcode Curl_readwrite(struct connectdata *conn, bool *done); int Curl_single_getsock(const struct connectdata *conn, curl_socket_t *socks, int numsocks); -CURLcode Curl_readwrite_init(struct connectdata *conn); -void Curl_pre_readwrite(struct connectdata *conn); CURLcode Curl_readrewind(struct connectdata *conn); CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp); bool Curl_retry_request(struct connectdata *conn, char **url); -- cgit v1.2.1 From 852989856d3802a9e7bd2f1e368302d92ddf66e2 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 30 Apr 2008 21:20:08 +0000 Subject: - To make it easier for applications that want lots of magic stuff done on redirections and thus cannot use CURLOPT_FOLLOWLOCATION easily, we now introduce the new CURLINFO_REDIRECT_URL option that lets applications extract the URL libcurl would've redirected to if it had been told to. This then enables the application to continue to that URL as it thinks is suitable, without having to re-implement the magic of creating the new URL from the Location: header etc. Test 1029 verifies it. --- lib/transfer.h | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index c368c4682..aad82ebaf 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2007, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -26,7 +26,20 @@ CURLcode Curl_perform(struct SessionHandle *data); CURLcode Curl_pretransfer(struct SessionHandle *data); CURLcode Curl_second_connect(struct connectdata *conn); CURLcode Curl_posttransfer(struct SessionHandle *data); -CURLcode Curl_follow(struct SessionHandle *data, char *newurl, bool retry); + +typedef enum { + FOLLOW_NONE, /* not used within the function, just a placeholder to + allow initing to this */ + FOLLOW_FAKE, /* only records stuff, not actually following */ + FOLLOW_RETRY, /* set if this is a request retry as opposed to a real + redirect following */ + FOLLOW_REDIR, /* a full true redirect */ + FOLLOW_LAST /* never used */ +} followtype; + +CURLcode Curl_follow(struct SessionHandle *data, char *newurl, followtype type); + + CURLcode Curl_readwrite(struct connectdata *conn, bool *done); int Curl_single_getsock(const struct connectdata *conn, curl_socket_t *socks, -- cgit v1.2.1 From 1048043963d5487ed4d70f426a85aff07c2ee5f1 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 21 Aug 2009 07:11:20 +0000 Subject: - Lots of good work by Krister Johansen, mostly related to pipelining: Fix SIGSEGV on free'd easy_conn when pipe unexpectedly breaks Fix data corruption issue with re-connected transfers Fix use after free if we're completed but easy_conn not NULL --- lib/transfer.h | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index aad82ebaf..4b39faa18 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -46,6 +46,7 @@ int Curl_single_getsock(const struct connectdata *conn, int numsocks); CURLcode Curl_readrewind(struct connectdata *conn); CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp); +CURLcode Curl_reconnect_request(struct connectdata **connp); bool Curl_retry_request(struct connectdata *conn, char **url); /* This sets up a forthcoming transfer */ -- cgit v1.2.1 From 8b5102ca835d73d5cc633f1e7b8d05b3a8082f61 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 21 Aug 2009 12:01:36 +0000 Subject: - Andre Guibert de Bruet pointed out a missing return code check for a strdup() that could lead to segfault if it returned NULL. I extended his suggest patch to now have Curl_retry_request() return a regular return code and better check that. --- lib/transfer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 4b39faa18..a9b1cd370 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -47,7 +47,7 @@ int Curl_single_getsock(const struct connectdata *conn, CURLcode Curl_readrewind(struct connectdata *conn); CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp); CURLcode Curl_reconnect_request(struct connectdata **connp); -bool Curl_retry_request(struct connectdata *conn, char **url); +CURLcode Curl_retry_request(struct connectdata *conn, char **url); /* This sets up a forthcoming transfer */ CURLcode -- cgit v1.2.1 From 2309b4e330b96bc2e1f8e36b6184015e59544037 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 24 Mar 2010 11:02:54 +0100 Subject: remove the CVSish $Id$ lines --- lib/transfer.h | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index a9b1cd370..4e39c2752 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -20,7 +20,6 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * - * $Id$ ***************************************************************************/ CURLcode Curl_perform(struct SessionHandle *data); CURLcode Curl_pretransfer(struct SessionHandle *data); -- cgit v1.2.1 From 7de44e0a428f88f88483076a19c173f004de9e46 Mon Sep 17 00:00:00 2001 From: Ben Greear Date: Fri, 26 Mar 2010 23:33:02 +0100 Subject: Make rate-limitation logic smoother This gives a smoother rate limitation performance by using sub-second pauses and also taking the buffer sizes into account. --- lib/transfer.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 4e39c2752..4c2bc9e02 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -60,4 +60,8 @@ Curl_setup_transfer (struct connectdata *data, -1 disables */ curl_off_t *writecountp /* return number of bytes written */ ); + +long Curl_sleep_time(curl_off_t rate_bps, curl_off_t cur_rate_bps, + int pkt_size); + #endif -- cgit v1.2.1 From c0111460b0689d74731cc56ff019cc869a0d16a8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 16 Apr 2010 23:43:04 +0200 Subject: Curl_setup_transfer: no longer returns anything This function could only return CURLE_OK and by changing it to a void instead, we can simplify code all over. --- lib/transfer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 4c2bc9e02..790e1e3ef 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -49,7 +49,7 @@ CURLcode Curl_reconnect_request(struct connectdata **connp); CURLcode Curl_retry_request(struct connectdata *conn, char **url); /* This sets up a forthcoming transfer */ -CURLcode +void Curl_setup_transfer (struct connectdata *data, int sockindex, /* socket index to read from or -1 */ curl_off_t size, /* -1 if unknown at this point */ -- cgit v1.2.1 From 99dcb11ed8bd78d3af47c6ce3cc6b1fa4c51fdf8 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 29 Jan 2011 22:12:33 -0500 Subject: transfer: add Curl_meets_timecondition() This will be used by file_do() and Curl_readwrite() as a unified method of checking to see if a remote document meets the supplied CURLOPT_TIMEVAL and CURLOPT_TIMECONDITION. Signed-off-by: Dave Reisner --- lib/transfer.h | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index 790e1e3ef..c966cafb0 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -47,6 +47,7 @@ CURLcode Curl_readrewind(struct connectdata *conn); CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp); CURLcode Curl_reconnect_request(struct connectdata **connp); CURLcode Curl_retry_request(struct connectdata *conn, char **url); +bool Curl_meets_timecondition(struct SessionHandle *data, long timeofdoc); /* This sets up a forthcoming transfer */ void -- cgit v1.2.1 From 8511b6436c4e1c6303cc0cb9b41677628289f41a Mon Sep 17 00:00:00 2001 From: Stefan Krause Date: Wed, 23 Feb 2011 19:58:43 +0100 Subject: transfer: avoid insane conversion of time_t --- lib/transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index c966cafb0..f60937cbf 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -47,7 +47,7 @@ CURLcode Curl_readrewind(struct connectdata *conn); CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp); CURLcode Curl_reconnect_request(struct connectdata **connp); CURLcode Curl_retry_request(struct connectdata *conn, char **url); -bool Curl_meets_timecondition(struct SessionHandle *data, long timeofdoc); +bool Curl_meets_timecondition(struct SessionHandle *data, time_t timeofdoc); /* This sets up a forthcoming transfer */ void -- cgit v1.2.1 From b903186fa0189ff241d756d25d07fdfe9885ae49 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 20 Apr 2011 15:17:42 +0200 Subject: source cleanup: unify look, style and indent levels By the use of a the new lib/checksrc.pl script that checks that our basic source style rules are followed. --- lib/transfer.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/transfer.h') diff --git a/lib/transfer.h b/lib/transfer.h index f60937cbf..68a31c67e 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -36,7 +36,8 @@ typedef enum { FOLLOW_LAST /* never used */ } followtype; -CURLcode Curl_follow(struct SessionHandle *data, char *newurl, followtype type); +CURLcode Curl_follow(struct SessionHandle *data, char *newurl, + followtype type); CURLcode Curl_readwrite(struct connectdata *conn, bool *done); -- cgit v1.2.1