2002-09-03 15:52:59 +04:00
|
|
|
/***************************************************************************
|
2004-05-17 10:50:08 +04:00
|
|
|
* _ _ ____ _
|
|
|
|
* Project ___| | | | _ \| |
|
|
|
|
* / __| | | | |_) | |
|
|
|
|
* | (__| |_| | _ <| |___
|
2000-05-22 18:09:31 +04:00
|
|
|
* \___|\___/|_| \_\_____|
|
|
|
|
*
|
2010-01-08 01:48:28 +03:00
|
|
|
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
|
2000-05-22 18:09:31 +04:00
|
|
|
*
|
2002-09-03 15:52:59 +04:00
|
|
|
* 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.
|
2004-05-17 10:50:08 +04:00
|
|
|
*
|
2001-01-03 12:29:33 +03:00
|
|
|
* 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
|
2002-09-03 15:52:59 +04:00
|
|
|
* furnished to do so, under the terms of the COPYING file.
|
2000-05-22 18:09:31 +04:00
|
|
|
*
|
2001-01-03 12:29:33 +03:00
|
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
|
|
* KIND, either express or implied.
|
2000-05-22 18:09:31 +04:00
|
|
|
*
|
2002-09-03 15:52:59 +04:00
|
|
|
***************************************************************************/
|
2000-05-22 18:09:31 +04:00
|
|
|
|
2000-08-24 18:26:33 +04:00
|
|
|
#include "setup.h"
|
|
|
|
|
2000-05-22 18:09:31 +04:00
|
|
|
/* -- WIN32 approved -- */
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <errno.h>
|
|
|
|
|
2004-01-06 01:29:29 +03:00
|
|
|
#include "strtoofft.h"
|
2000-05-22 18:09:31 +04:00
|
|
|
#include "strequal.h"
|
2008-10-23 15:49:19 +04:00
|
|
|
#include "rawstr.h"
|
2000-05-22 18:09:31 +04:00
|
|
|
|
2006-10-11 20:01:16 +04:00
|
|
|
#ifdef WIN32
|
2000-05-22 18:09:31 +04:00
|
|
|
#include <time.h>
|
|
|
|
#include <io.h>
|
|
|
|
#else
|
|
|
|
#ifdef HAVE_SYS_SOCKET_H
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#endif
|
2004-02-02 17:49:54 +03:00
|
|
|
#ifdef HAVE_NETINET_IN_H
|
2000-05-22 18:09:31 +04:00
|
|
|
#include <netinet/in.h>
|
2004-02-02 17:49:54 +03:00
|
|
|
#endif
|
2006-08-30 20:17:06 +04:00
|
|
|
#ifdef HAVE_SYS_TIME_H
|
2000-05-22 18:09:31 +04:00
|
|
|
#include <sys/time.h>
|
2006-08-29 22:45:55 +04:00
|
|
|
#endif
|
2000-05-22 18:09:31 +04:00
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
2007-04-04 00:54:37 +04:00
|
|
|
#ifdef HAVE_NETDB_H
|
2000-05-22 18:09:31 +04:00
|
|
|
#include <netdb.h>
|
2007-04-04 00:54:37 +04:00
|
|
|
#endif
|
2000-05-22 18:09:31 +04:00
|
|
|
#ifdef HAVE_ARPA_INET_H
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_NET_IF_H
|
|
|
|
#include <net/if.h>
|
|
|
|
#endif
|
2004-02-02 17:49:54 +03:00
|
|
|
#ifdef HAVE_SYS_IOCTL_H
|
2000-05-22 18:09:31 +04:00
|
|
|
#include <sys/ioctl.h>
|
2004-02-02 17:49:54 +03:00
|
|
|
#endif
|
2008-11-15 02:17:32 +03:00
|
|
|
#ifdef HAVE_SIGNAL_H
|
2000-05-22 18:09:31 +04:00
|
|
|
#include <signal.h>
|
2008-11-15 02:17:32 +03:00
|
|
|
#endif
|
2000-05-22 18:09:31 +04:00
|
|
|
|
|
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
|
|
#include <sys/param.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_SYS_SELECT_H
|
|
|
|
#include <sys/select.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef HAVE_SOCKET
|
|
|
|
#error "We can't compile without socket() support!"
|
|
|
|
#endif
|
|
|
|
|
2007-02-26 07:24:26 +03:00
|
|
|
#endif /* WIN32 */
|
2000-05-22 18:09:31 +04:00
|
|
|
|
|
|
|
#include "urldata.h"
|
|
|
|
#include <curl/curl.h>
|
|
|
|
#include "netrc.h"
|
|
|
|
|
2004-02-18 18:28:56 +03:00
|
|
|
#include "content_encoding.h"
|
2000-05-22 18:09:31 +04:00
|
|
|
#include "hostip.h"
|
2001-01-17 16:19:01 +03:00
|
|
|
#include "transfer.h"
|
2000-05-22 18:09:31 +04:00
|
|
|
#include "sendf.h"
|
|
|
|
#include "speedcheck.h"
|
|
|
|
#include "progress.h"
|
2001-03-08 02:51:41 +03:00
|
|
|
#include "http.h"
|
2001-08-15 10:53:10 +04:00
|
|
|
#include "url.h"
|
|
|
|
#include "getinfo.h"
|
2005-04-07 19:27:13 +04:00
|
|
|
#include "sslgen.h"
|
2003-05-22 20:09:54 +04:00
|
|
|
#include "http_digest.h"
|
2003-06-11 17:38:55 +04:00
|
|
|
#include "http_ntlm.h"
|
2003-06-10 16:22:19 +04:00
|
|
|
#include "http_negotiate.h"
|
2003-08-06 19:26:24 +04:00
|
|
|
#include "share.h"
|
2009-04-21 15:46:16 +04:00
|
|
|
#include "curl_memory.h"
|
2004-11-19 11:52:33 +03:00
|
|
|
#include "select.h"
|
2006-04-10 19:00:53 +04:00
|
|
|
#include "multiif.h"
|
2006-04-08 01:50:47 +04:00
|
|
|
#include "easyif.h" /* for Curl_convert_to_network prototype */
|
2010-01-21 16:58:30 +03:00
|
|
|
#include "rtsp.h"
|
2000-05-22 18:09:31 +04:00
|
|
|
|
|
|
|
#define _MPRINTF_REPLACE /* use our functions only */
|
|
|
|
#include <curl/mprintf.h>
|
|
|
|
|
2000-10-09 15:12:34 +04:00
|
|
|
/* The last #include file should be: */
|
|
|
|
#include "memdebug.h"
|
|
|
|
|
2003-02-24 19:53:53 +03:00
|
|
|
#define CURL_TIMEOUT_EXPECT_100 1000 /* counting ms here */
|
|
|
|
|
2002-12-10 16:10:00 +03:00
|
|
|
/*
|
|
|
|
* This function will call the read callback to fill our buffer with data
|
|
|
|
* to upload.
|
|
|
|
*/
|
2004-06-21 18:07:38 +04:00
|
|
|
CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp)
|
2002-12-10 16:10:00 +03:00
|
|
|
{
|
2004-06-21 18:07:38 +04:00
|
|
|
struct SessionHandle *data = conn->data;
|
2004-08-09 12:28:17 +04:00
|
|
|
size_t buffersize = (size_t)bytes;
|
2002-12-10 16:10:00 +03:00
|
|
|
int nread;
|
2009-05-28 20:19:03 +04:00
|
|
|
#ifdef CURL_DOES_CONVERSIONS
|
2009-05-07 22:03:49 +04:00
|
|
|
bool sending_http_headers = FALSE;
|
2002-12-10 16:10:00 +03:00
|
|
|
|
2010-01-21 16:58:30 +03:00
|
|
|
if((conn->protocol&(PROT_HTTP|PROT_RTSP)) &&
|
2009-05-07 22:03:49 +04:00
|
|
|
(data->state.proto.http->sending == HTTPSEND_REQUEST)) {
|
|
|
|
/* We're sending the HTTP request headers, not the data.
|
|
|
|
Remember that so we don't re-translate them into garbage. */
|
|
|
|
sending_http_headers = TRUE;
|
2009-05-04 13:47:02 +04:00
|
|
|
}
|
2009-05-28 20:19:03 +04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
if(data->req.upload_chunky) {
|
|
|
|
/* if chunked Transfer-Encoding */
|
|
|
|
buffersize -= (8 + 2 + 2); /* 32bit hex + CRLF + CRLF */
|
|
|
|
data->req.upload_fromhere += (8 + 2); /* 32bit hex + CRLF */
|
|
|
|
}
|
2004-05-17 10:50:08 +04:00
|
|
|
|
2004-08-10 10:41:13 +04:00
|
|
|
/* this function returns a size_t, so we typecast to int to prevent warnings
|
|
|
|
with picky compilers */
|
2007-11-25 02:16:55 +03:00
|
|
|
nread = (int)conn->fread_func(data->req.upload_fromhere, 1,
|
2007-11-15 14:03:02 +03:00
|
|
|
buffersize, conn->fread_in);
|
2004-05-17 10:50:08 +04:00
|
|
|
|
2004-06-21 18:07:38 +04:00
|
|
|
if(nread == CURL_READFUNC_ABORT) {
|
2008-01-16 02:19:02 +03:00
|
|
|
failf(data, "operation aborted by callback");
|
2008-07-27 01:15:47 +04:00
|
|
|
*nreadp = 0;
|
2004-06-21 18:07:38 +04:00
|
|
|
return CURLE_ABORTED_BY_CALLBACK;
|
|
|
|
}
|
2008-01-08 17:52:05 +03:00
|
|
|
else if(nread == CURL_READFUNC_PAUSE) {
|
|
|
|
struct SingleRequest *k = &data->req;
|
2008-07-27 01:15:47 +04:00
|
|
|
/* CURL_READFUNC_PAUSE pauses read callbacks that feed socket writes */
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon |= KEEP_SEND_PAUSE; /* mark socket send as paused */
|
2008-10-29 22:06:48 +03:00
|
|
|
if(data->req.upload_chunky) {
|
|
|
|
/* Back out the preallocation done above */
|
|
|
|
data->req.upload_fromhere -= (8 + 2);
|
|
|
|
}
|
2008-07-27 01:15:47 +04:00
|
|
|
*nreadp = 0;
|
2008-01-09 22:11:56 +03:00
|
|
|
return CURLE_OK; /* nothing was read */
|
2008-01-08 17:52:05 +03:00
|
|
|
}
|
2008-07-27 01:15:47 +04:00
|
|
|
else if((size_t)nread > buffersize) {
|
2008-01-08 17:52:05 +03:00
|
|
|
/* the read function returned a too large value */
|
2008-07-27 01:15:47 +04:00
|
|
|
*nreadp = 0;
|
2008-10-15 11:43:48 +04:00
|
|
|
failf(data, "read function returned funny value");
|
2008-01-08 17:52:05 +03:00
|
|
|
return CURLE_READ_ERROR;
|
2008-07-27 01:15:47 +04:00
|
|
|
}
|
2004-06-21 18:07:38 +04:00
|
|
|
|
2008-01-31 15:04:33 +03:00
|
|
|
if(!data->req.forbidchunk && data->req.upload_chunky) {
|
2009-08-21 11:11:20 +04:00
|
|
|
/* if chunked Transfer-Encoding
|
2009-05-04 13:47:02 +04:00
|
|
|
* build chunk:
|
|
|
|
*
|
|
|
|
* <HEX SIZE> CRLF
|
|
|
|
* <DATA> CRLF
|
|
|
|
*/
|
|
|
|
/* On non-ASCII platforms the <DATA> may or may not be
|
|
|
|
translated based on set.prefer_ascii while the protocol
|
|
|
|
portion must always be translated to the network encoding.
|
|
|
|
To further complicate matters, line end conversion might be
|
|
|
|
done later on, so we need to prevent CRLFs from becoming
|
|
|
|
CRCRLFs if that's the case. To do this we use bare LFs
|
|
|
|
here, knowing they'll become CRLFs later on.
|
|
|
|
*/
|
|
|
|
|
2002-12-10 16:10:00 +03:00
|
|
|
char hexbuffer[11];
|
2009-05-04 13:47:02 +04:00
|
|
|
const char *endofline_native;
|
|
|
|
const char *endofline_network;
|
|
|
|
int hexlen;
|
|
|
|
#ifdef CURL_DO_LINEEND_CONV
|
|
|
|
if((data->set.crlf) || (data->set.prefer_ascii)) {
|
|
|
|
#else
|
|
|
|
if(data->set.crlf) {
|
|
|
|
#endif /* CURL_DO_LINEEND_CONV */
|
|
|
|
/* \n will become \r\n later on */
|
|
|
|
endofline_native = "\n";
|
|
|
|
endofline_network = "\x0a";
|
|
|
|
} else {
|
|
|
|
endofline_native = "\r\n";
|
|
|
|
endofline_network = "\x0d\x0a";
|
|
|
|
}
|
|
|
|
hexlen = snprintf(hexbuffer, sizeof(hexbuffer),
|
|
|
|
"%x%s", nread, endofline_native);
|
|
|
|
|
2002-12-10 16:10:00 +03:00
|
|
|
/* move buffer pointer */
|
2007-11-25 02:16:55 +03:00
|
|
|
data->req.upload_fromhere -= hexlen;
|
2002-12-10 16:10:00 +03:00
|
|
|
nread += hexlen;
|
|
|
|
|
2008-10-29 22:06:48 +03:00
|
|
|
/* copy the prefix to the buffer, leaving out the NUL */
|
2007-11-25 02:16:55 +03:00
|
|
|
memcpy(data->req.upload_fromhere, hexbuffer, hexlen);
|
2004-01-28 20:07:22 +03:00
|
|
|
|
2009-08-21 11:11:20 +04:00
|
|
|
/* always append ASCII CRLF to the data */
|
|
|
|
memcpy(data->req.upload_fromhere + nread,
|
|
|
|
endofline_network,
|
2009-05-04 13:47:02 +04:00
|
|
|
strlen(endofline_network));
|
|
|
|
|
|
|
|
#ifdef CURL_DOES_CONVERSIONS
|
|
|
|
CURLcode res;
|
|
|
|
int length;
|
|
|
|
if(data->set.prefer_ascii) {
|
|
|
|
/* translate the protocol and data */
|
|
|
|
length = nread;
|
|
|
|
} else {
|
|
|
|
/* just translate the protocol portion */
|
|
|
|
length = strlen(hexbuffer);
|
|
|
|
}
|
|
|
|
res = Curl_convert_to_network(data, data->req.upload_fromhere, length);
|
|
|
|
/* Curl_convert_to_network calls failf if unsuccessful */
|
|
|
|
if(res != CURLE_OK) {
|
|
|
|
return(res);
|
|
|
|
}
|
|
|
|
#endif /* CURL_DOES_CONVERSIONS */
|
2004-01-28 20:07:22 +03:00
|
|
|
|
|
|
|
if((nread - hexlen) == 0) {
|
2002-12-10 16:10:00 +03:00
|
|
|
/* mark this as done once this chunk is transfered */
|
2007-11-25 02:16:55 +03:00
|
|
|
data->req.upload_done = TRUE;
|
2002-12-10 16:10:00 +03:00
|
|
|
}
|
2004-01-28 20:07:22 +03:00
|
|
|
|
2009-07-16 21:39:14 +04:00
|
|
|
nread+=(int)strlen(endofline_native); /* for the added end of line */
|
2009-05-07 22:03:49 +04:00
|
|
|
}
|
2006-04-08 01:50:47 +04:00
|
|
|
#ifdef CURL_DOES_CONVERSIONS
|
2009-05-07 22:03:49 +04:00
|
|
|
else if((data->set.prefer_ascii) && (!sending_http_headers)) {
|
|
|
|
CURLcode res;
|
|
|
|
res = Curl_convert_to_network(data, data->req.upload_fromhere, nread);
|
|
|
|
/* Curl_convert_to_network calls failf if unsuccessful */
|
|
|
|
if(res != CURLE_OK)
|
|
|
|
return(res);
|
2009-05-04 13:47:02 +04:00
|
|
|
}
|
2009-05-07 22:03:49 +04:00
|
|
|
#endif /* CURL_DOES_CONVERSIONS */
|
2009-05-04 13:47:02 +04:00
|
|
|
|
|
|
|
*nreadp = nread;
|
2006-04-08 01:50:47 +04:00
|
|
|
|
2004-06-21 18:07:38 +04:00
|
|
|
return CURLE_OK;
|
2002-12-10 16:10:00 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-11-24 19:11:35 +03:00
|
|
|
/*
|
2008-05-04 01:45:12 +04:00
|
|
|
* Curl_readrewind() rewinds the read stream. This is typically used for HTTP
|
|
|
|
* POST/PUT with multi-pass authentication when a sending was denied and a
|
|
|
|
* resend is necessary.
|
2004-11-24 19:11:35 +03:00
|
|
|
*/
|
|
|
|
CURLcode Curl_readrewind(struct connectdata *conn)
|
|
|
|
{
|
|
|
|
struct SessionHandle *data = conn->data;
|
|
|
|
|
|
|
|
conn->bits.rewindaftersend = FALSE; /* we rewind now */
|
|
|
|
|
2008-05-04 01:49:16 +04:00
|
|
|
/* explicitly switch off sending data on this connection now since we are
|
|
|
|
about to restart a new transfer and thus we want to avoid inadvertently
|
|
|
|
sending more data on the existing connection until the next transfer
|
|
|
|
starts */
|
2009-05-11 11:53:38 +04:00
|
|
|
data->req.keepon &= ~KEEP_SEND;
|
2008-05-04 01:45:12 +04:00
|
|
|
|
2004-11-24 19:11:35 +03:00
|
|
|
/* We have sent away data. If not using CURLOPT_POSTFIELDS or
|
|
|
|
CURLOPT_HTTPPOST, call app to rewind
|
|
|
|
*/
|
2007-10-15 22:32:01 +04:00
|
|
|
if(data->set.postfields ||
|
2004-11-24 19:11:35 +03:00
|
|
|
(data->set.httpreq == HTTPREQ_POST_FORM))
|
|
|
|
; /* do nothing */
|
|
|
|
else {
|
2008-01-10 13:30:19 +03:00
|
|
|
if(data->set.seek_func) {
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = (data->set.seek_func)(data->set.seek_client, 0, SEEK_SET);
|
|
|
|
if(err) {
|
2008-05-01 01:20:08 +04:00
|
|
|
failf(data, "seek callback returned error %d", (int)err);
|
2008-01-10 13:30:19 +03:00
|
|
|
return CURLE_SEND_FAIL_REWIND;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(data->set.ioctl_func) {
|
2004-11-24 19:11:35 +03:00
|
|
|
curlioerr err;
|
|
|
|
|
2008-01-10 13:30:19 +03:00
|
|
|
err = (data->set.ioctl_func)(data, CURLIOCMD_RESTARTREAD,
|
|
|
|
data->set.ioctl_client);
|
2004-11-26 19:08:15 +03:00
|
|
|
infof(data, "the ioctl callback returned %d\n", (int)err);
|
2004-11-24 19:11:35 +03:00
|
|
|
|
|
|
|
if(err) {
|
|
|
|
/* FIXME: convert to a human readable error message */
|
2008-01-16 02:19:02 +03:00
|
|
|
failf(data, "ioctl callback returned error %d", (int)err);
|
2004-11-24 19:11:35 +03:00
|
|
|
return CURLE_SEND_FAIL_REWIND;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* If no CURLOPT_READFUNCTION is used, we know that we operate on a
|
|
|
|
given FILE * stream and we can actually attempt to rewind that
|
|
|
|
ourself with fseek() */
|
2007-07-23 22:51:22 +04:00
|
|
|
if(data->set.fread_func == (curl_read_callback)fread) {
|
2004-11-24 19:11:35 +03:00
|
|
|
if(-1 != fseek(data->set.in, 0, SEEK_SET))
|
|
|
|
/* successful rewind */
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* no callback set or failure above, makes us fail at once */
|
2008-01-16 02:19:02 +03:00
|
|
|
failf(data, "necessary data rewind wasn't possible");
|
2004-11-24 19:11:35 +03:00
|
|
|
return CURLE_SEND_FAIL_REWIND;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2007-08-27 10:31:28 +04:00
|
|
|
static int data_pending(const struct connectdata *conn)
|
2005-02-10 02:09:12 +03:00
|
|
|
{
|
2007-04-27 01:30:29 +04:00
|
|
|
/* in the case of libssh2, we can never be really sure that we have emptied
|
|
|
|
its internal buffers so we MUST always try until we get EAGAIN back */
|
|
|
|
return conn->protocol&(PROT_SCP|PROT_SFTP) ||
|
|
|
|
Curl_ssl_data_pending(conn, FIRSTSOCKET);
|
2005-02-10 02:09:12 +03:00
|
|
|
}
|
2004-06-09 12:23:55 +04:00
|
|
|
|
2006-12-06 00:40:14 +03:00
|
|
|
static void read_rewind(struct connectdata *conn,
|
|
|
|
size_t thismuch)
|
|
|
|
{
|
2009-12-11 21:41:29 +03:00
|
|
|
DEBUGASSERT(conn->read_pos >= thismuch);
|
|
|
|
|
2006-12-06 00:40:14 +03:00
|
|
|
conn->read_pos -= thismuch;
|
|
|
|
conn->bits.stream_was_rewound = TRUE;
|
|
|
|
|
2009-06-10 06:49:42 +04:00
|
|
|
#ifdef DEBUGBUILD
|
2006-12-06 00:40:14 +03:00
|
|
|
{
|
|
|
|
char buf[512 + 1];
|
|
|
|
size_t show;
|
|
|
|
|
2009-01-07 22:39:35 +03:00
|
|
|
show = CURLMIN(conn->buf_len - conn->read_pos, sizeof(buf)-1);
|
2007-11-05 12:45:09 +03:00
|
|
|
if(conn->master_buffer) {
|
2007-04-24 14:18:06 +04:00
|
|
|
memcpy(buf, conn->master_buffer + conn->read_pos, show);
|
|
|
|
buf[show] = '\0';
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
buf[0] = '\0';
|
|
|
|
}
|
2006-12-06 00:40:14 +03:00
|
|
|
|
|
|
|
DEBUGF(infof(conn->data,
|
2010-01-28 10:52:12 +03:00
|
|
|
"Buffer after stream rewind (read_pos = %zu): [%s]",
|
2006-12-06 00:40:14 +03:00
|
|
|
conn->read_pos, buf));
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
|
2004-04-26 11:12:52 +04:00
|
|
|
/*
|
2008-08-09 00:37:54 +04:00
|
|
|
* Go ahead and do a read if we have a readable socket or if
|
|
|
|
* the stream was rewound (in which case we have data in a
|
|
|
|
* buffer)
|
2004-04-26 11:12:52 +04:00
|
|
|
*/
|
2008-08-09 00:37:54 +04:00
|
|
|
static CURLcode readwrite_data(struct SessionHandle *data,
|
|
|
|
struct connectdata *conn,
|
|
|
|
struct SingleRequest *k,
|
|
|
|
int *didwhat, bool *done)
|
2000-05-22 18:09:31 +04:00
|
|
|
{
|
2008-08-12 23:09:20 +04:00
|
|
|
CURLcode result = CURLE_OK;
|
2002-01-03 18:01:22 +03:00
|
|
|
ssize_t nread; /* number of bytes read */
|
2010-01-28 04:39:16 +03:00
|
|
|
size_t excess = 0; /* excess bytes read */
|
2008-08-09 00:37:54 +04:00
|
|
|
bool is_empty_data = FALSE;
|
2010-01-28 04:39:16 +03:00
|
|
|
#ifndef CURL_DISABLE_RTSP
|
|
|
|
bool readmore = FALSE; /* used by RTP to signal for more data */
|
|
|
|
#endif
|
2004-05-17 10:50:08 +04:00
|
|
|
|
2008-10-10 23:10:44 +04:00
|
|
|
*done = FALSE;
|
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* This is where we loop until we have read everything there is to
|
|
|
|
read or we get a EWOULDBLOCK */
|
|
|
|
do {
|
|
|
|
size_t buffersize = data->set.buffer_size?
|
|
|
|
data->set.buffer_size : BUFSIZE;
|
|
|
|
size_t bytestoread = buffersize;
|
|
|
|
int readrc;
|
|
|
|
|
|
|
|
if(k->size != -1 && !k->header) {
|
|
|
|
/* make sure we don't read "too much" if we can help it since we
|
2009-02-27 11:53:10 +03:00
|
|
|
might be pipelining and then someone else might want to read what
|
|
|
|
follows! */
|
2008-08-09 00:37:54 +04:00
|
|
|
curl_off_t totalleft = k->size - k->bytecount;
|
|
|
|
if(totalleft < (curl_off_t)bytestoread)
|
2009-02-27 11:53:10 +03:00
|
|
|
bytestoread = (size_t)totalleft;
|
2008-08-09 00:37:54 +04:00
|
|
|
}
|
2007-04-16 20:34:08 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
if(bytestoread) {
|
|
|
|
/* receive data from the network! */
|
|
|
|
readrc = Curl_read(conn, conn->sockfd, k->buf, bytestoread, &nread);
|
2004-05-17 10:50:08 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* subzero, this would've blocked */
|
|
|
|
if(0 > readrc)
|
2009-02-27 11:53:10 +03:00
|
|
|
break; /* get out of loop */
|
2006-12-06 12:37:40 +03:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* get the CURLcode from the int */
|
|
|
|
result = (CURLcode)readrc;
|
2002-05-28 18:18:36 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
if(result>0)
|
2009-02-27 11:53:10 +03:00
|
|
|
return result;
|
2008-08-09 00:37:54 +04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* read nothing but since we wanted nothing we consider this an OK
|
2009-02-27 11:53:10 +03:00
|
|
|
situation to proceed from */
|
2008-08-09 00:37:54 +04:00
|
|
|
nread = 0;
|
|
|
|
}
|
2004-11-19 11:52:33 +03:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
if((k->bytecount == 0) && (k->writebytecount == 0)) {
|
|
|
|
Curl_pgrsTime(data, TIMER_STARTTRANSFER);
|
|
|
|
if(k->exp100 > EXP100_SEND_DATA)
|
2009-02-27 11:53:10 +03:00
|
|
|
/* set time stamp to compare with when waiting for the 100 */
|
|
|
|
k->start100 = Curl_tvnow();
|
2008-08-09 00:37:54 +04:00
|
|
|
}
|
2007-07-11 02:26:32 +04:00
|
|
|
|
2009-05-11 11:53:38 +04:00
|
|
|
*didwhat |= KEEP_RECV;
|
2008-08-09 00:37:54 +04:00
|
|
|
/* indicates data of zero size, i.e. empty file */
|
|
|
|
is_empty_data = (bool)((nread == 0) && (k->bodywrites == 0));
|
2000-05-22 18:09:31 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* NUL terminate, allowing string ops to be used */
|
|
|
|
if(0 < nread || is_empty_data) {
|
|
|
|
k->buf[nread] = 0;
|
|
|
|
}
|
|
|
|
else if(0 >= nread) {
|
|
|
|
/* if we receive 0 or less here, the server closed the connection
|
2009-02-27 11:53:10 +03:00
|
|
|
and we bail out from this! */
|
2008-08-09 00:37:54 +04:00
|
|
|
DEBUGF(infof(data, "nread <= 0, server closed connection, bailing\n"));
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon &= ~KEEP_RECV;
|
2008-08-09 00:37:54 +04:00
|
|
|
break;
|
|
|
|
}
|
2000-05-22 18:09:31 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* Default buffer to use when we write the buffer, it may be changed
|
|
|
|
in the flow below before the actual storing is done. */
|
|
|
|
k->str = k->buf;
|
2002-12-05 17:26:30 +03:00
|
|
|
|
2010-01-21 16:58:30 +03:00
|
|
|
#ifndef CURL_DISABLE_RTSP
|
2010-01-28 04:39:16 +03:00
|
|
|
/* Check for RTP at the beginning of the data */
|
2010-01-21 16:58:30 +03:00
|
|
|
if(conn->protocol & PROT_RTSP) {
|
2010-01-28 04:39:16 +03:00
|
|
|
result = Curl_rtsp_rtp_readwrite(data, conn, &nread, &readmore);
|
2010-01-21 16:58:30 +03:00
|
|
|
if(result)
|
|
|
|
return result;
|
|
|
|
if(readmore)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-10-18 05:23:14 +04:00
|
|
|
#ifndef CURL_DISABLE_HTTP
|
2008-08-09 00:37:54 +04:00
|
|
|
/* Since this is a two-state thing, we check if we are parsing
|
|
|
|
headers at the moment or not. */
|
|
|
|
if(k->header) {
|
|
|
|
/* we are in parse-the-header-mode */
|
|
|
|
bool stop_reading = FALSE;
|
2010-01-08 01:48:28 +03:00
|
|
|
result = Curl_http_readwrite_headers(data, conn, &nread, &stop_reading);
|
2008-08-09 00:37:54 +04:00
|
|
|
if(result)
|
2009-02-27 11:53:10 +03:00
|
|
|
return result;
|
2010-01-28 04:39:16 +03:00
|
|
|
|
|
|
|
#ifndef CURL_DISABLE_RTSP
|
|
|
|
/* Check for RTP after the headers if there is no Content */
|
|
|
|
if(k->maxdownload <= 0 && nread > 0 && (conn->protocol & PROT_RTSP)) {
|
|
|
|
result = Curl_rtsp_rtp_readwrite(data, conn, &nread, &readmore);
|
|
|
|
if(result)
|
|
|
|
return result;
|
|
|
|
if(readmore)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
if(stop_reading)
|
2009-02-27 11:53:10 +03:00
|
|
|
/* We've stopped dealing with input, get out of the do-while loop */
|
|
|
|
break;
|
2008-08-09 00:37:54 +04:00
|
|
|
}
|
2008-10-18 05:23:14 +04:00
|
|
|
#endif /* CURL_DISABLE_HTTP */
|
2004-02-15 16:48:28 +03:00
|
|
|
|
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* This is not an 'else if' since it may be a rest from the header
|
|
|
|
parsing, where the beginning of the buffer is headers and the end
|
|
|
|
is non-headers. */
|
|
|
|
if(k->str && !k->header && (nread > 0 || is_empty_data)) {
|
|
|
|
|
2010-01-21 16:58:30 +03:00
|
|
|
|
2008-10-10 02:14:38 +04:00
|
|
|
#ifndef CURL_DISABLE_HTTP
|
2008-08-09 00:37:54 +04:00
|
|
|
if(0 == k->bodywrites && !is_empty_data) {
|
2009-02-27 11:53:10 +03:00
|
|
|
/* These checks are only made the first time we are about to
|
|
|
|
write a piece of the body */
|
2010-01-21 16:58:30 +03:00
|
|
|
if(conn->protocol&(PROT_HTTP|PROT_RTSP)) {
|
2009-02-27 11:53:10 +03:00
|
|
|
/* HTTP-only checks */
|
|
|
|
|
|
|
|
if(data->req.newurl) {
|
|
|
|
if(conn->bits.close) {
|
|
|
|
/* Abort after the headers if "follow Location" is set
|
|
|
|
and we're set to close anyway. */
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon &= ~KEEP_RECV;
|
2009-02-27 11:53:10 +03:00
|
|
|
*done = TRUE;
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
/* We have a new url to load, but since we want to be able
|
|
|
|
to re-use this connection properly, we read the full
|
|
|
|
response in "ignore more" */
|
|
|
|
k->ignorebody = TRUE;
|
|
|
|
infof(data, "Ignoring the response-body\n");
|
|
|
|
}
|
|
|
|
if(data->state.resume_from && !k->content_range &&
|
|
|
|
(data->set.httpreq==HTTPREQ_GET) &&
|
|
|
|
!k->ignorebody) {
|
|
|
|
/* we wanted to resume a download, although the server doesn't
|
|
|
|
* seem to support this and we did this with a GET (if it
|
|
|
|
* wasn't a GET we did a POST or PUT resume) */
|
|
|
|
failf(data, "HTTP server doesn't seem to support "
|
|
|
|
"byte ranges. Cannot resume.");
|
|
|
|
return CURLE_RANGE_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(data->set.timecondition && !data->state.range) {
|
|
|
|
/* A time condition has been set AND no ranges have been
|
|
|
|
requested. This seems to be what chapter 13.3.4 of
|
|
|
|
RFC 2616 defines to be the correct action for a
|
|
|
|
HTTP/1.1 client */
|
|
|
|
if((k->timeofdoc > 0) && (data->set.timevalue > 0)) {
|
|
|
|
switch(data->set.timecondition) {
|
|
|
|
case CURL_TIMECOND_IFMODSINCE:
|
|
|
|
default:
|
|
|
|
if(k->timeofdoc < data->set.timevalue) {
|
|
|
|
infof(data,
|
|
|
|
"The requested document is not new enough\n");
|
|
|
|
*done = TRUE;
|
2009-02-12 00:47:14 +03:00
|
|
|
data->info.timecond = TRUE;
|
2009-02-27 11:53:10 +03:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CURL_TIMECOND_IFUNMODSINCE:
|
|
|
|
if(k->timeofdoc > data->set.timevalue) {
|
|
|
|
infof(data,
|
|
|
|
"The requested document is not old enough\n");
|
|
|
|
*done = TRUE;
|
2009-02-12 00:47:14 +03:00
|
|
|
data->info.timecond = TRUE;
|
2009-02-27 11:53:10 +03:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
} /* switch */
|
|
|
|
} /* two valid time strings */
|
|
|
|
} /* we have a time condition */
|
|
|
|
|
|
|
|
} /* this is HTTP */
|
2008-08-09 00:37:54 +04:00
|
|
|
} /* this is the first time we write a body part */
|
2008-10-10 02:14:38 +04:00
|
|
|
#endif /* CURL_DISABLE_HTTP */
|
2008-08-09 00:37:54 +04:00
|
|
|
k->bodywrites++;
|
|
|
|
|
|
|
|
/* pass data to the debug function before it gets "dechunked" */
|
|
|
|
if(data->set.verbose) {
|
2009-02-27 11:53:10 +03:00
|
|
|
if(k->badheader) {
|
|
|
|
Curl_debug(data, CURLINFO_DATA_IN, data->state.headerbuff,
|
|
|
|
(size_t)k->hbuflen, conn);
|
|
|
|
if(k->badheader == HEADER_PARTHEADER)
|
|
|
|
Curl_debug(data, CURLINFO_DATA_IN,
|
|
|
|
k->str, (size_t)nread, conn);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
Curl_debug(data, CURLINFO_DATA_IN,
|
|
|
|
k->str, (size_t)nread, conn);
|
2008-05-09 16:53:42 +04:00
|
|
|
}
|
2008-08-09 00:37:54 +04:00
|
|
|
|
|
|
|
#ifndef CURL_DISABLE_HTTP
|
|
|
|
if(k->chunk) {
|
2009-02-27 11:53:10 +03:00
|
|
|
/*
|
|
|
|
* Here comes a chunked transfer flying and we need to decode this
|
|
|
|
* properly. While the name says read, this function both reads
|
|
|
|
* and writes away the data. The returned 'nread' holds the number
|
|
|
|
* of actual data it wrote to the client.
|
|
|
|
*/
|
|
|
|
|
|
|
|
CHUNKcode res =
|
|
|
|
Curl_httpchunk_read(conn, k->str, nread, &nread);
|
|
|
|
|
|
|
|
if(CHUNKE_OK < res) {
|
|
|
|
if(CHUNKE_WRITE_ERROR == res) {
|
|
|
|
failf(data, "Failed writing data");
|
|
|
|
return CURLE_WRITE_ERROR;
|
|
|
|
}
|
2010-02-04 22:44:31 +03:00
|
|
|
failf(data, "Received problem %d in the chunky parser", (int)res);
|
2009-02-27 11:53:10 +03:00
|
|
|
return CURLE_RECV_ERROR;
|
|
|
|
}
|
|
|
|
else if(CHUNKE_STOP == res) {
|
|
|
|
size_t dataleft;
|
|
|
|
/* we're done reading chunks! */
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon &= ~KEEP_RECV; /* read no more */
|
2009-02-27 11:53:10 +03:00
|
|
|
|
|
|
|
/* There are now possibly N number of bytes at the end of the
|
|
|
|
str buffer that weren't written to the client.
|
|
|
|
|
|
|
|
We DO care about this data if we are pipelining.
|
|
|
|
Push it back to be read on the next pass. */
|
|
|
|
|
|
|
|
dataleft = conn->chunk.dataleft;
|
|
|
|
if(dataleft != 0) {
|
|
|
|
infof(conn->data, "Leftovers after chunking. "
|
2010-01-28 10:52:12 +03:00
|
|
|
" Rewinding %zu bytes\n",dataleft);
|
2009-02-27 11:53:10 +03:00
|
|
|
read_rewind(conn, dataleft);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* If it returned OK, we just keep going */
|
2008-08-09 00:37:54 +04:00
|
|
|
}
|
|
|
|
#endif /* CURL_DISABLE_HTTP */
|
|
|
|
|
2010-01-28 04:39:16 +03:00
|
|
|
/* Account for body content stored in the header buffer */
|
|
|
|
if(k->badheader && !k->ignorebody) {
|
2010-01-28 10:52:12 +03:00
|
|
|
DEBUGF(infof(data, "Increasing bytecount by %zu from hbuflen\n",
|
|
|
|
k->hbuflen));
|
2010-01-28 04:39:16 +03:00
|
|
|
k->bytecount += k->hbuflen;
|
|
|
|
}
|
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
if((-1 != k->maxdownload) &&
|
2009-02-27 11:53:10 +03:00
|
|
|
(k->bytecount + nread >= k->maxdownload)) {
|
2009-12-11 21:41:29 +03:00
|
|
|
|
2010-01-28 04:39:16 +03:00
|
|
|
excess = (size_t)(k->bytecount + nread - k->maxdownload);
|
2010-01-29 04:16:23 +03:00
|
|
|
if(excess > 0 && !k->ignorebody) {
|
|
|
|
if(conn->data->multi && Curl_multi_canPipeline(conn->data->multi)) {
|
|
|
|
/* The 'excess' amount below can't be more than BUFSIZE which
|
|
|
|
always will fit in a size_t */
|
2009-12-11 21:41:29 +03:00
|
|
|
infof(data,
|
2010-01-29 04:16:23 +03:00
|
|
|
"Rewinding stream by : %zu"
|
|
|
|
" bytes on url %s (size = %" FORMAT_OFF_T
|
|
|
|
", maxdownload = %" FORMAT_OFF_T
|
|
|
|
", bytecount = %" FORMAT_OFF_T ", nread = %zd)\n",
|
|
|
|
excess, data->state.path,
|
|
|
|
k->size, k->maxdownload, k->bytecount, nread);
|
2009-12-11 21:41:29 +03:00
|
|
|
read_rewind(conn, excess);
|
|
|
|
}
|
2010-01-29 04:16:23 +03:00
|
|
|
else {
|
|
|
|
infof(data,
|
2010-01-28 04:39:16 +03:00
|
|
|
"Excess found in a non pipelined read:"
|
2010-01-28 10:52:12 +03:00
|
|
|
" excess = %zu"
|
|
|
|
", size = %" FORMAT_OFF_T
|
|
|
|
", maxdownload = %" FORMAT_OFF_T
|
|
|
|
", bytecount = %" FORMAT_OFF_T "\n",
|
2010-01-28 04:39:16 +03:00
|
|
|
excess, k->size, k->maxdownload, k->bytecount);
|
2010-01-29 04:16:23 +03:00
|
|
|
}
|
2010-01-28 04:39:16 +03:00
|
|
|
}
|
2009-02-27 11:53:10 +03:00
|
|
|
|
|
|
|
nread = (ssize_t) (k->maxdownload - k->bytecount);
|
|
|
|
if(nread < 0 ) /* this should be unusual */
|
|
|
|
nread = 0;
|
|
|
|
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon &= ~KEEP_RECV; /* we're done reading */
|
2008-05-09 16:53:42 +04:00
|
|
|
}
|
2002-12-05 17:26:30 +03:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
k->bytecount += nread;
|
|
|
|
|
|
|
|
Curl_pgrsSetDownloadCounter(data, k->bytecount);
|
|
|
|
|
|
|
|
if(!k->chunk && (nread || k->badheader || is_empty_data)) {
|
2009-02-27 11:53:10 +03:00
|
|
|
/* If this is chunky transfer, it was already written */
|
|
|
|
|
|
|
|
if(k->badheader && !k->ignorebody) {
|
|
|
|
/* we parsed a piece of data wrongly assuming it was a header
|
|
|
|
and now we output it as body instead */
|
2010-01-28 04:39:16 +03:00
|
|
|
|
|
|
|
/* Don't let excess data pollute body writes */
|
|
|
|
if(k->maxdownload == -1 || (curl_off_t)k->hbuflen <= k->maxdownload)
|
|
|
|
result = Curl_client_write(conn, CLIENTWRITE_BODY,
|
|
|
|
data->state.headerbuff,
|
|
|
|
k->hbuflen);
|
|
|
|
else
|
|
|
|
result = Curl_client_write(conn, CLIENTWRITE_BODY,
|
|
|
|
data->state.headerbuff,
|
2010-01-28 10:52:12 +03:00
|
|
|
(size_t)k->maxdownload);
|
2010-01-28 04:39:16 +03:00
|
|
|
|
2009-02-27 11:53:10 +03:00
|
|
|
if(result)
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
if(k->badheader < HEADER_ALLBAD) {
|
|
|
|
/* This switch handles various content encodings. If there's an
|
|
|
|
error here, be sure to check over the almost identical code
|
|
|
|
in http_chunks.c.
|
|
|
|
Make sure that ALL_CONTENT_ENCODINGS contains all the
|
|
|
|
encodings handled here. */
|
2008-08-09 00:37:54 +04:00
|
|
|
#ifdef HAVE_LIBZ
|
2009-02-27 11:53:10 +03:00
|
|
|
switch (conn->data->set.http_ce_skip ?
|
|
|
|
IDENTITY : k->content_encoding) {
|
|
|
|
case IDENTITY:
|
2008-08-09 00:37:54 +04:00
|
|
|
#endif
|
2009-02-27 11:53:10 +03:00
|
|
|
/* This is the default when the server sends no
|
|
|
|
Content-Encoding header. See Curl_readwrite_init; the
|
|
|
|
memset() call initializes k->content_encoding to zero. */
|
2009-12-13 00:54:01 +03:00
|
|
|
if(!k->ignorebody) {
|
|
|
|
|
|
|
|
#ifndef CURL_DISABLE_POP3
|
|
|
|
if(conn->protocol&PROT_POP3)
|
|
|
|
result = Curl_pop3_write(conn, k->str, nread);
|
|
|
|
else
|
|
|
|
#endif /* CURL_DISABLE_POP3 */
|
|
|
|
|
2009-02-27 11:53:10 +03:00
|
|
|
result = Curl_client_write(conn, CLIENTWRITE_BODY, k->str,
|
|
|
|
nread);
|
2009-12-13 00:54:01 +03:00
|
|
|
}
|
2008-08-09 00:37:54 +04:00
|
|
|
#ifdef HAVE_LIBZ
|
2009-02-27 11:53:10 +03:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DEFLATE:
|
|
|
|
/* Assume CLIENTWRITE_BODY; headers are not encoded. */
|
|
|
|
if(!k->ignorebody)
|
|
|
|
result = Curl_unencode_deflate_write(conn, k, nread);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GZIP:
|
|
|
|
/* Assume CLIENTWRITE_BODY; headers are not encoded. */
|
|
|
|
if(!k->ignorebody)
|
|
|
|
result = Curl_unencode_gzip_write(conn, k, nread);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case COMPRESS:
|
|
|
|
default:
|
|
|
|
failf (data, "Unrecognized content encoding type. "
|
|
|
|
"libcurl understands `identity', `deflate' and `gzip' "
|
|
|
|
"content encodings.");
|
|
|
|
result = CURLE_BAD_CONTENT_ENCODING;
|
|
|
|
break;
|
|
|
|
}
|
2008-08-09 00:37:54 +04:00
|
|
|
#endif
|
2009-02-27 11:53:10 +03:00
|
|
|
}
|
|
|
|
k->badheader = HEADER_NORMAL; /* taken care of now */
|
2008-08-09 00:37:54 +04:00
|
|
|
|
2009-02-27 11:53:10 +03:00
|
|
|
if(result)
|
|
|
|
return result;
|
2008-05-09 16:53:42 +04:00
|
|
|
}
|
2002-12-05 17:26:30 +03:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
} /* if(! header and data to read ) */
|
2002-12-05 17:26:30 +03:00
|
|
|
|
2010-01-28 04:39:16 +03:00
|
|
|
#ifndef CURL_DISABLE_RTSP
|
|
|
|
if(excess > 0 && !conn->bits.stream_was_rewound &&
|
|
|
|
(conn->protocol & PROT_RTSP)) {
|
|
|
|
/* Check for RTP after the content if there is unrewound excess */
|
|
|
|
|
|
|
|
/* Parse the excess data */
|
|
|
|
k->str += nread;
|
|
|
|
nread = excess;
|
|
|
|
|
|
|
|
result = Curl_rtsp_rtp_readwrite(data, conn, &nread, &readmore);
|
|
|
|
if(result)
|
|
|
|
return result;
|
|
|
|
|
|
|
|
if(readmore)
|
|
|
|
k->keepon |= KEEP_RECV; /* we're not done reading */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
if(is_empty_data) {
|
|
|
|
/* if we received nothing, the server closed the connection and we
|
2009-02-27 11:53:10 +03:00
|
|
|
are done */
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon &= ~KEEP_RECV;
|
2008-08-09 00:37:54 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
} while(data_pending(conn));
|
|
|
|
|
2009-05-11 11:53:38 +04:00
|
|
|
if(((k->keepon & (KEEP_RECV|KEEP_SEND)) == KEEP_SEND) &&
|
2008-08-29 14:47:59 +04:00
|
|
|
conn->bits.close ) {
|
2008-09-08 11:39:05 +04:00
|
|
|
/* When we've read the entire thing and the close bit is set, the server
|
|
|
|
may now close the connection. If there's now any kind of sending going
|
|
|
|
on from our side, we need to stop that immediately. */
|
2008-08-29 14:47:59 +04:00
|
|
|
infof(data, "we are done reading and this is set to close, stop send\n");
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon &= ~KEEP_SEND; /* no writing anymore either */
|
2008-08-29 14:47:59 +04:00
|
|
|
}
|
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Send data to upload to the server, when the socket is writable.
|
|
|
|
*/
|
|
|
|
static CURLcode readwrite_upload(struct SessionHandle *data,
|
|
|
|
struct connectdata *conn,
|
|
|
|
struct SingleRequest *k,
|
|
|
|
int *didwhat)
|
|
|
|
{
|
|
|
|
ssize_t i, si;
|
|
|
|
ssize_t bytes_written;
|
|
|
|
CURLcode result;
|
|
|
|
ssize_t nread; /* number of bytes read */
|
2009-05-07 22:03:49 +04:00
|
|
|
bool sending_http_headers = FALSE;
|
2004-05-17 10:50:08 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
if((k->bytecount == 0) && (k->writebytecount == 0))
|
|
|
|
Curl_pgrsTime(data, TIMER_STARTTRANSFER);
|
2002-12-09 18:37:54 +03:00
|
|
|
|
2009-05-11 11:53:38 +04:00
|
|
|
*didwhat |= KEEP_SEND;
|
2000-05-22 18:09:31 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/*
|
|
|
|
* We loop here to do the READ and SEND loop until we run out of
|
|
|
|
* data to send or until we get EWOULDBLOCK back
|
|
|
|
*/
|
|
|
|
do {
|
2004-08-20 16:09:09 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* only read more data if there's no upload data already
|
|
|
|
present in the upload buffer */
|
|
|
|
if(0 == data->req.upload_present) {
|
|
|
|
/* init the "upload from here" pointer */
|
|
|
|
data->req.upload_fromhere = k->uploadbuf;
|
|
|
|
|
|
|
|
if(!k->upload_done) {
|
2009-02-27 11:53:10 +03:00
|
|
|
/* HTTP pollution, this should be written nicer to become more
|
|
|
|
protocol agnostic. */
|
|
|
|
int fillcount;
|
|
|
|
|
|
|
|
if((k->exp100 == EXP100_SENDING_REQUEST) &&
|
|
|
|
(data->state.proto.http->sending == HTTPSEND_BODY)) {
|
|
|
|
/* If this call is to send body data, we must take some action:
|
|
|
|
We have sent off the full HTTP 1.1 request, and we shall now
|
|
|
|
go into the Expect: 100 state and await such a header */
|
|
|
|
k->exp100 = EXP100_AWAITING_CONTINUE; /* wait for the header */
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon &= ~KEEP_SEND; /* disable writing */
|
2009-02-27 11:53:10 +03:00
|
|
|
k->start100 = Curl_tvnow(); /* timeout count starts now */
|
2009-05-11 11:53:38 +04:00
|
|
|
*didwhat &= ~KEEP_SEND; /* we didn't write anything actually */
|
2009-02-27 11:53:10 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2010-01-21 16:58:30 +03:00
|
|
|
if(conn->protocol&(PROT_HTTP|PROT_RTSP)) {
|
2009-05-07 22:03:49 +04:00
|
|
|
if(data->state.proto.http->sending == HTTPSEND_REQUEST)
|
2009-05-04 13:47:02 +04:00
|
|
|
/* We're sending the HTTP request headers, not the data.
|
|
|
|
Remember that so we don't change the line endings. */
|
2009-05-07 22:03:49 +04:00
|
|
|
sending_http_headers = TRUE;
|
|
|
|
else
|
2009-05-04 13:47:02 +04:00
|
|
|
sending_http_headers = FALSE;
|
|
|
|
}
|
2009-05-07 22:03:49 +04:00
|
|
|
|
2009-02-27 11:53:10 +03:00
|
|
|
result = Curl_fillreadbuffer(conn, BUFSIZE, &fillcount);
|
|
|
|
if(result)
|
|
|
|
return result;
|
|
|
|
|
|
|
|
nread = (ssize_t)fillcount;
|
2008-08-09 00:37:54 +04:00
|
|
|
}
|
|
|
|
else
|
2009-02-27 11:53:10 +03:00
|
|
|
nread = 0; /* we're done uploading/reading */
|
2002-12-05 17:26:30 +03:00
|
|
|
|
2009-05-11 11:53:38 +04:00
|
|
|
if(!nread && (k->keepon & KEEP_SEND_PAUSE)) {
|
2009-02-27 11:53:10 +03:00
|
|
|
/* this is a paused transfer */
|
|
|
|
break;
|
2008-08-09 00:37:54 +04:00
|
|
|
}
|
|
|
|
else if(nread<=0) {
|
2009-02-27 11:53:10 +03:00
|
|
|
/* done */
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon &= ~KEEP_SEND; /* we're done writing */
|
2009-02-27 11:53:10 +03:00
|
|
|
|
|
|
|
if(conn->bits.rewindaftersend) {
|
|
|
|
result = Curl_readrewind(conn);
|
|
|
|
if(result)
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
break;
|
2008-05-09 16:53:42 +04:00
|
|
|
}
|
2000-05-22 18:09:31 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* store number of bytes available for upload */
|
|
|
|
data->req.upload_present = nread;
|
2000-05-22 18:09:31 +04:00
|
|
|
|
2009-12-31 00:52:27 +03:00
|
|
|
#ifndef CURL_DISABLE_SMTP
|
|
|
|
if(conn->protocol & PROT_SMTP) {
|
2009-12-31 01:09:43 +03:00
|
|
|
result = Curl_smtp_escape_eob(conn, nread);
|
|
|
|
if(result)
|
|
|
|
return result;
|
2009-12-31 00:52:27 +03:00
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif /* CURL_DISABLE_SMTP */
|
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* convert LF to CRLF if so asked */
|
2009-05-07 22:03:49 +04:00
|
|
|
if((!sending_http_headers) &&
|
2008-08-09 00:37:54 +04:00
|
|
|
#ifdef CURL_DO_LINEEND_CONV
|
2009-05-07 22:03:49 +04:00
|
|
|
/* always convert if we're FTPing in ASCII mode */
|
|
|
|
((data->set.crlf) || (data->set.prefer_ascii))) {
|
2008-08-09 00:37:54 +04:00
|
|
|
#else
|
2009-05-07 22:03:49 +04:00
|
|
|
(data->set.crlf)) {
|
|
|
|
#endif
|
|
|
|
if(data->state.scratch == NULL)
|
|
|
|
data->state.scratch = malloc(2*BUFSIZE);
|
|
|
|
if(data->state.scratch == NULL) {
|
|
|
|
failf (data, "Failed to alloc scratch buffer!");
|
|
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* ASCII/EBCDIC Note: This is presumably a text (not binary)
|
|
|
|
* transfer so the data should already be in ASCII.
|
|
|
|
* That means the hex values for ASCII CR (0x0d) & LF (0x0a)
|
|
|
|
* must be used instead of the escape sequences \r & \n.
|
|
|
|
*/
|
|
|
|
for(i = 0, si = 0; i < nread; i++, si++) {
|
|
|
|
if(data->req.upload_fromhere[i] == 0x0a) {
|
|
|
|
data->state.scratch[si++] = 0x0d;
|
|
|
|
data->state.scratch[si] = 0x0a;
|
|
|
|
if(!data->set.crlf) {
|
|
|
|
/* we're here only because FTP is in ASCII mode...
|
|
|
|
bump infilesize for the LF we just added */
|
|
|
|
data->set.infilesize++;
|
2009-02-27 11:53:10 +03:00
|
|
|
}
|
|
|
|
}
|
2009-05-07 22:03:49 +04:00
|
|
|
else
|
|
|
|
data->state.scratch[si] = data->req.upload_fromhere[i];
|
|
|
|
}
|
|
|
|
if(si != nread) {
|
|
|
|
/* only perform the special operation if we really did replace
|
|
|
|
anything */
|
|
|
|
nread = si;
|
2009-02-27 11:53:10 +03:00
|
|
|
|
2009-05-07 22:03:49 +04:00
|
|
|
/* upload from the new (replaced) buffer instead */
|
|
|
|
data->req.upload_fromhere = data->state.scratch;
|
2009-02-27 11:53:10 +03:00
|
|
|
|
2009-05-07 22:03:49 +04:00
|
|
|
/* set the new amount too */
|
|
|
|
data->req.upload_present = nread;
|
2009-02-27 11:53:10 +03:00
|
|
|
}
|
2009-05-07 22:03:49 +04:00
|
|
|
}
|
2008-08-09 00:37:54 +04:00
|
|
|
} /* if 0 == data->req.upload_present */
|
|
|
|
else {
|
|
|
|
/* We have a partial buffer left from a previous "round". Use
|
2009-02-27 11:53:10 +03:00
|
|
|
that instead of reading more data */
|
2008-08-09 00:37:54 +04:00
|
|
|
}
|
2000-05-22 18:09:31 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* write to socket (send away data) */
|
|
|
|
result = Curl_write(conn,
|
2010-01-21 16:58:30 +03:00
|
|
|
conn->writesockfd, /* socket to send to */
|
2009-02-27 11:53:10 +03:00
|
|
|
data->req.upload_fromhere, /* buffer pointer */
|
|
|
|
data->req.upload_present, /* buffer size */
|
2009-12-31 00:52:27 +03:00
|
|
|
&bytes_written); /* actually sent */
|
2008-12-20 00:14:52 +03:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
if(result)
|
|
|
|
return result;
|
2000-05-22 18:09:31 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
if(data->set.verbose)
|
|
|
|
/* show the data before we change the pointer upload_fromhere */
|
|
|
|
Curl_debug(data, CURLINFO_DATA_OUT, data->req.upload_fromhere,
|
2009-02-27 11:53:10 +03:00
|
|
|
(size_t)bytes_written, conn);
|
2003-02-24 19:53:53 +03:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
if(data->req.upload_present != bytes_written) {
|
|
|
|
/* we only wrote a part of the buffer (if anything), deal with it! */
|
2004-06-22 10:50:41 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* store the amount of bytes left in the buffer to write */
|
|
|
|
data->req.upload_present -= bytes_written;
|
2002-12-05 17:26:30 +03:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* advance the pointer where to find the buffer when the next send
|
2009-02-27 11:53:10 +03:00
|
|
|
is to happen */
|
2008-08-09 00:37:54 +04:00
|
|
|
data->req.upload_fromhere += bytes_written;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* we've uploaded that buffer now */
|
|
|
|
data->req.upload_fromhere = k->uploadbuf;
|
|
|
|
data->req.upload_present = 0; /* no more bytes left */
|
2004-11-24 19:11:35 +03:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
if(k->upload_done) {
|
2009-02-27 11:53:10 +03:00
|
|
|
/* switch off writing, we're done! */
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon &= ~KEEP_SEND; /* we're done writing */
|
2008-08-09 00:37:54 +04:00
|
|
|
}
|
|
|
|
}
|
2008-05-09 16:53:42 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
k->writebytecount += bytes_written;
|
|
|
|
Curl_pgrsSetUploadCounter(data, k->writebytecount);
|
2008-05-09 16:53:42 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
} while(0); /* just to break out from! */
|
2000-05-22 18:09:31 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
2002-01-03 18:01:22 +03:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/*
|
|
|
|
* Curl_readwrite() is the low-level function to be called when data is to
|
|
|
|
* be read and written to/from the connection.
|
|
|
|
*/
|
|
|
|
CURLcode Curl_readwrite(struct connectdata *conn,
|
|
|
|
bool *done)
|
|
|
|
{
|
|
|
|
struct SessionHandle *data = conn->data;
|
|
|
|
struct SingleRequest *k = &data->req;
|
|
|
|
CURLcode result;
|
|
|
|
int didwhat=0;
|
2002-03-20 13:53:24 +03:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
curl_socket_t fd_read;
|
|
|
|
curl_socket_t fd_write;
|
|
|
|
int select_res = conn->cselect_bits;
|
2002-03-20 13:53:24 +03:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
conn->cselect_bits = 0;
|
2002-12-05 17:26:30 +03:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* only use the proper socket if the *_HOLD bit is not set simultaneously as
|
|
|
|
then we are in rate limiting state in that transfer direction */
|
2008-05-09 16:53:42 +04:00
|
|
|
|
2010-03-06 21:39:45 +03:00
|
|
|
if((k->keepon & KEEP_RECVBITS) == KEEP_RECV)
|
2008-08-09 00:37:54 +04:00
|
|
|
fd_read = conn->sockfd;
|
2010-03-06 21:39:45 +03:00
|
|
|
else
|
2008-08-09 00:37:54 +04:00
|
|
|
fd_read = CURL_SOCKET_BAD;
|
2008-05-09 16:53:42 +04:00
|
|
|
|
2009-05-11 11:53:38 +04:00
|
|
|
if((k->keepon & KEEP_SENDBITS) == KEEP_SEND)
|
2008-08-09 00:37:54 +04:00
|
|
|
fd_write = conn->writesockfd;
|
|
|
|
else
|
|
|
|
fd_write = CURL_SOCKET_BAD;
|
2008-05-09 16:53:42 +04:00
|
|
|
|
2010-03-06 21:39:45 +03:00
|
|
|
if(!select_res) /* Call for select()/poll() only, if read/write/error
|
|
|
|
status is not known. */
|
|
|
|
select_res = Curl_socket_ready(fd_read, fd_write, 0);
|
2008-05-09 16:53:42 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
if(select_res == CURL_CSELECT_ERR) {
|
|
|
|
failf(data, "select/poll returned error");
|
|
|
|
return CURLE_SEND_ERROR;
|
|
|
|
}
|
2008-05-09 16:53:42 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* We go ahead and do a read if we have a readable socket or if
|
|
|
|
the stream was rewound (in which case we have data in a
|
|
|
|
buffer) */
|
2009-05-11 11:53:38 +04:00
|
|
|
if((k->keepon & KEEP_RECV) &&
|
2008-08-09 00:37:54 +04:00
|
|
|
((select_res & CURL_CSELECT_IN) || conn->bits.stream_was_rewound)) {
|
2002-01-16 17:50:53 +03:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
result = readwrite_data(data, conn, k, &didwhat, done);
|
|
|
|
if(result || *done)
|
|
|
|
return result;
|
|
|
|
}
|
2000-05-22 18:09:31 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* If we still have writing to do, we check if we have a writable socket. */
|
2009-05-11 11:53:38 +04:00
|
|
|
if((k->keepon & KEEP_SEND) && (select_res & CURL_CSELECT_OUT)) {
|
2008-08-09 00:37:54 +04:00
|
|
|
/* write */
|
2004-05-17 10:50:08 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
result = readwrite_upload(data, conn, k, &didwhat);
|
|
|
|
if(result)
|
|
|
|
return result;
|
|
|
|
}
|
2000-10-03 15:02:52 +04:00
|
|
|
|
2003-02-24 19:53:53 +03:00
|
|
|
k->now = Curl_tvnow();
|
2002-01-03 18:01:22 +03:00
|
|
|
if(didwhat) {
|
|
|
|
/* Update read/write counters */
|
2006-09-08 01:49:20 +04:00
|
|
|
if(k->bytecountp)
|
|
|
|
*k->bytecountp = k->bytecount; /* read count */
|
|
|
|
if(k->writebytecountp)
|
|
|
|
*k->writebytecountp = k->writebytecount; /* write count */
|
2002-01-03 18:01:22 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* no read no write, this is a timeout? */
|
2008-03-13 23:56:13 +03:00
|
|
|
if(k->exp100 == EXP100_AWAITING_CONTINUE) {
|
2002-01-03 18:01:22 +03:00
|
|
|
/* This should allow some time for the header to arrive, but only a
|
2008-03-13 23:56:13 +03:00
|
|
|
very short time as otherwise it'll be too much wasted time too
|
2002-01-03 18:01:22 +03:00
|
|
|
often. */
|
2003-02-24 19:53:53 +03:00
|
|
|
|
|
|
|
/* Quoting RFC2616, section "8.2.3 Use of the 100 (Continue) Status":
|
2004-05-17 10:50:08 +04:00
|
|
|
|
2008-05-09 16:53:42 +04:00
|
|
|
Therefore, when a client sends this header field to an origin server
|
|
|
|
(possibly via a proxy) from which it has never seen a 100 (Continue)
|
|
|
|
status, the client SHOULD NOT wait for an indefinite period before
|
|
|
|
sending the request body.
|
2003-02-24 19:53:53 +03:00
|
|
|
|
|
|
|
*/
|
|
|
|
|
2004-07-01 12:10:21 +04:00
|
|
|
long ms = Curl_tvdiff(k->now, k->start100);
|
2003-02-24 19:53:53 +03:00
|
|
|
if(ms > CURL_TIMEOUT_EXPECT_100) {
|
|
|
|
/* we've waited long enough, continue anyway */
|
2008-03-13 23:56:13 +03:00
|
|
|
k->exp100 = EXP100_SEND_DATA;
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon |= KEEP_SEND;
|
2008-08-05 02:00:22 +04:00
|
|
|
infof(data, "Done waiting for 100-continue\n");
|
2003-02-24 19:53:53 +03:00
|
|
|
}
|
2004-05-17 10:50:08 +04:00
|
|
|
}
|
2002-01-03 18:01:22 +03:00
|
|
|
}
|
2001-11-01 15:18:53 +03:00
|
|
|
|
2002-01-03 18:01:22 +03:00
|
|
|
if(Curl_pgrsUpdate(conn))
|
|
|
|
result = CURLE_ABORTED_BY_CALLBACK;
|
|
|
|
else
|
2004-07-17 01:01:16 +04:00
|
|
|
result = Curl_speedcheck(data, k->now);
|
2007-11-05 12:45:09 +03:00
|
|
|
if(result)
|
2002-01-03 18:01:22 +03:00
|
|
|
return result;
|
2004-05-17 10:50:08 +04:00
|
|
|
|
2010-03-24 19:02:17 +03:00
|
|
|
if(k->keepon) {
|
|
|
|
if(data->set.timeout &&
|
|
|
|
(Curl_tvdiff(k->now, k->start) >= data->set.timeout)) {
|
|
|
|
if(k->size != -1) {
|
|
|
|
failf(data, "Operation timed out after %ld milliseconds with %"
|
|
|
|
FORMAT_OFF_T " out of %" FORMAT_OFF_T " bytes received",
|
|
|
|
Curl_tvdiff(k->now, k->start), k->bytecount, k->size);
|
|
|
|
} else {
|
|
|
|
failf(data, "Operation timed out after %ld milliseconds with %"
|
|
|
|
FORMAT_OFF_T " bytes received",
|
|
|
|
Curl_tvdiff(k->now, k->start), k->bytecount);
|
|
|
|
}
|
|
|
|
return CURLE_OPERATION_TIMEDOUT;
|
2006-07-25 22:38:51 +04:00
|
|
|
}
|
2002-01-03 18:01:22 +03:00
|
|
|
}
|
2010-03-24 19:02:17 +03:00
|
|
|
else {
|
2002-01-03 18:01:22 +03:00
|
|
|
/*
|
|
|
|
* The transfer has been performed. Just make some general checks before
|
|
|
|
* returning.
|
|
|
|
*/
|
|
|
|
|
2008-01-31 15:04:33 +03:00
|
|
|
if(!(data->set.opt_no_body) && (k->size != -1) &&
|
2006-09-08 01:49:20 +04:00
|
|
|
(k->bytecount != k->size) &&
|
2006-04-26 11:40:37 +04:00
|
|
|
#ifdef CURL_DO_LINEEND_CONV
|
|
|
|
/* Most FTP servers don't adjust their file SIZE response for CRLFs,
|
|
|
|
so we'll check to see if the discrepancy can be explained
|
|
|
|
by the number of CRLFs we've changed to LFs.
|
2008-05-09 16:53:42 +04:00
|
|
|
*/
|
2006-09-08 01:49:20 +04:00
|
|
|
(k->bytecount != (k->size + data->state.crlf_conversions)) &&
|
2006-04-26 11:40:37 +04:00
|
|
|
#endif /* CURL_DO_LINEEND_CONV */
|
2007-11-25 02:16:55 +03:00
|
|
|
!data->req.newurl) {
|
2008-08-16 05:33:59 +04:00
|
|
|
failf(data, "transfer closed with %" FORMAT_OFF_T
|
2004-03-01 19:27:34 +03:00
|
|
|
" bytes remaining to read",
|
2006-09-08 01:49:20 +04:00
|
|
|
k->size - k->bytecount);
|
2002-01-03 18:01:22 +03:00
|
|
|
return CURLE_PARTIAL_FILE;
|
|
|
|
}
|
2008-01-31 15:04:33 +03:00
|
|
|
else if(!(data->set.opt_no_body) &&
|
|
|
|
k->chunk &&
|
2007-10-02 14:21:36 +04:00
|
|
|
(conn->chunk.state != CHUNK_STOP)) {
|
2004-12-03 12:31:25 +03:00
|
|
|
/*
|
|
|
|
* In chunked mode, return an error if the connection is closed prior to
|
|
|
|
* the empty (terminiating) chunk is read.
|
|
|
|
*
|
|
|
|
* The condition above used to check for
|
|
|
|
* conn->proto.http->chunk.datasize != 0 which is true after reading
|
|
|
|
* *any* chunk, not just the empty chunk.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
failf(data, "transfer closed with outstanding read data remaining");
|
2002-01-03 18:01:22 +03:00
|
|
|
return CURLE_PARTIAL_FILE;
|
2000-05-22 18:09:31 +04:00
|
|
|
}
|
2007-03-11 12:11:29 +03:00
|
|
|
if(Curl_pgrsUpdate(conn))
|
|
|
|
return CURLE_ABORTED_BY_CALLBACK;
|
2000-05-22 18:09:31 +04:00
|
|
|
}
|
2001-05-12 20:11:14 +04:00
|
|
|
|
2002-01-03 18:01:22 +03:00
|
|
|
/* Now update the "done" boolean we return */
|
2009-05-11 11:53:38 +04:00
|
|
|
*done = (bool)(0 == (k->keepon&(KEEP_RECV|KEEP_SEND|
|
|
|
|
KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)));
|
2001-05-12 20:11:14 +04:00
|
|
|
|
2002-01-03 18:01:22 +03:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2004-04-26 11:12:52 +04:00
|
|
|
/*
|
2006-04-10 19:00:53 +04:00
|
|
|
* Curl_single_getsock() gets called by the multi interface code when the app
|
|
|
|
* has requested to get the sockets for the current connection. This function
|
2004-04-26 11:12:52 +04:00
|
|
|
* will then be called once for every connection that the multi interface
|
|
|
|
* keeps track of. This function will only be called for connections that are
|
|
|
|
* in the proper state to have this information available.
|
|
|
|
*/
|
2007-08-27 10:31:28 +04:00
|
|
|
int Curl_single_getsock(const struct connectdata *conn,
|
2006-04-10 19:00:53 +04:00
|
|
|
curl_socket_t *sock, /* points to numsocks number
|
|
|
|
of sockets */
|
|
|
|
int numsocks)
|
2000-05-22 18:09:31 +04:00
|
|
|
{
|
2007-08-27 10:31:28 +04:00
|
|
|
const struct SessionHandle *data = conn->data;
|
2006-04-10 19:00:53 +04:00
|
|
|
int bitmap = GETSOCK_BLANK;
|
2007-09-27 05:45:22 +04:00
|
|
|
unsigned sockindex = 0;
|
2006-04-10 19:00:53 +04:00
|
|
|
|
2008-12-20 00:14:52 +03:00
|
|
|
if(conn->handler->perform_getsock)
|
|
|
|
return conn->handler->perform_getsock(conn, sock, numsocks);
|
|
|
|
|
2006-04-10 19:00:53 +04:00
|
|
|
if(numsocks < 2)
|
|
|
|
/* simple check but we might need two slots */
|
|
|
|
return GETSOCK_BLANK;
|
|
|
|
|
2008-01-08 17:52:05 +03:00
|
|
|
/* don't include HOLD and PAUSE connections */
|
2009-05-11 11:53:38 +04:00
|
|
|
if((data->req.keepon & KEEP_RECVBITS) == KEEP_RECV) {
|
2007-11-16 00:45:45 +03:00
|
|
|
|
|
|
|
DEBUGASSERT(conn->sockfd != CURL_SOCKET_BAD);
|
|
|
|
|
2007-09-27 05:45:22 +04:00
|
|
|
bitmap |= GETSOCK_READSOCK(sockindex);
|
|
|
|
sock[sockindex] = conn->sockfd;
|
2002-01-03 18:01:22 +03:00
|
|
|
}
|
2006-09-08 01:49:20 +04:00
|
|
|
|
2008-01-08 17:52:05 +03:00
|
|
|
/* don't include HOLD and PAUSE connections */
|
2009-05-11 11:53:38 +04:00
|
|
|
if((data->req.keepon & KEEP_SENDBITS) == KEEP_SEND) {
|
2004-03-10 19:01:47 +03:00
|
|
|
|
2006-06-09 11:08:34 +04:00
|
|
|
if((conn->sockfd != conn->writesockfd) ||
|
2009-05-11 11:53:38 +04:00
|
|
|
!(data->req.keepon & KEEP_RECV)) {
|
2006-06-09 11:08:34 +04:00
|
|
|
/* only if they are not the same socket or we didn't have a readable
|
|
|
|
one, we increase index */
|
2009-05-11 11:53:38 +04:00
|
|
|
if(data->req.keepon & KEEP_RECV)
|
2007-09-27 05:45:22 +04:00
|
|
|
sockindex++; /* increase index if we need two entries */
|
2007-11-16 00:45:45 +03:00
|
|
|
|
|
|
|
DEBUGASSERT(conn->writesockfd != CURL_SOCKET_BAD);
|
|
|
|
|
2007-09-27 05:45:22 +04:00
|
|
|
sock[sockindex] = conn->writesockfd;
|
2006-04-10 19:00:53 +04:00
|
|
|
}
|
|
|
|
|
2007-09-27 05:45:22 +04:00
|
|
|
bitmap |= GETSOCK_WRITESOCK(sockindex);
|
2002-01-03 18:01:22 +03:00
|
|
|
}
|
2006-04-10 19:00:53 +04:00
|
|
|
|
|
|
|
return bitmap;
|
2002-01-03 18:01:22 +03:00
|
|
|
}
|
|
|
|
|
2010-03-27 01:33:02 +03:00
|
|
|
/*
|
|
|
|
* Determine optimum sleep time based on configured rate, current rate,
|
|
|
|
* and packet size.
|
|
|
|
* Returns value in mili-seconds.
|
|
|
|
*
|
|
|
|
* The basic idea is to adjust the desired rate up/down in this method
|
|
|
|
* based on whether we are running too slow or too fast. Then, calculate
|
|
|
|
* how many miliseconds to wait for the next packet to achieve this new
|
|
|
|
* rate.
|
|
|
|
*/
|
|
|
|
long Curl_sleep_time(curl_off_t rate_bps, curl_off_t cur_rate_bps,
|
|
|
|
int pkt_size)
|
|
|
|
{
|
|
|
|
curl_off_t min_sleep = 0;
|
|
|
|
curl_off_t rv = 0;
|
|
|
|
|
|
|
|
if (rate_bps == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* If running faster than about .1% of the desired speed, slow
|
|
|
|
* us down a bit. Use shift instead of division as the 0.1%
|
|
|
|
* cutoff is arbitrary anyway.
|
|
|
|
*/
|
|
|
|
if (cur_rate_bps > (rate_bps + (rate_bps >> 10))) {
|
|
|
|
/* running too fast, decrease target rate by 1/64th of rate */
|
|
|
|
rate_bps -= rate_bps >> 6;
|
|
|
|
min_sleep = 1;
|
|
|
|
}
|
|
|
|
else if (cur_rate_bps < (rate_bps - (rate_bps >> 10))) {
|
|
|
|
/* running too slow, increase target rate by 1/64th of rate */
|
|
|
|
rate_bps += rate_bps >> 6;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Determine number of miliseconds to wait until we do
|
|
|
|
* the next packet at the adjusted rate. We should wait
|
|
|
|
* longer when using larger packets, for instance.
|
|
|
|
*/
|
|
|
|
rv = ((curl_off_t)((pkt_size * 8) * 1000) / rate_bps);
|
|
|
|
|
|
|
|
/* Catch rounding errors and always slow down at least 1ms if
|
|
|
|
* we are running too fast.
|
|
|
|
*/
|
|
|
|
if (rv < min_sleep)
|
|
|
|
rv = min_sleep;
|
|
|
|
|
|
|
|
/* Bound value to fit in 'long' on 32-bit platform. That's
|
|
|
|
* plenty long enough anyway!
|
|
|
|
*/
|
|
|
|
if(rv > 0x7fffffff)
|
|
|
|
rv = 0x7fffffff;
|
|
|
|
|
|
|
|
return (long)rv;
|
|
|
|
}
|
|
|
|
|
2002-01-03 18:01:22 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Transfer()
|
|
|
|
*
|
2010-01-22 16:52:35 +03:00
|
|
|
* This function is what performs the actual transfer. It is capable of doing
|
|
|
|
* both ways simultaneously. The transfer must already have been setup by a
|
|
|
|
* call to Curl_setup_transfer().
|
2002-01-03 18:01:22 +03:00
|
|
|
*
|
|
|
|
* Note that headers are created in a preallocated buffer of a default size.
|
2004-03-05 12:40:16 +03:00
|
|
|
* That buffer can be enlarged on demand, but it is never shrunken again.
|
2002-01-03 18:01:22 +03:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static CURLcode
|
|
|
|
Transfer(struct connectdata *conn)
|
|
|
|
{
|
|
|
|
CURLcode result;
|
2006-09-08 01:49:20 +04:00
|
|
|
struct SessionHandle *data = conn->data;
|
2007-11-25 02:16:55 +03:00
|
|
|
struct SingleRequest *k = &data->req;
|
2002-01-03 18:01:22 +03:00
|
|
|
bool done=FALSE;
|
2009-02-19 13:36:20 +03:00
|
|
|
bool first=TRUE;
|
|
|
|
int timeout_ms;
|
2010-03-27 01:33:02 +03:00
|
|
|
int buffersize;
|
|
|
|
int totmp;
|
2002-01-03 18:01:22 +03:00
|
|
|
|
2004-04-26 11:12:52 +04:00
|
|
|
if((conn->sockfd == CURL_SOCKET_BAD) &&
|
|
|
|
(conn->writesockfd == CURL_SOCKET_BAD))
|
2002-01-03 18:01:22 +03:00
|
|
|
/* nothing to read, nothing to write, we're already OK! */
|
|
|
|
return CURLE_OK;
|
|
|
|
|
|
|
|
/* we want header and/or body, if neither then don't do this! */
|
2008-01-31 15:04:33 +03:00
|
|
|
if(!k->getheader && data->set.opt_no_body)
|
2002-01-03 18:01:22 +03:00
|
|
|
return CURLE_OK;
|
|
|
|
|
2007-11-05 12:45:09 +03:00
|
|
|
while(!done) {
|
2009-09-26 12:31:48 +04:00
|
|
|
curl_socket_t fd_read = conn->sockfd;
|
|
|
|
curl_socket_t fd_write = conn->writesockfd;
|
|
|
|
int keepon = k->keepon;
|
2010-03-27 01:33:02 +03:00
|
|
|
timeout_ms = 1000;
|
2009-09-26 12:31:48 +04:00
|
|
|
|
|
|
|
if(conn->waitfor) {
|
|
|
|
/* if waitfor is set, get the RECV and SEND bits from that but keep the
|
|
|
|
other bits */
|
|
|
|
keepon &= ~ (KEEP_RECV|KEEP_SEND);
|
|
|
|
keepon |= conn->waitfor & (KEEP_RECV|KEEP_SEND);
|
|
|
|
}
|
2004-11-19 11:52:33 +03:00
|
|
|
|
2006-06-23 01:36:53 +04:00
|
|
|
/* limit-rate logic: if speed exceeds threshold, then do not include fd in
|
2006-12-06 12:37:40 +03:00
|
|
|
select set. The current speed is recalculated in each Curl_readwrite()
|
|
|
|
call */
|
2009-09-26 12:31:48 +04:00
|
|
|
if((keepon & KEEP_SEND) &&
|
2006-12-06 12:37:40 +03:00
|
|
|
(!data->set.max_send_speed ||
|
|
|
|
(data->progress.ulspeed < data->set.max_send_speed) )) {
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon &= ~KEEP_SEND_HOLD;
|
2006-06-23 01:36:53 +04:00
|
|
|
}
|
|
|
|
else {
|
2010-03-27 01:33:02 +03:00
|
|
|
if (data->set.upload && data->set.max_send_speed &&
|
|
|
|
(data->progress.ulspeed > data->set.max_send_speed) ) {
|
|
|
|
/* calculate upload rate-limitation timeout. */
|
|
|
|
buffersize = (int)(data->set.buffer_size ?
|
|
|
|
data->set.buffer_size : BUFSIZE);
|
|
|
|
totmp = (int)Curl_sleep_time(data->set.max_send_speed,
|
|
|
|
data->progress.ulspeed, buffersize);
|
|
|
|
if (totmp < timeout_ms)
|
|
|
|
timeout_ms = totmp;
|
|
|
|
}
|
2006-12-06 12:37:40 +03:00
|
|
|
fd_write = CURL_SOCKET_BAD;
|
2009-09-26 12:31:48 +04:00
|
|
|
if(keepon & KEEP_SEND)
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon |= KEEP_SEND_HOLD; /* hold it */
|
2006-06-23 01:36:53 +04:00
|
|
|
}
|
|
|
|
|
2009-09-26 12:31:48 +04:00
|
|
|
if((keepon & KEEP_RECV) &&
|
2006-12-06 12:37:40 +03:00
|
|
|
(!data->set.max_recv_speed ||
|
|
|
|
(data->progress.dlspeed < data->set.max_recv_speed)) ) {
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon &= ~KEEP_RECV_HOLD;
|
2006-06-23 01:36:53 +04:00
|
|
|
}
|
|
|
|
else {
|
2010-03-27 01:33:02 +03:00
|
|
|
if ((!data->set.upload) && data->set.max_recv_speed &&
|
|
|
|
(data->progress.dlspeed > data->set.max_recv_speed)) {
|
|
|
|
/* Calculate download rate-limitation timeout. */
|
|
|
|
buffersize = (int)(data->set.buffer_size ?
|
|
|
|
data->set.buffer_size : BUFSIZE);
|
|
|
|
totmp = (int)Curl_sleep_time(data->set.max_recv_speed,
|
|
|
|
data->progress.dlspeed, buffersize);
|
|
|
|
if (totmp < timeout_ms)
|
|
|
|
timeout_ms = totmp;
|
|
|
|
}
|
2006-12-06 12:37:40 +03:00
|
|
|
fd_read = CURL_SOCKET_BAD;
|
2009-09-26 12:31:48 +04:00
|
|
|
if(keepon & KEEP_RECV)
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon |= KEEP_RECV_HOLD; /* hold it */
|
2006-06-23 01:36:53 +04:00
|
|
|
}
|
2002-01-29 23:28:59 +03:00
|
|
|
|
2008-01-08 17:52:05 +03:00
|
|
|
/* pause logic. Don't check descriptors for paused connections */
|
2009-05-11 11:53:38 +04:00
|
|
|
if(k->keepon & KEEP_RECV_PAUSE)
|
2008-01-08 17:52:05 +03:00
|
|
|
fd_read = CURL_SOCKET_BAD;
|
2009-05-11 11:53:38 +04:00
|
|
|
if(k->keepon & KEEP_SEND_PAUSE)
|
2008-01-08 17:52:05 +03:00
|
|
|
fd_write = CURL_SOCKET_BAD;
|
|
|
|
|
|
|
|
/* The *_HOLD and *_PAUSE logic is necessary since even though there might
|
|
|
|
be no traffic during the select interval, we still call
|
|
|
|
Curl_readwrite() for the timeout case and if we limit transfer speed we
|
|
|
|
must make sure that this function doesn't transfer anything while in
|
2009-02-19 13:36:20 +03:00
|
|
|
HOLD status.
|
|
|
|
|
|
|
|
The no timeout for the first round is for the protocols for which data
|
|
|
|
has already been slurped off the socket and thus waiting for action
|
|
|
|
won't work since it'll wait even though there is already data present
|
|
|
|
to work with. */
|
|
|
|
if(first &&
|
|
|
|
((fd_read != CURL_SOCKET_BAD) || (fd_write != CURL_SOCKET_BAD)))
|
|
|
|
/* if this is the first lap and one of the file descriptors is fine
|
|
|
|
to work with, skip the timeout */
|
|
|
|
timeout_ms = 0;
|
2010-03-03 00:20:22 +03:00
|
|
|
else {
|
|
|
|
if(data->set.timeout) {
|
2010-03-27 01:33:02 +03:00
|
|
|
totmp = (int)(data->set.timeout - Curl_tvdiff(k->now, k->start));
|
|
|
|
if(totmp < 0)
|
2010-03-03 00:20:22 +03:00
|
|
|
return CURLE_OPERATION_TIMEDOUT;
|
|
|
|
}
|
|
|
|
else
|
2010-03-27 01:33:02 +03:00
|
|
|
totmp = 1000;
|
|
|
|
|
|
|
|
if (totmp < timeout_ms)
|
|
|
|
timeout_ms = totmp;
|
2010-03-03 00:20:22 +03:00
|
|
|
}
|
2009-02-19 13:36:20 +03:00
|
|
|
|
|
|
|
switch (Curl_socket_ready(fd_read, fd_write, timeout_ms)) {
|
2007-03-11 12:11:29 +03:00
|
|
|
case -1: /* select() error, stop reading */
|
|
|
|
#ifdef EINTR
|
|
|
|
/* The EINTR is not serious, and it seems you might get this more
|
2008-08-09 00:37:54 +04:00
|
|
|
often when using the lib in a multi-threaded environment! */
|
2007-03-11 12:11:29 +03:00
|
|
|
if(SOCKERRNO == EINTR)
|
2008-10-08 03:15:02 +04:00
|
|
|
continue;
|
2007-03-11 12:11:29 +03:00
|
|
|
#endif
|
2008-10-08 03:15:02 +04:00
|
|
|
return CURLE_RECV_ERROR; /* indicate a network problem */
|
2007-03-11 12:11:29 +03:00
|
|
|
case 0: /* timeout */
|
|
|
|
default: /* readable descriptors */
|
2006-06-23 01:36:53 +04:00
|
|
|
|
2002-01-03 18:01:22 +03:00
|
|
|
result = Curl_readwrite(conn, &done);
|
2009-02-19 13:36:20 +03:00
|
|
|
/* "done" signals to us if the transfer(s) are ready */
|
2007-03-11 12:11:29 +03:00
|
|
|
break;
|
2007-03-10 15:11:21 +03:00
|
|
|
}
|
2007-03-11 12:11:29 +03:00
|
|
|
if(result)
|
|
|
|
return result;
|
|
|
|
|
2009-02-19 13:36:20 +03:00
|
|
|
first = FALSE; /* not the first lap anymore */
|
2002-01-03 18:01:22 +03:00
|
|
|
}
|
2000-05-22 18:09:31 +04:00
|
|
|
|
2002-01-03 18:01:22 +03:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2004-04-26 11:12:52 +04:00
|
|
|
/*
|
|
|
|
* Curl_pretransfer() is called immediately before a transfer starts.
|
|
|
|
*/
|
2002-01-03 18:01:22 +03:00
|
|
|
CURLcode Curl_pretransfer(struct SessionHandle *data)
|
|
|
|
{
|
2005-04-07 19:27:13 +04:00
|
|
|
CURLcode res;
|
2005-09-21 10:38:33 +04:00
|
|
|
if(!data->change.url) {
|
2008-08-09 00:37:54 +04:00
|
|
|
/* we can't do anything without URL */
|
2008-01-16 02:19:02 +03:00
|
|
|
failf(data, "No URL set!");
|
2001-04-11 18:14:28 +04:00
|
|
|
return CURLE_URL_MALFORMAT;
|
2005-09-21 10:38:33 +04:00
|
|
|
}
|
2001-04-11 18:14:28 +04:00
|
|
|
|
2005-04-07 19:27:13 +04:00
|
|
|
/* Init the SSL session ID cache here. We do it here since we want to do it
|
|
|
|
after the *_setopt() calls (that could change the size of the cache) but
|
|
|
|
before any transfer takes place. */
|
|
|
|
res = Curl_ssl_initsessions(data, data->set.ssl.numsessions);
|
|
|
|
if(res)
|
|
|
|
return res;
|
2001-08-28 12:37:54 +04:00
|
|
|
|
2001-08-31 02:48:34 +04:00
|
|
|
data->set.followlocation=0; /* reset the location-follow counter */
|
|
|
|
data->state.this_is_a_follow = FALSE; /* reset this */
|
2001-11-03 01:30:34 +03:00
|
|
|
data->state.errorbuf = FALSE; /* no error has occurred */
|
2008-09-05 21:58:53 +04:00
|
|
|
data->state.httpversion = 0; /* don't assume any particular server version */
|
2001-03-22 22:14:35 +03:00
|
|
|
|
2009-11-12 17:36:34 +03:00
|
|
|
data->state.ssl_connect_retry = FALSE;
|
|
|
|
|
2004-04-23 00:07:41 +04:00
|
|
|
data->state.authproblem = FALSE;
|
2004-05-04 11:52:53 +04:00
|
|
|
data->state.authhost.want = data->set.httpauth;
|
|
|
|
data->state.authproxy.want = data->set.proxyauth;
|
2008-10-09 02:01:23 +04:00
|
|
|
Curl_safefree(data->info.wouldredirect);
|
|
|
|
data->info.wouldredirect = NULL;
|
2003-06-26 15:30:26 +04:00
|
|
|
|
2005-08-17 12:55:43 +04:00
|
|
|
/* If there is a list of cookie files to read, do it now! */
|
2006-07-31 21:46:28 +04:00
|
|
|
if(data->change.cookielist) {
|
2005-08-17 12:55:43 +04:00
|
|
|
Curl_cookie_loadfiles(data);
|
2006-07-31 21:46:28 +04:00
|
|
|
}
|
2002-10-17 11:10:39 +04:00
|
|
|
|
2002-01-03 18:01:22 +03:00
|
|
|
/* Allow data->set.use_port to set which port to use. This needs to be
|
|
|
|
* disabled for example when we follow Location: headers to URLs using
|
|
|
|
* different ports! */
|
|
|
|
data->state.allow_port = TRUE;
|
|
|
|
|
2003-12-02 13:12:44 +03:00
|
|
|
#if defined(HAVE_SIGNAL) && defined(SIGPIPE) && !defined(HAVE_MSG_NOSIGNAL)
|
2001-11-07 17:13:29 +03:00
|
|
|
/*************************************************************
|
|
|
|
* Tell signal handler to ignore SIGPIPE
|
|
|
|
*************************************************************/
|
2002-08-09 02:52:50 +04:00
|
|
|
if(!data->set.no_signal)
|
|
|
|
data->state.prev_signal = signal(SIGPIPE, SIG_IGN);
|
2004-05-17 10:50:08 +04:00
|
|
|
#endif
|
2001-08-15 10:53:10 +04:00
|
|
|
|
2001-11-07 17:13:29 +03:00
|
|
|
Curl_initinfo(data); /* reset session-specific information "variables" */
|
2001-01-05 13:11:41 +03:00
|
|
|
Curl_pgrsStartNow(data);
|
2000-06-16 17:14:27 +04:00
|
|
|
|
2002-01-03 18:01:22 +03:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2004-04-26 11:12:52 +04:00
|
|
|
/*
|
|
|
|
* Curl_posttransfer() is called immediately after a transfer ends
|
|
|
|
*/
|
2002-01-03 18:01:22 +03:00
|
|
|
CURLcode Curl_posttransfer(struct SessionHandle *data)
|
|
|
|
{
|
2003-12-02 13:12:44 +03:00
|
|
|
#if defined(HAVE_SIGNAL) && defined(SIGPIPE) && !defined(HAVE_MSG_NOSIGNAL)
|
2002-01-03 18:01:22 +03:00
|
|
|
/* restore the signal handler for SIGPIPE before we get back */
|
2002-08-09 02:52:50 +04:00
|
|
|
if(!data->set.no_signal)
|
|
|
|
signal(SIGPIPE, data->state.prev_signal);
|
2003-12-02 16:40:12 +03:00
|
|
|
#else
|
|
|
|
(void)data; /* unused parameter */
|
2004-05-17 10:50:08 +04:00
|
|
|
#endif
|
2002-01-03 18:01:22 +03:00
|
|
|
|
2004-11-26 17:33:13 +03:00
|
|
|
if(!(data->progress.flags & PGRS_HIDE) &&
|
|
|
|
!data->progress.callback)
|
|
|
|
/* only output if we don't use a progress callback and we're not hidden */
|
|
|
|
fprintf(data->set.err, "\n");
|
|
|
|
|
2002-01-03 18:01:22 +03:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2008-10-10 23:10:44 +04:00
|
|
|
#ifndef CURL_DISABLE_HTTP
|
2004-04-26 11:12:52 +04:00
|
|
|
/*
|
|
|
|
* strlen_url() returns the length of the given URL if the spaces within the
|
|
|
|
* URL were properly URL encoded.
|
|
|
|
*/
|
2007-08-27 10:31:28 +04:00
|
|
|
static size_t strlen_url(const char *url)
|
2003-06-26 15:30:26 +04:00
|
|
|
{
|
2007-08-27 10:31:28 +04:00
|
|
|
const char *ptr;
|
|
|
|
size_t newlen=0;
|
2003-06-26 15:30:26 +04:00
|
|
|
bool left=TRUE; /* left side of the ? */
|
|
|
|
|
|
|
|
for(ptr=url; *ptr; ptr++) {
|
|
|
|
switch(*ptr) {
|
|
|
|
case '?':
|
|
|
|
left=FALSE;
|
2007-08-27 10:31:28 +04:00
|
|
|
/* fall through */
|
2003-06-26 15:30:26 +04:00
|
|
|
default:
|
|
|
|
newlen++;
|
|
|
|
break;
|
|
|
|
case ' ':
|
|
|
|
if(left)
|
|
|
|
newlen+=3;
|
|
|
|
else
|
|
|
|
newlen++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return newlen;
|
|
|
|
}
|
|
|
|
|
2004-04-26 11:12:52 +04:00
|
|
|
/* strcpy_url() copies a url to a output buffer and URL-encodes the spaces in
|
|
|
|
* the source URL accordingly.
|
|
|
|
*/
|
2007-08-27 10:31:28 +04:00
|
|
|
static void strcpy_url(char *output, const char *url)
|
2003-06-26 15:30:26 +04:00
|
|
|
{
|
|
|
|
/* we must add this with whitespace-replacing */
|
|
|
|
bool left=TRUE;
|
2007-08-27 10:31:28 +04:00
|
|
|
const char *iptr;
|
2003-06-26 15:30:26 +04:00
|
|
|
char *optr = output;
|
|
|
|
for(iptr = url; /* read from here */
|
|
|
|
*iptr; /* until zero byte */
|
|
|
|
iptr++) {
|
|
|
|
switch(*iptr) {
|
|
|
|
case '?':
|
|
|
|
left=FALSE;
|
2007-08-27 10:31:28 +04:00
|
|
|
/* fall through */
|
2003-06-26 15:30:26 +04:00
|
|
|
default:
|
|
|
|
*optr++=*iptr;
|
|
|
|
break;
|
|
|
|
case ' ':
|
|
|
|
if(left) {
|
|
|
|
*optr++='%'; /* add a '%' */
|
|
|
|
*optr++='2'; /* add a '2' */
|
|
|
|
*optr++='0'; /* add a '0' */
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*optr++='+'; /* add a '+' here */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*optr=0; /* zero terminate output buffer */
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/*
|
|
|
|
* Returns true if the given URL is absolute (as opposed to relative)
|
|
|
|
*/
|
|
|
|
static bool is_absolute_url(const char *url)
|
|
|
|
{
|
|
|
|
char prot[16]; /* URL protocol string storage */
|
|
|
|
char letter; /* used for a silly sscanf */
|
|
|
|
|
2008-09-08 23:34:58 +04:00
|
|
|
return (bool)(2 == sscanf(url, "%15[^?&/:]://%c", prot, &letter));
|
2008-08-09 00:37:54 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Concatenate a relative URL to a base URL making it absolute.
|
|
|
|
* URL-encodes any spaces.
|
|
|
|
* The returned pointer must be freed by the caller unless NULL
|
|
|
|
* (returns NULL on out of memory).
|
|
|
|
*/
|
|
|
|
static char *concat_url(const char *base, const char *relurl)
|
|
|
|
{
|
|
|
|
/***
|
|
|
|
TRY to append this new path to the old URL
|
|
|
|
to the right of the host part. Oh crap, this is doomed to cause
|
|
|
|
problems in the future...
|
|
|
|
*/
|
|
|
|
char *newest;
|
|
|
|
char *protsep;
|
|
|
|
char *pathsep;
|
|
|
|
size_t newlen;
|
|
|
|
|
|
|
|
const char *useurl = relurl;
|
|
|
|
size_t urllen;
|
|
|
|
|
|
|
|
/* we must make our own copy of the URL to play with, as it may
|
|
|
|
point to read-only data */
|
|
|
|
char *url_clone=strdup(base);
|
|
|
|
|
|
|
|
if(!url_clone)
|
|
|
|
return NULL; /* skip out of this NOW */
|
|
|
|
|
|
|
|
/* protsep points to the start of the host name */
|
|
|
|
protsep=strstr(url_clone, "//");
|
|
|
|
if(!protsep)
|
|
|
|
protsep=url_clone;
|
|
|
|
else
|
|
|
|
protsep+=2; /* pass the slashes */
|
|
|
|
|
|
|
|
if('/' != relurl[0]) {
|
|
|
|
int level=0;
|
|
|
|
|
|
|
|
/* First we need to find out if there's a ?-letter in the URL,
|
|
|
|
and cut it and the right-side of that off */
|
|
|
|
pathsep = strchr(protsep, '?');
|
|
|
|
if(pathsep)
|
|
|
|
*pathsep=0;
|
|
|
|
|
|
|
|
/* we have a relative path to append to the last slash if there's one
|
|
|
|
available, or if the new URL is just a query string (starts with a
|
|
|
|
'?') we append the new one at the end of the entire currently worked
|
|
|
|
out URL */
|
|
|
|
if(useurl[0] != '?') {
|
|
|
|
pathsep = strrchr(protsep, '/');
|
|
|
|
if(pathsep)
|
2009-02-27 11:53:10 +03:00
|
|
|
*pathsep=0;
|
2008-08-09 00:37:54 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Check if there's any slash after the host name, and if so, remember
|
|
|
|
that position instead */
|
|
|
|
pathsep = strchr(protsep, '/');
|
|
|
|
if(pathsep)
|
|
|
|
protsep = pathsep+1;
|
|
|
|
else
|
|
|
|
protsep = NULL;
|
|
|
|
|
|
|
|
/* now deal with one "./" or any amount of "../" in the newurl
|
|
|
|
and act accordingly */
|
|
|
|
|
|
|
|
if((useurl[0] == '.') && (useurl[1] == '/'))
|
|
|
|
useurl+=2; /* just skip the "./" */
|
|
|
|
|
|
|
|
while((useurl[0] == '.') &&
|
2009-02-27 11:53:10 +03:00
|
|
|
(useurl[1] == '.') &&
|
|
|
|
(useurl[2] == '/')) {
|
2008-08-09 00:37:54 +04:00
|
|
|
level++;
|
|
|
|
useurl+=3; /* pass the "../" */
|
|
|
|
}
|
|
|
|
|
|
|
|
if(protsep) {
|
|
|
|
while(level--) {
|
2009-02-27 11:53:10 +03:00
|
|
|
/* cut off one more level from the right of the original URL */
|
|
|
|
pathsep = strrchr(protsep, '/');
|
|
|
|
if(pathsep)
|
|
|
|
*pathsep=0;
|
|
|
|
else {
|
|
|
|
*protsep=0;
|
|
|
|
break;
|
|
|
|
}
|
2008-08-09 00:37:54 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* We got a new absolute path for this server, cut off from the
|
|
|
|
first slash */
|
|
|
|
pathsep = strchr(protsep, '/');
|
|
|
|
if(pathsep) {
|
|
|
|
/* When people use badly formatted URLs, such as
|
2009-02-27 11:53:10 +03:00
|
|
|
"http://www.url.com?dir=/home/daniel" we must not use the first
|
|
|
|
slash, if there's a ?-letter before it! */
|
2008-08-09 00:37:54 +04:00
|
|
|
char *sep = strchr(protsep, '?');
|
|
|
|
if(sep && (sep < pathsep))
|
2009-02-27 11:53:10 +03:00
|
|
|
pathsep = sep;
|
2008-08-09 00:37:54 +04:00
|
|
|
*pathsep=0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* There was no slash. Now, since we might be operating on a badly
|
2009-02-27 11:53:10 +03:00
|
|
|
formatted URL, such as "http://www.url.com?id=2380" which doesn't
|
|
|
|
use a slash separator as it is supposed to, we need to check for a
|
|
|
|
?-letter as well! */
|
2008-08-09 00:37:54 +04:00
|
|
|
pathsep = strchr(protsep, '?');
|
|
|
|
if(pathsep)
|
2009-02-27 11:53:10 +03:00
|
|
|
*pathsep=0;
|
2008-08-09 00:37:54 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If the new part contains a space, this is a mighty stupid redirect
|
|
|
|
but we still make an effort to do "right". To the left of a '?'
|
|
|
|
letter we replace each space with %20 while it is replaced with '+'
|
|
|
|
on the right side of the '?' letter.
|
|
|
|
*/
|
|
|
|
newlen = strlen_url(useurl);
|
|
|
|
|
|
|
|
urllen = strlen(url_clone);
|
|
|
|
|
2008-09-06 09:29:05 +04:00
|
|
|
newest = malloc( urllen + 1 + /* possible slash */
|
2009-02-27 11:53:10 +03:00
|
|
|
newlen + 1 /* zero byte */);
|
2008-08-09 00:37:54 +04:00
|
|
|
|
|
|
|
if(!newest) {
|
|
|
|
free(url_clone); /* don't leak this */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* copy over the root url part */
|
|
|
|
memcpy(newest, url_clone, urllen);
|
|
|
|
|
|
|
|
/* check if we need to append a slash */
|
|
|
|
if(('/' == useurl[0]) || (protsep && !*protsep) || ('?' == useurl[0]))
|
|
|
|
;
|
|
|
|
else
|
|
|
|
newest[urllen++]='/';
|
|
|
|
|
|
|
|
/* then append the new piece on the right side */
|
|
|
|
strcpy_url(&newest[urllen], useurl);
|
|
|
|
|
|
|
|
free(url_clone);
|
|
|
|
|
|
|
|
return newest;
|
|
|
|
}
|
2008-10-10 23:10:44 +04:00
|
|
|
#endif /* CURL_DISABLE_HTTP */
|
2008-08-09 00:37:54 +04:00
|
|
|
|
2004-04-26 11:12:52 +04:00
|
|
|
/*
|
|
|
|
* Curl_follow() handles the URL redirect magic. Pass in the 'newurl' string
|
|
|
|
* as given by the remote server and set up the new URL to request.
|
|
|
|
*/
|
2002-10-07 17:38:34 +04:00
|
|
|
CURLcode Curl_follow(struct SessionHandle *data,
|
2005-01-11 17:00:45 +03:00
|
|
|
char *newurl, /* this 'newurl' is the Location: string,
|
2002-10-07 17:38:34 +04:00
|
|
|
and it must be malloc()ed before passed
|
|
|
|
here */
|
2008-05-01 01:20:08 +04:00
|
|
|
followtype type) /* see transfer.h */
|
2002-10-07 17:38:34 +04:00
|
|
|
{
|
2008-10-10 02:14:38 +04:00
|
|
|
#ifdef CURL_DISABLE_HTTP
|
|
|
|
(void)data;
|
|
|
|
(void)newurl;
|
|
|
|
(void)type;
|
|
|
|
/* Location: following will not happen when HTTP is disabled */
|
|
|
|
return CURLE_TOO_MANY_REDIRECTS;
|
|
|
|
#else
|
|
|
|
|
2002-10-07 17:38:34 +04:00
|
|
|
/* Location: redirect */
|
2008-05-01 01:20:08 +04:00
|
|
|
bool disallowport = FALSE;
|
2004-05-17 10:50:08 +04:00
|
|
|
|
2008-05-01 01:20:08 +04:00
|
|
|
if(type == FOLLOW_REDIR) {
|
2007-11-05 12:45:09 +03:00
|
|
|
if((data->set.maxredirs != -1) &&
|
2006-01-30 11:20:52 +03:00
|
|
|
(data->set.followlocation >= data->set.maxredirs)) {
|
2010-01-28 18:34:18 +03:00
|
|
|
failf(data,"Maximum (%ld) redirects followed", data->set.maxredirs);
|
2006-01-30 11:20:52 +03:00
|
|
|
return CURLE_TOO_MANY_REDIRECTS;
|
|
|
|
}
|
2002-10-07 17:38:34 +04:00
|
|
|
|
2005-01-11 17:00:45 +03:00
|
|
|
/* mark the next request as a followed location: */
|
|
|
|
data->state.this_is_a_follow = TRUE;
|
2002-10-07 17:38:34 +04:00
|
|
|
|
2006-01-30 11:20:52 +03:00
|
|
|
data->set.followlocation++; /* count location-followers */
|
2002-10-07 17:38:34 +04:00
|
|
|
|
2008-05-01 01:20:08 +04:00
|
|
|
if(data->set.http_auto_referer) {
|
|
|
|
/* We are asked to automatically set the previous URL as the referer
|
|
|
|
when we get the next URL. We pick the ->url field, which may or may
|
|
|
|
not be 100% correct */
|
2002-10-07 17:38:34 +04:00
|
|
|
|
2008-05-01 01:20:08 +04:00
|
|
|
if(data->change.referer_alloc)
|
|
|
|
/* If we already have an allocated referer, free this first */
|
|
|
|
free(data->change.referer);
|
2002-10-07 17:38:34 +04:00
|
|
|
|
2008-05-01 01:20:08 +04:00
|
|
|
data->change.referer = strdup(data->change.url);
|
2008-08-27 01:28:57 +04:00
|
|
|
if (!data->change.referer) {
|
|
|
|
data->change.referer_alloc = FALSE;
|
|
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
}
|
2008-05-01 01:20:08 +04:00
|
|
|
data->change.referer_alloc = TRUE; /* yes, free this later */
|
|
|
|
}
|
2002-10-07 17:38:34 +04:00
|
|
|
}
|
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
if(!is_absolute_url(newurl)) {
|
2002-10-07 17:38:34 +04:00
|
|
|
/***
|
|
|
|
*DANG* this is an RFC 2068 violation. The URL is supposed
|
|
|
|
to be absolute and this doesn't seem to be that!
|
2008-08-09 00:37:54 +04:00
|
|
|
*/
|
|
|
|
char *absolute = concat_url(data->change.url, newurl);
|
|
|
|
if (!absolute)
|
|
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
free(newurl);
|
|
|
|
newurl = absolute;
|
2002-10-07 17:38:34 +04:00
|
|
|
}
|
2003-06-26 15:30:26 +04:00
|
|
|
else {
|
2002-10-07 17:38:34 +04:00
|
|
|
/* This is an absolute URL, don't allow the custom port number */
|
2008-05-01 01:20:08 +04:00
|
|
|
disallowport = TRUE;
|
2002-10-07 17:38:34 +04:00
|
|
|
|
2003-06-26 15:30:26 +04:00
|
|
|
if(strchr(newurl, ' ')) {
|
|
|
|
/* This new URL contains at least one space, this is a mighty stupid
|
|
|
|
redirect but we still make an effort to do "right". */
|
2008-08-09 00:37:54 +04:00
|
|
|
char *newest;
|
|
|
|
size_t newlen = strlen_url(newurl);
|
2003-06-26 15:30:26 +04:00
|
|
|
|
|
|
|
newest = malloc(newlen+1); /* get memory for this */
|
2008-08-09 00:37:54 +04:00
|
|
|
if (!newest)
|
2009-02-27 11:53:10 +03:00
|
|
|
return CURLE_OUT_OF_MEMORY;
|
2008-08-09 00:37:54 +04:00
|
|
|
strcpy_url(newest, newurl); /* create a space-free URL */
|
2003-06-26 15:30:26 +04:00
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
free(newurl); /* that was no good */
|
|
|
|
newurl = newest; /* use this instead now */
|
2003-06-26 15:30:26 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2008-05-01 01:20:08 +04:00
|
|
|
if(type == FOLLOW_FAKE) {
|
|
|
|
/* we're only figuring out the new url if we would've followed locations
|
|
|
|
but now we're done so we can get out! */
|
|
|
|
data->info.wouldredirect = newurl;
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(disallowport)
|
|
|
|
data->state.allow_port = FALSE;
|
|
|
|
|
2002-10-07 17:38:34 +04:00
|
|
|
if(data->change.url_alloc)
|
|
|
|
free(data->change.url);
|
|
|
|
else
|
|
|
|
data->change.url_alloc = TRUE; /* the URL is allocated */
|
2004-05-17 10:50:08 +04:00
|
|
|
|
2002-10-07 17:38:34 +04:00
|
|
|
data->change.url = newurl;
|
|
|
|
newurl = NULL; /* don't free! */
|
|
|
|
|
2003-05-23 02:39:38 +04:00
|
|
|
infof(data, "Issue another request to this URL: '%s'\n", data->change.url);
|
2002-10-07 17:38:34 +04:00
|
|
|
|
|
|
|
/*
|
2003-06-12 21:40:56 +04:00
|
|
|
* We get here when the HTTP code is 300-399 (and 401). We need to perform
|
2002-10-07 17:38:34 +04:00
|
|
|
* differently based on exactly what return code there was.
|
2003-05-22 20:09:54 +04:00
|
|
|
*
|
2004-05-05 10:57:26 +04:00
|
|
|
* News from 7.10.6: we can also get here on a 401 or 407, in case we act on
|
|
|
|
* a HTTP (proxy-) authentication scheme other than Basic.
|
2002-10-07 17:38:34 +04:00
|
|
|
*/
|
|
|
|
switch(data->info.httpcode) {
|
2008-01-10 12:16:21 +03:00
|
|
|
/* 401 - Act on a WWW-Authenticate, we keep on moving and do the
|
2004-05-05 10:57:26 +04:00
|
|
|
Authorization: XXXX header in the HTTP request code snippet */
|
2008-01-10 12:16:21 +03:00
|
|
|
/* 407 - Act on a Proxy-Authenticate, we keep on moving and do the
|
2004-05-05 10:57:26 +04:00
|
|
|
Proxy-Authorization: XXXX header in the HTTP request code snippet */
|
|
|
|
/* 300 - Multiple Choices */
|
|
|
|
/* 306 - Not used */
|
|
|
|
/* 307 - Temporary Redirect */
|
|
|
|
default: /* for all above (and the unknown ones) */
|
|
|
|
/* Some codes are explicitly mentioned since I've checked RFC2616 and they
|
2002-10-07 17:38:34 +04:00
|
|
|
* seem to be OK to POST to.
|
|
|
|
*/
|
|
|
|
break;
|
|
|
|
case 301: /* Moved Permanently */
|
|
|
|
/* (quote from RFC2616, section 10.3.2):
|
2004-05-17 10:50:08 +04:00
|
|
|
*
|
2004-05-05 10:57:26 +04:00
|
|
|
* Note: When automatically redirecting a POST request after receiving a
|
|
|
|
* 301 status code, some existing HTTP/1.0 user agents will erroneously
|
|
|
|
* change it into a GET request.
|
2002-10-07 17:38:34 +04:00
|
|
|
*
|
|
|
|
* ----
|
2004-05-05 10:57:26 +04:00
|
|
|
*
|
|
|
|
* Warning: Because most of importants user agents do this obvious RFC2616
|
|
|
|
* violation, many webservers expect this misbehavior. So these servers
|
|
|
|
* often answers to a POST request with an error page. To be sure that
|
|
|
|
* libcurl gets the page that most user agents would get, libcurl has to
|
2007-09-26 16:44:59 +04:00
|
|
|
* force GET.
|
|
|
|
*
|
2008-09-05 20:13:20 +04:00
|
|
|
* This behaviour can be overridden with CURLOPT_POSTREDIR.
|
2002-10-07 17:38:34 +04:00
|
|
|
*/
|
2007-09-26 16:44:59 +04:00
|
|
|
if( (data->set.httpreq == HTTPREQ_POST
|
|
|
|
|| data->set.httpreq == HTTPREQ_POST_FORM)
|
|
|
|
&& !data->set.post301) {
|
2002-10-07 17:38:34 +04:00
|
|
|
infof(data,
|
|
|
|
"Violate RFC 2616/10.3.2 and switch from POST to GET\n");
|
|
|
|
data->set.httpreq = HTTPREQ_GET;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 302: /* Found */
|
|
|
|
/* (From 10.3.3)
|
2004-05-17 10:50:08 +04:00
|
|
|
|
2002-10-07 17:38:34 +04:00
|
|
|
Note: RFC 1945 and RFC 2068 specify that the client is not allowed
|
|
|
|
to change the method on the redirected request. However, most
|
|
|
|
existing user agent implementations treat 302 as if it were a 303
|
|
|
|
response, performing a GET on the Location field-value regardless
|
|
|
|
of the original request method. The status codes 303 and 307 have
|
|
|
|
been added for servers that wish to make unambiguously clear which
|
|
|
|
kind of reaction is expected of the client.
|
2004-05-17 10:50:08 +04:00
|
|
|
|
2002-10-07 17:38:34 +04:00
|
|
|
(From 10.3.4)
|
2004-05-17 10:50:08 +04:00
|
|
|
|
2002-10-07 17:38:34 +04:00
|
|
|
Note: Many pre-HTTP/1.1 user agents do not understand the 303
|
|
|
|
status. When interoperability with such clients is a concern, the
|
|
|
|
302 status code may be used instead, since most user agents react
|
2004-05-17 10:50:08 +04:00
|
|
|
to a 302 response as described here for 303.
|
2008-09-05 20:13:20 +04:00
|
|
|
|
|
|
|
This behaviour can be overriden with CURLOPT_POSTREDIR
|
2002-10-07 17:38:34 +04:00
|
|
|
*/
|
2008-09-05 20:13:20 +04:00
|
|
|
if( (data->set.httpreq == HTTPREQ_POST
|
|
|
|
|| data->set.httpreq == HTTPREQ_POST_FORM)
|
|
|
|
&& !data->set.post302) {
|
|
|
|
infof(data,
|
|
|
|
"Violate RFC 2616/10.3.3 and switch from POST to GET\n");
|
|
|
|
data->set.httpreq = HTTPREQ_GET;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2002-10-07 17:38:34 +04:00
|
|
|
case 303: /* See Other */
|
|
|
|
/* Disable both types of POSTs, since doing a second POST when
|
|
|
|
* following isn't what anyone would want! */
|
|
|
|
if(data->set.httpreq != HTTPREQ_GET) {
|
|
|
|
data->set.httpreq = HTTPREQ_GET; /* enforce GET request */
|
|
|
|
infof(data, "Disables POST, goes with %s\n",
|
2004-04-06 19:14:10 +04:00
|
|
|
data->set.opt_no_body?"HEAD":"GET");
|
2002-10-07 17:38:34 +04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 304: /* Not Modified */
|
|
|
|
/* 304 means we did a conditional request and it was "Not modified".
|
|
|
|
* We shouldn't get any Location: header in this response!
|
|
|
|
*/
|
|
|
|
break;
|
|
|
|
case 305: /* Use Proxy */
|
|
|
|
/* (quote from RFC2616, section 10.3.6):
|
|
|
|
* "The requested resource MUST be accessed through the proxy given
|
|
|
|
* by the Location field. The Location field gives the URI of the
|
|
|
|
* proxy. The recipient is expected to repeat this single request
|
|
|
|
* via the proxy. 305 responses MUST only be generated by origin
|
|
|
|
* servers."
|
|
|
|
*/
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
Curl_pgrsTime(data, TIMER_REDIRECT);
|
|
|
|
Curl_pgrsResetTimes(data);
|
|
|
|
|
|
|
|
return CURLE_OK;
|
2008-10-10 02:14:38 +04:00
|
|
|
#endif /* CURL_DISABLE_HTTP */
|
2002-10-07 17:38:34 +04:00
|
|
|
}
|
|
|
|
|
2004-06-03 15:41:05 +04:00
|
|
|
static CURLcode
|
2007-12-09 01:50:55 +03:00
|
|
|
connect_host(struct SessionHandle *data,
|
|
|
|
struct connectdata **conn)
|
2004-06-03 15:41:05 +04:00
|
|
|
{
|
|
|
|
CURLcode res = CURLE_OK;
|
|
|
|
|
2008-02-20 11:28:02 +03:00
|
|
|
bool async;
|
|
|
|
bool protocol_done=TRUE; /* will be TRUE always since this is only used
|
2005-02-09 16:06:40 +03:00
|
|
|
within the easy interface */
|
2008-02-20 11:28:02 +03:00
|
|
|
Curl_pgrsTime(data, TIMER_STARTSINGLE);
|
|
|
|
res = Curl_connect(data, conn, &async, &protocol_done);
|
|
|
|
|
|
|
|
if((CURLE_OK == res) && async) {
|
|
|
|
/* Now, if async is TRUE here, we need to wait for the name
|
|
|
|
to resolve */
|
|
|
|
res = Curl_wait_for_resolv(*conn, NULL);
|
|
|
|
if(CURLE_OK == res)
|
|
|
|
/* Resolved, continue with the connection */
|
|
|
|
res = Curl_async_resolved(*conn, &protocol_done);
|
|
|
|
else
|
|
|
|
/* if we can't resolve, we kill this "connection" now */
|
|
|
|
(void)Curl_disconnect(*conn);
|
|
|
|
}
|
2004-06-03 15:41:05 +04:00
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2009-08-21 11:11:20 +04:00
|
|
|
CURLcode
|
|
|
|
Curl_reconnect_request(struct connectdata **connp)
|
|
|
|
{
|
|
|
|
CURLcode result = CURLE_OK;
|
|
|
|
struct connectdata *conn = *connp;
|
|
|
|
struct SessionHandle *data = conn->data;
|
|
|
|
|
|
|
|
/* This was a re-use of a connection and we got a write error in the
|
|
|
|
* DO-phase. Then we DISCONNECT this connection and have another attempt to
|
|
|
|
* CONNECT and then DO again! The retry cannot possibly find another
|
|
|
|
* connection to re-use, since we only keep one possible connection for
|
|
|
|
* each. */
|
|
|
|
|
|
|
|
infof(data, "Re-used connection seems dead, get a new one\n");
|
|
|
|
|
|
|
|
conn->bits.close = TRUE; /* enforce close of this connection */
|
|
|
|
result = Curl_done(&conn, result, FALSE); /* we are so done with this */
|
|
|
|
|
|
|
|
/* conn may no longer be a good pointer */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* According to bug report #1330310. We need to check for CURLE_SEND_ERROR
|
|
|
|
* here as well. I figure this could happen when the request failed on a FTP
|
|
|
|
* connection and thus Curl_done() itself tried to use the connection
|
|
|
|
* (again). Slight Lack of feedback in the report, but I don't think this
|
|
|
|
* extra check can do much harm.
|
|
|
|
*/
|
|
|
|
if((CURLE_OK == result) || (CURLE_SEND_ERROR == result)) {
|
|
|
|
bool async;
|
|
|
|
bool protocol_done = TRUE;
|
|
|
|
|
|
|
|
/* Now, redo the connect and get a new connection */
|
|
|
|
result = Curl_connect(data, connp, &async, &protocol_done);
|
|
|
|
if(CURLE_OK == result) {
|
|
|
|
/* We have connected or sent away a name resolve query fine */
|
|
|
|
|
|
|
|
conn = *connp; /* setup conn to again point to something nice */
|
|
|
|
if(async) {
|
|
|
|
/* Now, if async is TRUE here, we need to wait for the name
|
|
|
|
to resolve */
|
|
|
|
result = Curl_wait_for_resolv(conn, NULL);
|
|
|
|
if(result)
|
|
|
|
return result;
|
|
|
|
|
|
|
|
/* Resolved, continue with the connection */
|
|
|
|
result = Curl_async_resolved(conn, &protocol_done);
|
|
|
|
if(result)
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2009-08-21 16:01:36 +04:00
|
|
|
/* Returns CURLE_OK *and* sets '*url' if a request retry is wanted.
|
2008-05-01 01:20:08 +04:00
|
|
|
|
|
|
|
NOTE: that the *url is malloc()ed. */
|
2009-08-21 16:01:36 +04:00
|
|
|
CURLcode Curl_retry_request(struct connectdata *conn,
|
|
|
|
char **url)
|
2005-01-30 01:31:06 +03:00
|
|
|
{
|
2006-09-08 01:49:20 +04:00
|
|
|
struct SessionHandle *data = conn->data;
|
2004-06-03 15:41:05 +04:00
|
|
|
|
2009-08-21 16:01:36 +04:00
|
|
|
*url = NULL;
|
|
|
|
|
2007-09-12 02:21:12 +04:00
|
|
|
/* if we're talking upload, we can't do the checks below, unless the protocol
|
|
|
|
is HTTP as when uploading over HTTP we will still get a response */
|
2010-01-21 16:58:30 +03:00
|
|
|
if(data->set.upload && !(conn->protocol&(PROT_HTTP|PROT_RTSP)))
|
2009-08-21 16:01:36 +04:00
|
|
|
return CURLE_OK;
|
2007-09-12 02:21:12 +04:00
|
|
|
|
2009-11-12 14:16:31 +03:00
|
|
|
if(/* workaround for broken TLS servers */ data->state.ssl_connect_retry ||
|
|
|
|
((data->req.bytecount +
|
2010-01-21 16:58:30 +03:00
|
|
|
data->req.headerbytecount == 0) &&
|
|
|
|
conn->bits.reuse &&
|
|
|
|
!data->set.opt_no_body &&
|
|
|
|
data->set.rtspreq != RTSPREQ_RECEIVE)) {
|
2006-02-08 02:09:04 +03:00
|
|
|
/* We got no data, we attempted to re-use a connection and yet we want a
|
|
|
|
"body". This might happen if the connection was left alive when we were
|
|
|
|
done using it before, but that was closed when we wanted to read from
|
|
|
|
it again. Bad luck. Retry the same request on a fresh connect! */
|
2005-01-30 01:31:06 +03:00
|
|
|
infof(conn->data, "Connection died, retrying a fresh connect\n");
|
|
|
|
*url = strdup(conn->data->change.url);
|
2009-08-21 16:01:36 +04:00
|
|
|
if(!*url)
|
|
|
|
return CURLE_OUT_OF_MEMORY;
|
2005-01-30 01:31:06 +03:00
|
|
|
|
|
|
|
conn->bits.close = TRUE; /* close this connection */
|
|
|
|
conn->bits.retry = TRUE; /* mark this as a connection we're about
|
|
|
|
to retry. Marking it this way should
|
|
|
|
prevent i.e HTTP transfers to return
|
|
|
|
error just because nothing has been
|
|
|
|
transfered! */
|
|
|
|
}
|
2009-08-21 16:01:36 +04:00
|
|
|
return CURLE_OK;
|
2005-01-30 01:31:06 +03:00
|
|
|
}
|
2004-06-03 15:41:05 +04:00
|
|
|
|
2004-04-26 11:12:52 +04:00
|
|
|
/*
|
|
|
|
* Curl_perform() is the internal high-level function that gets called by the
|
|
|
|
* external curl_easy_perform() function. It inits, performs and cleans up a
|
|
|
|
* single file transfer.
|
|
|
|
*/
|
2002-01-03 18:01:22 +03:00
|
|
|
CURLcode Curl_perform(struct SessionHandle *data)
|
|
|
|
{
|
|
|
|
CURLcode res;
|
|
|
|
CURLcode res2;
|
|
|
|
struct connectdata *conn=NULL;
|
|
|
|
char *newurl = NULL; /* possibly a new URL to follow to! */
|
2008-05-06 08:37:06 +04:00
|
|
|
followtype follow = FOLLOW_NONE;
|
2002-01-03 18:01:22 +03:00
|
|
|
|
2002-08-05 21:04:39 +04:00
|
|
|
data->state.used_interface = Curl_if_easy;
|
|
|
|
|
2002-01-03 18:01:22 +03:00
|
|
|
res = Curl_pretransfer(data);
|
|
|
|
if(res)
|
|
|
|
return res;
|
|
|
|
|
2001-11-07 17:13:29 +03:00
|
|
|
/*
|
2002-09-23 16:55:36 +04:00
|
|
|
* It is important that there is NO 'return' from this function at any other
|
|
|
|
* place than falling down to the end of the function! This is because we
|
|
|
|
* have cleanup stuff that must be done before we get back, and that is only
|
|
|
|
* performed after this do-while loop.
|
2001-11-07 17:13:29 +03:00
|
|
|
*/
|
|
|
|
|
2010-02-02 19:25:07 +03:00
|
|
|
for(;;) {
|
2007-12-09 01:50:55 +03:00
|
|
|
res = connect_host(data, &conn); /* primary connection */
|
2004-06-03 15:41:05 +04:00
|
|
|
|
2000-05-22 18:09:31 +04:00
|
|
|
if(res == CURLE_OK) {
|
2005-02-09 16:06:40 +03:00
|
|
|
bool do_done;
|
2006-02-12 01:35:16 +03:00
|
|
|
if(data->set.connect_only) {
|
|
|
|
/* keep connection open for application to use the socket */
|
|
|
|
conn->bits.close = FALSE;
|
2007-01-17 01:22:10 +03:00
|
|
|
res = Curl_done(&conn, CURLE_OK, FALSE);
|
2006-02-12 01:35:16 +03:00
|
|
|
break;
|
|
|
|
}
|
2005-02-09 16:06:40 +03:00
|
|
|
res = Curl_do(&conn, &do_done);
|
2001-10-31 18:13:19 +03:00
|
|
|
|
2006-10-01 00:31:11 +04:00
|
|
|
if(res == CURLE_OK) {
|
2001-03-09 18:16:28 +03:00
|
|
|
res = Transfer(conn); /* now fetch that URL please */
|
2008-10-08 03:15:02 +04:00
|
|
|
if((res == CURLE_OK) || (res == CURLE_RECV_ERROR)) {
|
2009-08-21 16:01:36 +04:00
|
|
|
bool retry = FALSE;
|
|
|
|
CURLcode rc = Curl_retry_request(conn, &newurl);
|
|
|
|
if(rc)
|
|
|
|
res = rc;
|
|
|
|
else
|
2010-02-03 09:44:18 +03:00
|
|
|
retry = (bool)(newurl?TRUE:FALSE);
|
2004-01-30 15:08:18 +03:00
|
|
|
|
2008-07-10 22:15:22 +04:00
|
|
|
if(retry) {
|
2008-10-08 03:15:02 +04:00
|
|
|
res = CURLE_OK;
|
2008-05-01 01:20:08 +04:00
|
|
|
follow = FOLLOW_RETRY;
|
2008-07-10 22:15:22 +04:00
|
|
|
if (!newurl)
|
|
|
|
res = CURLE_OUT_OF_MEMORY;
|
|
|
|
}
|
2008-10-08 03:15:02 +04:00
|
|
|
else if (res == CURLE_OK) {
|
2004-01-30 15:08:18 +03:00
|
|
|
/*
|
2005-01-30 01:31:06 +03:00
|
|
|
* We must duplicate the new URL here as the connection data may
|
2008-05-01 01:20:08 +04:00
|
|
|
* be free()ed in the Curl_done() function. We prefer the newurl
|
|
|
|
* one since that's used for redirects or just further requests
|
|
|
|
* for retries or multi-stage HTTP auth methods etc.
|
2004-01-30 15:08:18 +03:00
|
|
|
*/
|
2008-05-01 01:20:08 +04:00
|
|
|
if(data->req.newurl) {
|
|
|
|
follow = FOLLOW_REDIR;
|
|
|
|
newurl = strdup(data->req.newurl);
|
2008-07-09 22:33:35 +04:00
|
|
|
if (!newurl)
|
|
|
|
res = CURLE_OUT_OF_MEMORY;
|
2008-05-01 01:20:08 +04:00
|
|
|
}
|
|
|
|
else if(data->req.location) {
|
|
|
|
follow = FOLLOW_FAKE;
|
|
|
|
newurl = strdup(data->req.location);
|
2008-07-09 22:33:35 +04:00
|
|
|
if (!newurl)
|
|
|
|
res = CURLE_OUT_OF_MEMORY;
|
2008-05-01 01:20:08 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* in the above cases where 'newurl' gets assigned, we have a fresh
|
|
|
|
* allocated memory pointed to */
|
2004-01-30 15:08:18 +03:00
|
|
|
}
|
2008-07-09 22:33:35 +04:00
|
|
|
if(res != CURLE_OK) {
|
2001-10-22 10:34:14 +04:00
|
|
|
/* The transfer phase returned error, we mark the connection to get
|
2008-08-09 00:37:54 +04:00
|
|
|
* closed to prevent being re-used. This is because we can't
|
2001-10-22 10:34:14 +04:00
|
|
|
* possibly know if the connection is in a good shape or not now. */
|
|
|
|
conn->bits.close = TRUE;
|
2001-04-03 17:37:53 +04:00
|
|
|
|
2004-03-11 16:13:35 +03:00
|
|
|
if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET]) {
|
2002-06-13 02:04:25 +04:00
|
|
|
/* if we failed anywhere, we must clean up the secondary socket if
|
|
|
|
it was used */
|
2003-11-24 10:15:37 +03:00
|
|
|
sclose(conn->sock[SECONDARYSOCKET]);
|
2004-03-11 16:13:35 +03:00
|
|
|
conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD;
|
2002-06-13 02:04:25 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-10-17 16:24:51 +04:00
|
|
|
/* Always run Curl_done(), even if some of the previous calls
|
|
|
|
failed, but return the previous (original) error code */
|
2007-01-17 01:22:10 +03:00
|
|
|
res2 = Curl_done(&conn, res, FALSE);
|
2001-10-17 16:24:51 +04:00
|
|
|
|
|
|
|
if(CURLE_OK == res)
|
|
|
|
res = res2;
|
2000-05-22 18:09:31 +04:00
|
|
|
}
|
2008-02-21 20:52:16 +03:00
|
|
|
else if(conn)
|
|
|
|
/* Curl_do() failed, clean up left-overs in the done-call, but note
|
|
|
|
that at some cases the conn pointer is NULL when Curl_do() failed
|
|
|
|
and the connection cache is very small so only call Curl_done() if
|
2010-04-17 01:27:35 +04:00
|
|
|
conn is still "alive". */
|
|
|
|
/* ignore return code since we already have an error to return */
|
|
|
|
(void)Curl_done(&conn, res, FALSE);
|
2000-05-22 18:09:31 +04:00
|
|
|
|
2001-04-03 17:37:53 +04:00
|
|
|
/*
|
|
|
|
* Important: 'conn' cannot be used here, since it may have been closed
|
|
|
|
* in 'Curl_done' or other functions.
|
|
|
|
*/
|
|
|
|
|
2008-05-01 01:20:08 +04:00
|
|
|
if((res == CURLE_OK) && follow) {
|
|
|
|
res = Curl_follow(data, newurl, follow);
|
2002-10-07 17:38:34 +04:00
|
|
|
if(CURLE_OK == res) {
|
2008-05-01 01:20:08 +04:00
|
|
|
/* if things went fine, Curl_follow() freed or otherwise took
|
|
|
|
responsibility for the newurl pointer */
|
2002-10-07 17:38:34 +04:00
|
|
|
newurl = NULL;
|
2008-05-01 01:20:08 +04:00
|
|
|
if(follow >= FOLLOW_RETRY) {
|
|
|
|
follow = FOLLOW_NONE;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/* else we break out of the loop below */
|
2001-01-27 23:31:51 +03:00
|
|
|
}
|
2000-05-22 18:09:31 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break; /* it only reaches here when this shouldn't loop */
|
|
|
|
|
2010-02-02 19:25:07 +03:00
|
|
|
} /* loop if Location: */
|
2000-05-22 18:09:31 +04:00
|
|
|
|
2001-04-03 17:37:53 +04:00
|
|
|
if(newurl)
|
|
|
|
free(newurl);
|
2000-05-22 18:09:31 +04:00
|
|
|
|
2005-11-17 17:29:54 +03:00
|
|
|
if(res && !data->state.errorbuf) {
|
|
|
|
/*
|
|
|
|
* As an extra precaution: if no error string has been set and there was
|
|
|
|
* an error, use the strerror() string or if things are so bad that not
|
|
|
|
* even that is good, set a bad string that mentions the error code.
|
|
|
|
*/
|
2005-11-18 10:23:50 +03:00
|
|
|
const char *str = curl_easy_strerror(res);
|
2005-11-17 17:29:54 +03:00
|
|
|
if(!str)
|
|
|
|
failf(data, "unspecified error %d", (int)res);
|
|
|
|
else
|
|
|
|
failf(data, "%s", str);
|
|
|
|
}
|
|
|
|
|
2008-08-09 00:37:54 +04:00
|
|
|
/* run post-transfer unconditionally, but don't clobber the return code if
|
2002-01-03 18:01:22 +03:00
|
|
|
we already have an error code recorder */
|
|
|
|
res2 = Curl_posttransfer(data);
|
|
|
|
if(!res && res2)
|
|
|
|
res = res2;
|
2001-11-07 17:13:29 +03:00
|
|
|
|
2000-05-22 18:09:31 +04:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2004-04-26 11:12:52 +04:00
|
|
|
/*
|
2006-11-25 12:49:29 +03:00
|
|
|
* Curl_setup_transfer() is called to setup some basic properties for the
|
|
|
|
* upcoming transfer.
|
2004-04-26 11:12:52 +04:00
|
|
|
*/
|
2010-04-17 01:43:04 +04:00
|
|
|
void
|
2006-09-08 01:49:20 +04:00
|
|
|
Curl_setup_transfer(
|
2007-11-16 00:45:45 +03:00
|
|
|
struct connectdata *conn, /* connection 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 or NULL */
|
|
|
|
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 or NULL */
|
|
|
|
)
|
2001-01-17 16:19:01 +03:00
|
|
|
{
|
2007-03-31 00:54:32 +04:00
|
|
|
struct SessionHandle *data;
|
2007-11-25 02:16:55 +03:00
|
|
|
struct SingleRequest *k;
|
2006-09-08 01:49:20 +04:00
|
|
|
|
2007-11-16 00:45:45 +03:00
|
|
|
DEBUGASSERT(conn != NULL);
|
2001-01-17 16:19:01 +03:00
|
|
|
|
2007-03-31 00:54:32 +04:00
|
|
|
data = conn->data;
|
2007-11-25 02:16:55 +03:00
|
|
|
k = &data->req;
|
2007-03-31 00:54:32 +04:00
|
|
|
|
2007-02-21 22:03:20 +03:00
|
|
|
DEBUGASSERT((sockindex <= 1) && (sockindex >= -1));
|
2003-12-10 18:27:27 +03:00
|
|
|
|
2001-01-17 16:19:01 +03:00
|
|
|
/* now copy all input parameters */
|
2006-09-08 01:49:20 +04:00
|
|
|
conn->sockfd = sockindex == -1 ?
|
|
|
|
CURL_SOCKET_BAD : conn->sock[sockindex];
|
|
|
|
conn->writesockfd = writesockindex == -1 ?
|
|
|
|
CURL_SOCKET_BAD:conn->sock[writesockindex];
|
2008-01-31 15:04:33 +03:00
|
|
|
k->getheader = getheader;
|
2001-01-17 16:19:01 +03:00
|
|
|
|
2007-11-25 02:16:55 +03:00
|
|
|
k->size = size;
|
|
|
|
k->bytecountp = bytecountp;
|
|
|
|
k->writebytecountp = writecountp;
|
2001-01-17 16:19:01 +03:00
|
|
|
|
2007-11-16 00:45:45 +03:00
|
|
|
/* The code sequence below is placed in this function just because all
|
|
|
|
necessary input is not always known in do_complete() as this function may
|
|
|
|
be called after that */
|
|
|
|
|
2008-01-31 15:04:33 +03:00
|
|
|
if(!k->getheader) {
|
2007-11-16 00:45:45 +03:00
|
|
|
k->header = FALSE;
|
2007-11-25 02:16:55 +03:00
|
|
|
if(size > 0)
|
|
|
|
Curl_pgrsSetDownloadSize(data, size);
|
2007-11-16 00:45:45 +03:00
|
|
|
}
|
|
|
|
/* we want header and/or body, if neither then don't do this! */
|
2008-01-31 15:04:33 +03:00
|
|
|
if(k->getheader || !data->set.opt_no_body) {
|
2007-11-16 00:45:45 +03:00
|
|
|
|
2010-04-17 01:43:04 +04:00
|
|
|
if(conn->sockfd != CURL_SOCKET_BAD)
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon |= KEEP_RECV;
|
2007-11-16 00:45:45 +03:00
|
|
|
|
|
|
|
if(conn->writesockfd != CURL_SOCKET_BAD) {
|
|
|
|
/* HTTP 1.1 magic:
|
|
|
|
|
|
|
|
Even if we require a 100-return code before uploading data, we might
|
|
|
|
need to write data before that since the REQUEST may not have been
|
|
|
|
finished sent off just yet.
|
|
|
|
|
|
|
|
Thus, we must check if the request has been sent before we set the
|
|
|
|
state info where we wait for the 100-return code
|
|
|
|
*/
|
2008-03-13 23:56:13 +03:00
|
|
|
if((data->state.expect100header) &&
|
|
|
|
(data->state.proto.http->sending == HTTPSEND_BODY)) {
|
2007-11-16 00:45:45 +03:00
|
|
|
/* wait with write until we either got 100-continue or a timeout */
|
2008-03-13 23:56:13 +03:00
|
|
|
k->exp100 = EXP100_AWAITING_CONTINUE;
|
2007-11-16 00:45:45 +03:00
|
|
|
k->start100 = k->start;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if(data->state.expect100header)
|
|
|
|
/* when we've sent off the rest of the headers, we must await a
|
2008-03-13 23:56:13 +03:00
|
|
|
100-continue but first finish sending the request */
|
|
|
|
k->exp100 = EXP100_SENDING_REQUEST;
|
|
|
|
|
|
|
|
/* enable the write bit when we're not waiting for continue */
|
2009-05-11 11:53:38 +04:00
|
|
|
k->keepon |= KEEP_SEND;
|
2007-11-16 00:45:45 +03:00
|
|
|
}
|
2008-03-13 23:56:13 +03:00
|
|
|
} /* if(conn->writesockfd != CURL_SOCKET_BAD) */
|
|
|
|
} /* if(k->getheader || !data->set.opt_no_body) */
|
2007-11-16 00:45:45 +03:00
|
|
|
|
2001-01-17 16:19:01 +03:00
|
|
|
}
|