2002-09-03 13:52:59 +02:00
|
|
|
/***************************************************************************
|
1999-12-29 15:20:26 +01:00
|
|
|
* _ _ ____ _
|
|
|
|
* Project ___| | | | _ \| |
|
|
|
|
* / __| | | | |_) | |
|
|
|
|
* | (__| |_| | _ <| |___
|
|
|
|
* \___|\___/|_| \_\_____|
|
|
|
|
*
|
2002-03-19 08:54:55 +01:00
|
|
|
* Copyright (C) 1998 - 2002, Daniel Stenberg, <daniel@haxx.se>, et al.
|
1999-12-29 15:20:26 +01:00
|
|
|
*
|
2002-09-03 13:52:59 +02: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.
|
|
|
|
*
|
2001-01-03 10:29:33 +01: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 13:52:59 +02:00
|
|
|
* furnished to do so, under the terms of the COPYING file.
|
1999-12-29 15:20:26 +01:00
|
|
|
*
|
2001-01-03 10:29:33 +01:00
|
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
|
|
* KIND, either express or implied.
|
1999-12-29 15:20:26 +01:00
|
|
|
*
|
2001-01-03 10:29:33 +01:00
|
|
|
* $Id$
|
2002-09-03 13:52:59 +02:00
|
|
|
***************************************************************************/
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2000-08-24 16:26:33 +02:00
|
|
|
#include "setup.h"
|
|
|
|
|
2002-06-11 13:13:01 +02:00
|
|
|
#ifndef CURL_DISABLE_HTTP
|
1999-12-29 15:20:26 +01:00
|
|
|
/* -- WIN32 approved -- */
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
|
|
|
#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
|
|
|
|
#include <winsock.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <io.h>
|
|
|
|
#else
|
|
|
|
#ifdef HAVE_SYS_SOCKET_H
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#endif
|
2000-08-23 09:23:42 +02:00
|
|
|
#ifdef HAVE_NETINET_IN_H
|
1999-12-29 15:20:26 +01:00
|
|
|
#include <netinet/in.h>
|
2000-08-23 09:23:42 +02:00
|
|
|
#endif
|
1999-12-29 15:20:26 +01:00
|
|
|
#include <sys/time.h>
|
2000-07-30 00:21:10 +02:00
|
|
|
|
2000-08-01 00:42:34 +02:00
|
|
|
#ifdef HAVE_TIME_H
|
|
|
|
#ifdef TIME_WITH_SYS_TIME
|
|
|
|
#include <time.h>
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
1999-12-29 15:20:26 +01:00
|
|
|
#include <sys/resource.h>
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
|
|
|
#include <netdb.h>
|
|
|
|
#ifdef HAVE_ARPA_INET_H
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_NET_IF_H
|
|
|
|
#include <net/if.h>
|
|
|
|
#endif
|
|
|
|
#include <sys/ioctl.h>
|
|
|
|
#include <signal.h>
|
|
|
|
|
|
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
|
|
#include <sys/param.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_SYS_SELECT_H
|
|
|
|
#include <sys/select.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "urldata.h"
|
|
|
|
#include <curl/curl.h>
|
2001-01-17 14:23:01 +01:00
|
|
|
#include "transfer.h"
|
1999-12-29 15:20:26 +01:00
|
|
|
#include "sendf.h"
|
|
|
|
#include "formdata.h"
|
|
|
|
#include "progress.h"
|
|
|
|
#include "base64.h"
|
|
|
|
#include "cookie.h"
|
2000-05-22 16:12:12 +02:00
|
|
|
#include "strequal.h"
|
|
|
|
#include "ssluse.h"
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
#define _MPRINTF_REPLACE /* use our functions only */
|
|
|
|
#include <curl/mprintf.h>
|
|
|
|
|
2000-10-09 13:12:34 +02:00
|
|
|
/* The last #include file should be: */
|
|
|
|
#ifdef MALLOCDEBUG
|
|
|
|
#include "memdebug.h"
|
|
|
|
#endif
|
|
|
|
|
2002-12-10 14:10:00 +01:00
|
|
|
/* fread() emulation to provide POST and/or request data */
|
|
|
|
static int readmoredata(char *buffer,
|
|
|
|
size_t size,
|
|
|
|
size_t nitems,
|
|
|
|
void *userp)
|
|
|
|
{
|
|
|
|
struct connectdata *conn = (struct connectdata *)userp;
|
|
|
|
struct HTTP *http = conn->proto.http;
|
|
|
|
int fullsize = size * nitems;
|
|
|
|
|
|
|
|
if(0 == http->postsize)
|
|
|
|
/* nothing to return */
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* make sure that a HTTP request is never sent away chunked! */
|
|
|
|
conn->bits.forbidchunk= (http->sending == HTTPSEND_REQUEST)?TRUE:FALSE;
|
|
|
|
|
|
|
|
if(http->postsize <= fullsize) {
|
|
|
|
memcpy(buffer, http->postdata, http->postsize);
|
|
|
|
fullsize = http->postsize;
|
|
|
|
|
|
|
|
if(http->backup.postsize) {
|
|
|
|
/* move backup data into focus and continue on that */
|
|
|
|
http->postdata = http->backup.postdata;
|
|
|
|
http->postsize = http->backup.postsize;
|
|
|
|
conn->fread = http->backup.fread;
|
|
|
|
conn->fread_in = http->backup.fread_in;
|
|
|
|
|
|
|
|
http->sending++; /* move one step up */
|
|
|
|
|
|
|
|
http->backup.postsize=0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
http->postsize = 0;
|
|
|
|
|
|
|
|
return fullsize;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(buffer, http->postdata, fullsize);
|
|
|
|
http->postdata += fullsize;
|
|
|
|
http->postsize -= fullsize;
|
|
|
|
|
|
|
|
return fullsize;
|
|
|
|
}
|
|
|
|
|
2001-03-08 00:51:41 +01:00
|
|
|
/* ------------------------------------------------------------------------- */
|
2001-01-05 11:11:41 +01:00
|
|
|
/*
|
|
|
|
* The add_buffer series of functions are used to build one large memory chunk
|
|
|
|
* from repeated function invokes. Used so that the entire HTTP request can
|
|
|
|
* be sent in one go.
|
|
|
|
*/
|
2002-12-10 14:10:00 +01:00
|
|
|
|
|
|
|
struct send_buffer {
|
|
|
|
char *buffer;
|
|
|
|
size_t size_max;
|
|
|
|
size_t size_used;
|
|
|
|
};
|
|
|
|
typedef struct send_buffer send_buffer;
|
|
|
|
|
2001-01-05 11:11:41 +01:00
|
|
|
static CURLcode
|
2001-08-14 10:28:15 +02:00
|
|
|
add_buffer(send_buffer *in, const void *inptr, size_t size);
|
2001-01-05 11:11:41 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* add_buffer_init() returns a fine buffer struct
|
|
|
|
*/
|
|
|
|
static
|
|
|
|
send_buffer *add_buffer_init(void)
|
|
|
|
{
|
|
|
|
send_buffer *blonk;
|
|
|
|
blonk=(send_buffer *)malloc(sizeof(send_buffer));
|
|
|
|
if(blonk) {
|
|
|
|
memset(blonk, 0, sizeof(send_buffer));
|
|
|
|
return blonk;
|
|
|
|
}
|
|
|
|
return NULL; /* failed, go home */
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* add_buffer_send() sends a buffer and frees all associated memory.
|
|
|
|
*/
|
|
|
|
static
|
2002-12-09 16:37:54 +01:00
|
|
|
CURLcode add_buffer_send(send_buffer *in,
|
|
|
|
int sockfd,
|
|
|
|
struct connectdata *conn,
|
|
|
|
long *bytes_written) /* add the number of sent
|
|
|
|
bytes to this counter */
|
2001-01-05 11:11:41 +01:00
|
|
|
{
|
2002-01-16 15:47:00 +01:00
|
|
|
ssize_t amount;
|
|
|
|
CURLcode res;
|
|
|
|
char *ptr;
|
|
|
|
int size;
|
2002-12-10 14:10:00 +01:00
|
|
|
struct HTTP *http = conn->proto.http;
|
2001-10-31 15:57:00 +01:00
|
|
|
|
2002-01-16 15:47:00 +01:00
|
|
|
/* The looping below is required since we use non-blocking sockets, but due
|
|
|
|
to the circumstances we will just loop and try again and again etc */
|
|
|
|
|
|
|
|
ptr = in->buffer;
|
|
|
|
size = in->size_used;
|
|
|
|
|
2002-12-10 14:10:00 +01:00
|
|
|
res = Curl_write(conn, sockfd, ptr, size, &amount);
|
|
|
|
|
|
|
|
if(CURLE_OK == res) {
|
2002-01-16 15:47:00 +01:00
|
|
|
|
2002-04-12 09:21:11 +02:00
|
|
|
if(conn->data->set.verbose)
|
|
|
|
/* this data _may_ contain binary stuff */
|
2002-04-12 09:53:12 +02:00
|
|
|
Curl_debug(conn->data, CURLINFO_HEADER_OUT, ptr, amount);
|
2002-04-12 09:21:11 +02:00
|
|
|
|
2002-12-09 16:37:54 +01:00
|
|
|
*bytes_written += amount;
|
2002-12-10 14:10:00 +01:00
|
|
|
|
2002-01-16 15:47:00 +01:00
|
|
|
if(amount != size) {
|
2002-12-10 14:10:00 +01:00
|
|
|
/* The whole request could not be sent in one system call. We must queue
|
|
|
|
it up and send it later when we get the chance. We must not loop here
|
|
|
|
and wait until it might work again. */
|
|
|
|
|
2002-02-18 23:41:52 +01:00
|
|
|
size -= amount;
|
2002-01-16 15:47:00 +01:00
|
|
|
ptr += amount;
|
2002-12-10 14:10:00 +01:00
|
|
|
|
|
|
|
/* backup the currently set pointers */
|
|
|
|
http->backup.fread = conn->fread;
|
|
|
|
http->backup.fread_in = conn->fread_in;
|
|
|
|
http->backup.postdata = http->postdata;
|
|
|
|
http->backup.postsize = http->postsize;
|
|
|
|
|
|
|
|
/* set the new pointers for the request-sending */
|
|
|
|
conn->fread = (curl_read_callback)readmoredata;
|
|
|
|
conn->fread_in = (void *)conn;
|
|
|
|
http->postdata = ptr;
|
|
|
|
http->postsize = size;
|
|
|
|
|
|
|
|
http->send_buffer = in;
|
|
|
|
http->sending = HTTPSEND_REQUEST;
|
|
|
|
|
|
|
|
return CURLE_OK;
|
2002-01-16 15:47:00 +01:00
|
|
|
}
|
2001-01-05 11:11:41 +01:00
|
|
|
|
2002-12-10 14:10:00 +01:00
|
|
|
/* the full buffer was sent, clean up and return */
|
|
|
|
}
|
2001-01-05 11:11:41 +01:00
|
|
|
if(in->buffer)
|
|
|
|
free(in->buffer);
|
|
|
|
free(in);
|
|
|
|
|
2002-01-16 15:47:00 +01:00
|
|
|
return res;
|
2001-01-05 11:11:41 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* add_bufferf() builds a buffer from the formatted input
|
|
|
|
*/
|
|
|
|
static
|
2001-08-14 10:28:15 +02:00
|
|
|
CURLcode add_bufferf(send_buffer *in, const char *fmt, ...)
|
2001-01-05 11:11:41 +01:00
|
|
|
{
|
|
|
|
CURLcode result = CURLE_OUT_OF_MEMORY;
|
|
|
|
char *s;
|
|
|
|
va_list ap;
|
|
|
|
va_start(ap, fmt);
|
2001-01-05 13:19:42 +01:00
|
|
|
s = vaprintf(fmt, ap); /* this allocs a new string to append */
|
2001-01-05 11:11:41 +01:00
|
|
|
va_end(ap);
|
|
|
|
|
|
|
|
if(s) {
|
|
|
|
result = add_buffer(in, s, strlen(s));
|
|
|
|
free(s);
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* add_buffer() appends a memory chunk to the existing one
|
|
|
|
*/
|
|
|
|
static
|
2001-08-14 10:28:15 +02:00
|
|
|
CURLcode add_buffer(send_buffer *in, const void *inptr, size_t size)
|
2001-01-05 11:11:41 +01:00
|
|
|
{
|
|
|
|
char *new_rb;
|
|
|
|
int new_size;
|
|
|
|
|
2001-08-14 10:28:15 +02:00
|
|
|
if(!in->buffer ||
|
|
|
|
((in->size_used + size) > (in->size_max - 1))) {
|
|
|
|
new_size = (in->size_used+size)*2;
|
|
|
|
if(in->buffer)
|
|
|
|
/* we have a buffer, enlarge the existing one */
|
|
|
|
new_rb = (char *)realloc(in->buffer, new_size);
|
|
|
|
else
|
|
|
|
/* create a new buffer */
|
|
|
|
new_rb = (char *)malloc(new_size);
|
|
|
|
|
|
|
|
if(!new_rb)
|
|
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
|
|
|
|
in->buffer = new_rb;
|
|
|
|
in->size_max = new_size;
|
2001-01-05 11:11:41 +01:00
|
|
|
}
|
2001-08-14 10:28:15 +02:00
|
|
|
memcpy(&in->buffer[in->size_used], inptr, size);
|
|
|
|
|
|
|
|
in->size_used += size;
|
2001-01-05 11:11:41 +01:00
|
|
|
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* end of the add_buffer functions */
|
2001-03-08 00:51:41 +01:00
|
|
|
/* ------------------------------------------------------------------------- */
|
2001-01-05 11:11:41 +01:00
|
|
|
|
2002-11-28 16:45:06 +01:00
|
|
|
/*
|
|
|
|
* Curl_compareheader()
|
|
|
|
*
|
|
|
|
* Returns TRUE if 'headerline' contains the 'header' with given 'content'.
|
|
|
|
* Pass headers WITH the colon.
|
|
|
|
*/
|
|
|
|
bool
|
|
|
|
Curl_compareheader(char *headerline, /* line to check */
|
|
|
|
const char *header, /* header keyword _with_ colon */
|
|
|
|
const char *content) /* content string to find */
|
|
|
|
{
|
|
|
|
/* RFC2616, section 4.2 says: "Each header field consists of a name followed
|
|
|
|
* by a colon (":") and the field value. Field names are case-insensitive.
|
|
|
|
* The field value MAY be preceded by any amount of LWS, though a single SP
|
|
|
|
* is preferred." */
|
|
|
|
|
|
|
|
size_t hlen = strlen(header);
|
|
|
|
size_t clen;
|
|
|
|
size_t len;
|
|
|
|
char *start;
|
|
|
|
char *end;
|
|
|
|
|
|
|
|
if(!strnequal(headerline, header, hlen))
|
|
|
|
return FALSE; /* doesn't start with header */
|
|
|
|
|
|
|
|
/* pass the header */
|
|
|
|
start = &headerline[hlen];
|
|
|
|
|
|
|
|
/* pass all white spaces */
|
|
|
|
while(*start && isspace((int)*start))
|
|
|
|
start++;
|
|
|
|
|
|
|
|
/* find the end of the header line */
|
|
|
|
end = strchr(start, '\r'); /* lines end with CRLF */
|
|
|
|
if(!end) {
|
|
|
|
/* in case there's a non-standard compliant line here */
|
|
|
|
end = strchr(start, '\n');
|
|
|
|
|
|
|
|
if(!end)
|
|
|
|
/* hm, there's no line ending here, use the zero byte! */
|
|
|
|
end = strchr(start, '\0');
|
|
|
|
}
|
|
|
|
|
|
|
|
len = end-start; /* length of the content part of the input line */
|
|
|
|
clen = strlen(content); /* length of the word to find */
|
|
|
|
|
|
|
|
/* find the content string in the rest of the line */
|
|
|
|
for(;len>=clen;len--, start++) {
|
|
|
|
if(strnequal(start, content, clen))
|
|
|
|
return TRUE; /* match! */
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE; /* no match */
|
|
|
|
}
|
|
|
|
|
1999-12-29 15:20:26 +01:00
|
|
|
/*
|
|
|
|
* This function checks the linked list of custom HTTP headers for a particular
|
|
|
|
* header (prefix).
|
|
|
|
*/
|
2002-11-28 16:45:06 +01:00
|
|
|
static char *checkheaders(struct SessionHandle *data, const char *thisheader)
|
1999-12-29 15:20:26 +01:00
|
|
|
{
|
2000-06-05 10:23:50 +02:00
|
|
|
struct curl_slist *head;
|
1999-12-29 15:20:26 +01:00
|
|
|
size_t thislen = strlen(thisheader);
|
|
|
|
|
2001-08-31 00:48:34 +02:00
|
|
|
for(head = data->set.headers; head; head=head->next) {
|
2002-11-28 16:45:06 +01:00
|
|
|
if(strnequal(head->data, thisheader, thislen))
|
|
|
|
return head->data;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
2002-11-28 16:45:06 +01:00
|
|
|
return NULL;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
|
2000-09-14 16:05:01 +02:00
|
|
|
/*
|
2001-01-05 11:11:41 +01:00
|
|
|
* ConnectHTTPProxyTunnel() requires that we're connected to a HTTP proxy. This
|
2000-09-14 16:05:01 +02:00
|
|
|
* function will issue the necessary commands to get a seamless tunnel through
|
|
|
|
* this proxy. After that, the socket can be used just as a normal socket.
|
|
|
|
*/
|
|
|
|
|
2001-01-25 13:19:02 +01:00
|
|
|
CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
|
|
|
|
int tunnelsocket,
|
2001-01-05 11:11:41 +01:00
|
|
|
char *hostname, int remote_port)
|
2000-09-14 16:05:01 +02:00
|
|
|
{
|
|
|
|
int httperror=0;
|
|
|
|
int subversion=0;
|
2001-08-31 00:48:34 +02:00
|
|
|
struct SessionHandle *data=conn->data;
|
2001-10-31 15:57:00 +01:00
|
|
|
CURLcode result;
|
2002-01-15 00:14:59 +01:00
|
|
|
int res;
|
2000-09-14 16:05:01 +02:00
|
|
|
|
2001-11-12 10:47:09 +01:00
|
|
|
int nread; /* total size read */
|
|
|
|
int perline; /* count bytes per line */
|
|
|
|
bool keepon=TRUE;
|
|
|
|
ssize_t gotbytes;
|
|
|
|
char *ptr;
|
|
|
|
int timeout = 3600; /* default timeout in seconds */
|
|
|
|
struct timeval interval;
|
|
|
|
fd_set rkeepfd;
|
|
|
|
fd_set readfd;
|
|
|
|
char *line_start;
|
|
|
|
|
|
|
|
#define SELECT_OK 0
|
|
|
|
#define SELECT_ERROR 1
|
|
|
|
#define SELECT_TIMEOUT 2
|
|
|
|
int error = SELECT_OK;
|
|
|
|
|
2000-09-15 14:55:38 +02:00
|
|
|
infof(data, "Establish HTTP proxy tunnel to %s:%d\n", hostname, remote_port);
|
2000-09-14 16:05:01 +02:00
|
|
|
|
2001-01-25 13:19:02 +01:00
|
|
|
/* OK, now send the connect request to the proxy */
|
2001-10-31 15:57:00 +01:00
|
|
|
result =
|
|
|
|
Curl_sendf(tunnelsocket, conn,
|
|
|
|
"CONNECT %s:%d HTTP/1.0\015\012"
|
|
|
|
"%s"
|
|
|
|
"%s"
|
|
|
|
"\r\n",
|
|
|
|
hostname, remote_port,
|
|
|
|
(conn->bits.proxy_user_passwd)?conn->allocptr.proxyuserpwd:"",
|
|
|
|
(data->set.useragent?conn->allocptr.uagent:"")
|
|
|
|
);
|
|
|
|
if(result) {
|
|
|
|
failf(data, "Failed sending CONNECT to proxy");
|
|
|
|
return result;
|
|
|
|
}
|
2000-09-14 16:05:01 +02:00
|
|
|
|
2001-11-12 10:47:09 +01:00
|
|
|
/* Now, read the full reply we get from the proxy */
|
|
|
|
|
|
|
|
|
|
|
|
if(data->set.timeout) {
|
|
|
|
/* if timeout is requested, find out how much remaining time we have */
|
|
|
|
timeout = data->set.timeout - /* timeout time */
|
|
|
|
Curl_tvdiff(Curl_tvnow(), conn->now)/1000; /* spent time */
|
|
|
|
if(timeout <=0 ) {
|
|
|
|
failf(data, "Transfer aborted due to timeout");
|
|
|
|
return -SELECT_TIMEOUT; /* already too little time */
|
2000-09-14 16:05:01 +02:00
|
|
|
}
|
|
|
|
}
|
2001-11-12 10:47:09 +01:00
|
|
|
|
|
|
|
FD_ZERO (&readfd); /* clear it */
|
|
|
|
FD_SET (tunnelsocket, &readfd); /* read socket */
|
|
|
|
|
|
|
|
/* get this in a backup variable to be able to restore it on each lap in the
|
|
|
|
select() loop */
|
|
|
|
rkeepfd = readfd;
|
|
|
|
|
|
|
|
ptr=data->state.buffer;
|
|
|
|
line_start = ptr;
|
|
|
|
|
|
|
|
nread=0;
|
|
|
|
perline=0;
|
|
|
|
keepon=TRUE;
|
|
|
|
|
|
|
|
while((nread<BUFSIZE) && (keepon && !error)) {
|
|
|
|
readfd = rkeepfd; /* set every lap */
|
|
|
|
interval.tv_sec = timeout;
|
|
|
|
interval.tv_usec = 0;
|
|
|
|
|
|
|
|
switch (select (tunnelsocket+1, &readfd, NULL, NULL, &interval)) {
|
|
|
|
case -1: /* select() error, stop reading */
|
|
|
|
error = SELECT_ERROR;
|
|
|
|
failf(data, "Transfer aborted due to select() error");
|
|
|
|
break;
|
|
|
|
case 0: /* timeout */
|
|
|
|
error = SELECT_TIMEOUT;
|
|
|
|
failf(data, "Transfer aborted due to timeout");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/*
|
|
|
|
* This code previously didn't use the kerberos sec_read() code
|
|
|
|
* to read, but when we use Curl_read() it may do so. Do confirm
|
|
|
|
* that this is still ok and then remove this comment!
|
|
|
|
*/
|
2002-01-15 00:14:59 +01:00
|
|
|
res= Curl_read(conn, tunnelsocket, ptr, BUFSIZE-nread,
|
|
|
|
&gotbytes);
|
|
|
|
if(res< 0)
|
|
|
|
/* EWOULDBLOCK */
|
|
|
|
continue; /* go loop yourself */
|
|
|
|
else if(res)
|
2001-11-12 10:47:09 +01:00
|
|
|
keepon = FALSE;
|
|
|
|
else if(gotbytes <= 0) {
|
|
|
|
keepon = FALSE;
|
|
|
|
error = SELECT_ERROR;
|
|
|
|
failf(data, "Connection aborted");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* we got a whole chunk of data, which can be anything from one
|
|
|
|
* byte to a set of lines and possibly just a piece of the last
|
|
|
|
* line */
|
|
|
|
int i;
|
|
|
|
|
|
|
|
nread += gotbytes;
|
|
|
|
for(i = 0; i < gotbytes; ptr++, i++) {
|
|
|
|
perline++; /* amount of bytes in this line so far */
|
|
|
|
if(*ptr=='\n') {
|
|
|
|
/* a newline is CRLF in ftp-talk, so the CR is ignored as
|
|
|
|
the line isn't really terminated until the LF comes */
|
|
|
|
|
|
|
|
/* output debug output if that is requested */
|
2002-04-12 09:21:11 +02:00
|
|
|
if(data->set.verbose)
|
|
|
|
Curl_debug(data, CURLINFO_DATA_IN, line_start, perline);
|
2001-11-12 10:47:09 +01:00
|
|
|
|
|
|
|
if('\r' == line_start[0]) {
|
|
|
|
/* end of headers */
|
|
|
|
keepon=FALSE;
|
|
|
|
break; /* breaks out of loop, not switch */
|
|
|
|
}
|
|
|
|
|
|
|
|
if(2 == sscanf(line_start, "HTTP/1.%d %d",
|
|
|
|
&subversion,
|
|
|
|
&httperror)) {
|
|
|
|
;
|
|
|
|
}
|
|
|
|
|
|
|
|
perline=0; /* line starts over here */
|
|
|
|
line_start = ptr+1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
} /* switch */
|
|
|
|
} /* while there's buffer left and loop is requested */
|
|
|
|
|
|
|
|
if(error)
|
2002-04-10 15:44:42 +02:00
|
|
|
return CURLE_RECV_ERROR;
|
2001-11-12 10:47:09 +01:00
|
|
|
|
2000-09-14 16:05:01 +02:00
|
|
|
if(200 != httperror) {
|
|
|
|
if(407 == httperror)
|
|
|
|
/* Added Nov 6 1998 */
|
|
|
|
failf(data, "Proxy requires authorization!");
|
|
|
|
else
|
|
|
|
failf(data, "Received error code %d from proxy", httperror);
|
2002-04-10 15:44:42 +02:00
|
|
|
return CURLE_RECV_ERROR;
|
2000-09-14 16:05:01 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
infof (data, "Proxy replied to CONNECT request\n");
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2001-03-08 00:51:41 +01:00
|
|
|
/*
|
|
|
|
* HTTP stuff to do at connect-time.
|
|
|
|
*/
|
2001-01-05 11:11:41 +01:00
|
|
|
CURLcode Curl_http_connect(struct connectdata *conn)
|
1999-12-29 15:20:26 +01:00
|
|
|
{
|
2001-08-31 00:48:34 +02:00
|
|
|
struct SessionHandle *data;
|
2000-09-14 16:05:01 +02:00
|
|
|
CURLcode result;
|
2000-05-22 16:12:12 +02:00
|
|
|
|
|
|
|
data=conn->data;
|
|
|
|
|
|
|
|
/* If we are not using a proxy and we want a secure connection,
|
|
|
|
* perform SSL initialization & connection now.
|
|
|
|
* If using a proxy with https, then we must tell the proxy to CONNECT
|
|
|
|
* us to the host we want to talk to. Only after the connect
|
|
|
|
* has occured, can we start talking SSL
|
|
|
|
*/
|
2000-09-14 16:05:01 +02:00
|
|
|
|
2002-10-10 10:00:49 +02:00
|
|
|
if(conn->bits.httpproxy &&
|
2001-11-12 15:08:41 +01:00
|
|
|
((conn->protocol & PROT_HTTPS) || data->set.tunnel_thru_httpproxy)) {
|
|
|
|
|
|
|
|
/* either HTTPS over proxy, OR explicitly asked for a tunnel */
|
|
|
|
result = Curl_ConnectHTTPProxyTunnel(conn, conn->firstsocket,
|
|
|
|
conn->hostname, conn->remote_port);
|
|
|
|
if(CURLE_OK != result)
|
2001-05-12 11:30:42 +02:00
|
|
|
return result;
|
2001-11-13 09:34:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if(conn->protocol & PROT_HTTPS) {
|
|
|
|
/* now, perform the SSL initialization for this socket */
|
|
|
|
result = Curl_SSLConnect(conn);
|
|
|
|
if(result)
|
|
|
|
return result;
|
2000-05-22 16:12:12 +02:00
|
|
|
}
|
|
|
|
|
2001-08-31 00:48:34 +02:00
|
|
|
if(conn->bits.user_passwd && !data->state.this_is_a_follow) {
|
2000-09-14 16:05:01 +02:00
|
|
|
/* Authorization: is requested, this is not a followed location, get the
|
|
|
|
original host name */
|
2002-11-26 18:32:15 +01:00
|
|
|
if (data->state.auth_host)
|
|
|
|
/* Free to avoid leaking memory on multiple requests*/
|
|
|
|
free(data->state.auth_host);
|
|
|
|
|
2001-08-31 00:48:34 +02:00
|
|
|
data->state.auth_host = strdup(conn->hostname);
|
2000-09-14 16:05:01 +02:00
|
|
|
}
|
2000-07-25 23:16:32 +02:00
|
|
|
|
2000-09-14 16:05:01 +02:00
|
|
|
return CURLE_OK;
|
2000-05-22 16:12:12 +02:00
|
|
|
}
|
2000-07-25 23:16:32 +02:00
|
|
|
|
2001-01-05 11:11:41 +01:00
|
|
|
CURLcode Curl_http_done(struct connectdata *conn)
|
2000-05-22 16:12:12 +02:00
|
|
|
{
|
2001-08-31 00:48:34 +02:00
|
|
|
struct SessionHandle *data;
|
2000-05-22 16:12:12 +02:00
|
|
|
struct HTTP *http;
|
|
|
|
|
|
|
|
data=conn->data;
|
2001-02-20 18:35:51 +01:00
|
|
|
http=conn->proto.http;
|
2000-05-22 16:12:12 +02:00
|
|
|
|
2002-12-09 17:05:57 +01:00
|
|
|
/* set the proper values (possibly modified on POST) */
|
|
|
|
conn->fread = data->set.fread; /* restore */
|
|
|
|
conn->fread_in = data->set.in; /* restore */
|
|
|
|
|
2002-12-10 14:10:00 +01:00
|
|
|
if(http->send_buffer) {
|
|
|
|
send_buffer *buff = http->send_buffer;
|
|
|
|
|
|
|
|
free(buff->buffer);
|
|
|
|
free(buff);
|
|
|
|
}
|
|
|
|
|
2001-08-31 00:48:34 +02:00
|
|
|
if(HTTPREQ_POST_FORM == data->set.httpreq) {
|
2002-09-23 14:47:18 +02:00
|
|
|
conn->bytecount = http->readbytecount + http->writebytecount;
|
2000-05-22 16:12:12 +02:00
|
|
|
|
2001-08-06 14:36:18 +02:00
|
|
|
Curl_formclean(http->sendit); /* Now free that whole lot */
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
2002-09-23 14:47:18 +02:00
|
|
|
else if(HTTPREQ_PUT == data->set.httpreq)
|
|
|
|
conn->bytecount = http->readbytecount + http->writebytecount;
|
2000-05-22 16:12:12 +02:00
|
|
|
|
2001-10-19 13:58:32 +02:00
|
|
|
if(0 == (http->readbytecount + conn->headerbytecount)) {
|
|
|
|
/* nothing was read from the HTTP server, this can't be right
|
|
|
|
so we return an error here */
|
2001-12-11 14:13:01 +01:00
|
|
|
failf(data, "Empty reply from server");
|
2001-10-19 13:58:32 +02:00
|
|
|
return CURLE_GOT_NOTHING;
|
|
|
|
}
|
|
|
|
|
2000-05-22 16:12:12 +02:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2001-01-05 11:11:41 +01:00
|
|
|
CURLcode Curl_http(struct connectdata *conn)
|
2000-05-22 16:12:12 +02:00
|
|
|
{
|
2001-08-31 00:48:34 +02:00
|
|
|
struct SessionHandle *data=conn->data;
|
|
|
|
char *buf = data->state.buffer; /* this is a short cut to the buffer */
|
2000-06-14 19:15:07 +02:00
|
|
|
CURLcode result=CURLE_OK;
|
2000-05-22 16:12:12 +02:00
|
|
|
struct HTTP *http;
|
|
|
|
struct Cookie *co=NULL; /* no cookies from start */
|
|
|
|
char *ppath = conn->ppath; /* three previous function arguments */
|
|
|
|
char *host = conn->name;
|
2002-11-11 09:40:37 +01:00
|
|
|
const char *te = ""; /* tranfer-encoding */
|
2000-05-22 16:12:12 +02:00
|
|
|
|
2001-02-23 00:41:15 +01:00
|
|
|
if(!conn->proto.http) {
|
|
|
|
/* Only allocate this struct if we don't already have it! */
|
|
|
|
|
|
|
|
http = (struct HTTP *)malloc(sizeof(struct HTTP));
|
|
|
|
if(!http)
|
|
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
memset(http, 0, sizeof(struct HTTP));
|
|
|
|
conn->proto.http = http;
|
|
|
|
}
|
2001-03-04 16:25:54 +01:00
|
|
|
else
|
|
|
|
http = conn->proto.http;
|
2000-05-22 16:12:12 +02:00
|
|
|
|
2001-03-05 14:40:08 +01:00
|
|
|
/* We default to persistant connections */
|
|
|
|
conn->bits.close = FALSE;
|
|
|
|
|
2000-05-22 16:12:12 +02:00
|
|
|
if ( (conn->protocol&(PROT_HTTP|PROT_FTP)) &&
|
2001-08-31 00:48:34 +02:00
|
|
|
data->set.upload) {
|
|
|
|
data->set.httpreq = HTTPREQ_PUT;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* The User-Agent string has been built in url.c already, because it might
|
|
|
|
have been used in the proxy connect, but if we have got a header with
|
2000-02-02 00:52:11 +01:00
|
|
|
the user-agent string specified, we erase the previously made string
|
1999-12-29 15:20:26 +01:00
|
|
|
here. */
|
2001-02-23 00:32:02 +01:00
|
|
|
if(checkheaders(data, "User-Agent:") && conn->allocptr.uagent) {
|
|
|
|
free(conn->allocptr.uagent);
|
|
|
|
conn->allocptr.uagent=NULL;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
|
2001-03-14 15:11:11 +01:00
|
|
|
if((conn->bits.user_passwd) && !checkheaders(data, "Authorization:")) {
|
2000-09-21 10:48:48 +02:00
|
|
|
char *authorization;
|
2000-07-25 23:16:32 +02:00
|
|
|
|
|
|
|
/* To prevent the user+password to get sent to other than the original
|
|
|
|
host due to a location-follow, we do some weirdo checks here */
|
2001-08-31 00:48:34 +02:00
|
|
|
if(!data->state.this_is_a_follow ||
|
|
|
|
!data->state.auth_host ||
|
2002-11-28 16:45:06 +01:00
|
|
|
curl_strequal(data->state.auth_host, conn->hostname)) {
|
2001-08-31 00:48:34 +02:00
|
|
|
sprintf(data->state.buffer, "%s:%s",
|
|
|
|
data->state.user, data->state.passwd);
|
|
|
|
if(Curl_base64_encode(data->state.buffer, strlen(data->state.buffer),
|
2001-01-05 11:11:41 +01:00
|
|
|
&authorization) >= 0) {
|
2001-02-23 00:32:02 +01:00
|
|
|
if(conn->allocptr.userpwd)
|
|
|
|
free(conn->allocptr.userpwd);
|
|
|
|
conn->allocptr.userpwd = aprintf( "Authorization: Basic %s\015\012",
|
2001-08-31 00:48:34 +02:00
|
|
|
authorization);
|
2000-09-21 10:48:48 +02:00
|
|
|
free(authorization);
|
|
|
|
}
|
2000-07-25 23:16:32 +02:00
|
|
|
}
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
2001-08-31 00:48:34 +02:00
|
|
|
if((data->change.referer) && !checkheaders(data, "Referer:")) {
|
2001-02-23 00:32:02 +01:00
|
|
|
if(conn->allocptr.ref)
|
|
|
|
free(conn->allocptr.ref);
|
2001-08-31 00:48:34 +02:00
|
|
|
conn->allocptr.ref = aprintf("Referer: %s\015\012", data->change.referer);
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
2001-08-31 00:48:34 +02:00
|
|
|
if(data->set.cookie && !checkheaders(data, "Cookie:")) {
|
2001-02-23 00:32:02 +01:00
|
|
|
if(conn->allocptr.cookie)
|
|
|
|
free(conn->allocptr.cookie);
|
2001-08-31 00:48:34 +02:00
|
|
|
conn->allocptr.cookie = aprintf("Cookie: %s\015\012", data->set.cookie);
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
|
2002-11-28 16:45:06 +01:00
|
|
|
if(!conn->bits.upload_chunky && (data->set.httpreq != HTTPREQ_GET)) {
|
|
|
|
/* not a chunky transfer but data is to be sent */
|
|
|
|
char *ptr = checkheaders(data, "Transfer-Encoding:");
|
|
|
|
if(ptr) {
|
|
|
|
/* Some kind of TE is requested, check if 'chunked' is chosen */
|
|
|
|
if(Curl_compareheader(ptr, "Transfer-Encoding:", "chunked"))
|
|
|
|
/* we have been told explicitly to upload chunky so deal with it! */
|
|
|
|
conn->bits.upload_chunky = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-11-12 00:03:03 +01:00
|
|
|
if(conn->bits.upload_chunky) {
|
2002-12-01 12:20:41 +01:00
|
|
|
/* RFC2616 section 4.4:
|
|
|
|
Messages MUST NOT include both a Content-Length header field and a
|
|
|
|
non-identity transfer-coding. If the message does include a non-
|
|
|
|
identity transfer-coding, the Content-Length MUST be ignored. */
|
|
|
|
|
2002-11-11 09:40:37 +01:00
|
|
|
if(!checkheaders(data, "Transfer-Encoding:")) {
|
|
|
|
te = "Transfer-Encoding: chunked\r\n";
|
|
|
|
}
|
2002-11-28 16:45:06 +01:00
|
|
|
else {
|
|
|
|
/* The "Transfer-Encoding:" header was already added. */
|
|
|
|
te = "";
|
|
|
|
}
|
2002-11-11 09:40:37 +01:00
|
|
|
}
|
|
|
|
|
1999-12-29 15:20:26 +01:00
|
|
|
if(data->cookies) {
|
2001-01-05 11:11:41 +01:00
|
|
|
co = Curl_cookie_getlist(data->cookies,
|
2001-08-31 00:48:34 +02:00
|
|
|
host, ppath,
|
2002-08-26 19:20:29 +02:00
|
|
|
(conn->protocol&PROT_HTTPS?TRUE:FALSE));
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
2002-10-10 10:00:49 +02:00
|
|
|
if (data->change.proxy && *data->change.proxy &&
|
2001-11-12 15:08:41 +01:00
|
|
|
!data->set.tunnel_thru_httpproxy &&
|
|
|
|
!(conn->protocol&PROT_HTTPS)) {
|
1999-12-29 15:20:26 +01:00
|
|
|
/* The path sent to the proxy is in fact the entire URL */
|
2001-08-31 00:48:34 +02:00
|
|
|
ppath = data->change.url;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
2001-08-31 00:48:34 +02:00
|
|
|
if(HTTPREQ_POST_FORM == data->set.httpreq) {
|
1999-12-29 15:20:26 +01:00
|
|
|
/* we must build the whole darned post sequence first, so that we have
|
|
|
|
a size of the whole shebang before we start to send it */
|
2002-04-15 13:19:03 +02:00
|
|
|
result = Curl_getFormData(&http->sendit, data->set.httppost,
|
|
|
|
&http->postsize);
|
|
|
|
if(CURLE_OK != result) {
|
|
|
|
/* Curl_getFormData() doesn't use failf() */
|
|
|
|
failf(data, "failed creating formpost data");
|
|
|
|
return result;
|
|
|
|
}
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
|
2001-03-09 17:48:18 +01:00
|
|
|
if(!checkheaders(data, "Host:")) {
|
|
|
|
/* if ptr_host is already set, it is almost OK since we only re-use
|
|
|
|
connections to the very same host and port, but when we use a HTTP
|
|
|
|
proxy we have a persistant connect and yet we must change the Host:
|
|
|
|
header! */
|
|
|
|
|
|
|
|
if(conn->allocptr.host)
|
|
|
|
free(conn->allocptr.host);
|
2001-02-20 18:46:35 +01:00
|
|
|
|
2002-09-11 12:32:37 +02:00
|
|
|
/* When building Host: headers, we must put the host name within
|
|
|
|
[brackets] if the host name is a plain IPv6-address. RFC2732-style. */
|
|
|
|
|
2001-03-02 16:34:15 +01:00
|
|
|
if(((conn->protocol&PROT_HTTPS) && (conn->remote_port == PORT_HTTPS)) ||
|
|
|
|
(!(conn->protocol&PROT_HTTPS) && (conn->remote_port == PORT_HTTP)) )
|
2000-10-20 15:48:38 +02:00
|
|
|
/* If (HTTPS on port 443) OR (non-HTTPS on port 80) then don't include
|
|
|
|
the port number in the host string */
|
2002-09-11 12:32:37 +02:00
|
|
|
conn->allocptr.host = aprintf("Host: %s%s%s\r\n",
|
|
|
|
conn->bits.ipv6_ip?"[":"",
|
|
|
|
host,
|
|
|
|
conn->bits.ipv6_ip?"]":"");
|
2000-10-20 15:48:38 +02:00
|
|
|
else
|
2002-09-11 12:32:37 +02:00
|
|
|
conn->allocptr.host = aprintf("Host: %s%s%s:%d\r\n",
|
|
|
|
conn->bits.ipv6_ip?"[":"",
|
|
|
|
host,
|
|
|
|
conn->bits.ipv6_ip?"]":"",
|
2001-03-02 16:34:15 +01:00
|
|
|
conn->remote_port);
|
2000-07-25 09:28:28 +02:00
|
|
|
}
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
if(!checkheaders(data, "Pragma:"))
|
2000-05-22 16:12:12 +02:00
|
|
|
http->p_pragma = "Pragma: no-cache\r\n";
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
if(!checkheaders(data, "Accept:"))
|
2000-05-22 16:12:12 +02:00
|
|
|
http->p_accept = "Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r\n";
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2001-08-31 00:48:34 +02:00
|
|
|
if(( (HTTPREQ_POST == data->set.httpreq) ||
|
|
|
|
(HTTPREQ_POST_FORM == data->set.httpreq) ||
|
|
|
|
(HTTPREQ_PUT == data->set.httpreq) ) &&
|
2001-04-18 09:25:11 +02:00
|
|
|
conn->resume_from) {
|
2001-01-26 16:49:39 +01:00
|
|
|
/**********************************************************************
|
|
|
|
* Resuming upload in HTTP means that we PUT or POST and that we have
|
|
|
|
* got a resume_from value set. The resume value has already created
|
|
|
|
* a Range: header that will be passed along. We need to "fast forward"
|
|
|
|
* the file the given number of bytes and decrease the assume upload
|
|
|
|
* file size before we continue this venture in the dark lands of HTTP.
|
|
|
|
*********************************************************************/
|
|
|
|
|
2001-04-18 09:25:11 +02:00
|
|
|
if(conn->resume_from < 0 ) {
|
2001-01-26 16:49:39 +01:00
|
|
|
/*
|
|
|
|
* This is meant to get the size of the present remote-file by itself.
|
|
|
|
* We don't support this now. Bail out!
|
|
|
|
*/
|
2001-04-18 09:25:11 +02:00
|
|
|
conn->resume_from = 0;
|
2001-01-26 16:49:39 +01:00
|
|
|
}
|
|
|
|
|
2001-04-18 09:25:11 +02:00
|
|
|
if(conn->resume_from) {
|
2001-01-26 16:49:39 +01:00
|
|
|
/* do we still game? */
|
|
|
|
int passed=0;
|
|
|
|
|
|
|
|
/* Now, let's read off the proper amount of bytes from the
|
|
|
|
input. If we knew it was a proper file we could've just
|
|
|
|
fseek()ed but we only have a stream here */
|
|
|
|
do {
|
2001-04-18 09:25:11 +02:00
|
|
|
int readthisamountnow = (conn->resume_from - passed);
|
2001-01-26 16:49:39 +01:00
|
|
|
int actuallyread;
|
|
|
|
|
|
|
|
if(readthisamountnow > BUFSIZE)
|
|
|
|
readthisamountnow = BUFSIZE;
|
|
|
|
|
|
|
|
actuallyread =
|
2001-08-31 00:48:34 +02:00
|
|
|
data->set.fread(data->state.buffer, 1, readthisamountnow,
|
|
|
|
data->set.in);
|
2001-01-26 16:49:39 +01:00
|
|
|
|
|
|
|
passed += actuallyread;
|
|
|
|
if(actuallyread != readthisamountnow) {
|
2001-12-11 14:13:01 +01:00
|
|
|
failf(data, "Could only read %d bytes from the input",
|
2001-01-26 16:49:39 +01:00
|
|
|
passed);
|
|
|
|
return CURLE_READ_ERROR;
|
|
|
|
}
|
2001-04-18 09:25:11 +02:00
|
|
|
} while(passed != conn->resume_from); /* loop until done */
|
2001-01-26 16:49:39 +01:00
|
|
|
|
|
|
|
/* now, decrease the size of the read */
|
2001-08-31 00:48:34 +02:00
|
|
|
if(data->set.infilesize>0) {
|
|
|
|
data->set.infilesize -= conn->resume_from;
|
2001-01-26 16:49:39 +01:00
|
|
|
|
2001-08-31 00:48:34 +02:00
|
|
|
if(data->set.infilesize <= 0) {
|
2001-12-11 14:13:01 +01:00
|
|
|
failf(data, "File already completely uploaded");
|
2001-01-26 16:49:39 +01:00
|
|
|
return CURLE_PARTIAL_FILE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* we've passed, proceed as normal */
|
|
|
|
}
|
|
|
|
}
|
2001-04-18 09:25:11 +02:00
|
|
|
if(conn->bits.use_range) {
|
2001-01-29 08:24:20 +01:00
|
|
|
/*
|
|
|
|
* A range is selected. We use different headers whether we're downloading
|
|
|
|
* or uploading and we always let customized headers override our internal
|
|
|
|
* ones if any such are specified.
|
|
|
|
*/
|
2001-08-31 00:48:34 +02:00
|
|
|
if((data->set.httpreq == HTTPREQ_GET) &&
|
2001-01-29 08:24:20 +01:00
|
|
|
!checkheaders(data, "Range:")) {
|
2002-09-25 14:47:38 +02:00
|
|
|
/* if a line like this was already allocated, free the previous one */
|
|
|
|
if(conn->allocptr.rangeline)
|
|
|
|
free(conn->allocptr.rangeline);
|
2001-04-18 09:25:11 +02:00
|
|
|
conn->allocptr.rangeline = aprintf("Range: bytes=%s\r\n", conn->range);
|
2001-01-29 08:24:20 +01:00
|
|
|
}
|
2001-08-31 00:48:34 +02:00
|
|
|
else if((data->set.httpreq != HTTPREQ_GET) &&
|
2001-01-29 08:24:20 +01:00
|
|
|
!checkheaders(data, "Content-Range:")) {
|
|
|
|
|
2001-04-18 09:25:11 +02:00
|
|
|
if(conn->resume_from) {
|
2001-01-29 08:24:20 +01:00
|
|
|
/* This is because "resume" was selected */
|
2001-08-31 00:48:34 +02:00
|
|
|
long total_expected_size= conn->resume_from + data->set.infilesize;
|
2001-02-23 00:32:02 +01:00
|
|
|
conn->allocptr.rangeline = aprintf("Content-Range: bytes %s%ld/%ld\r\n",
|
2001-04-18 09:25:11 +02:00
|
|
|
conn->range, total_expected_size-1,
|
2001-01-29 08:24:20 +01:00
|
|
|
total_expected_size);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Range was selected and then we just pass the incoming range and
|
|
|
|
append total size */
|
2001-02-23 00:32:02 +01:00
|
|
|
conn->allocptr.rangeline = aprintf("Content-Range: bytes %s/%d\r\n",
|
2001-08-31 00:48:34 +02:00
|
|
|
conn->range, data->set.infilesize);
|
2001-01-29 08:24:20 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2001-01-26 16:49:39 +01:00
|
|
|
|
1999-12-29 15:20:26 +01:00
|
|
|
do {
|
2001-10-09 08:52:37 +02:00
|
|
|
/* Use 1.1 unless the use specificly asked for 1.0 */
|
|
|
|
const char *httpstring=
|
|
|
|
data->set.httpversion==CURL_HTTP_VERSION_1_0?"1.0":"1.1";
|
|
|
|
|
2000-10-03 13:01:32 +02:00
|
|
|
send_buffer *req_buffer;
|
2001-08-31 00:48:34 +02:00
|
|
|
struct curl_slist *headers=data->set.headers;
|
2000-10-03 13:01:32 +02:00
|
|
|
|
|
|
|
/* initialize a dynamic send-buffer */
|
|
|
|
req_buffer = add_buffer_init();
|
|
|
|
|
|
|
|
/* add the main request stuff */
|
|
|
|
add_bufferf(req_buffer,
|
|
|
|
"%s " /* GET/HEAD/POST/PUT */
|
2001-10-09 08:52:37 +02:00
|
|
|
"%s HTTP/%s\r\n" /* path */
|
2000-10-03 13:01:32 +02:00
|
|
|
"%s" /* proxyuserpwd */
|
|
|
|
"%s" /* userpwd */
|
|
|
|
"%s" /* range */
|
|
|
|
"%s" /* user agent */
|
|
|
|
"%s" /* cookie */
|
|
|
|
"%s" /* host */
|
|
|
|
"%s" /* pragma */
|
|
|
|
"%s" /* accept */
|
2002-09-03 00:31:18 +02:00
|
|
|
"%s" /* accept-encoding */
|
2002-11-11 09:40:37 +01:00
|
|
|
"%s" /* referer */
|
|
|
|
"%s",/* transfer-encoding */
|
2000-10-03 13:01:32 +02:00
|
|
|
|
2001-08-31 00:48:34 +02:00
|
|
|
data->set.customrequest?data->set.customrequest:
|
|
|
|
(data->set.no_body?"HEAD":
|
|
|
|
((HTTPREQ_POST == data->set.httpreq) ||
|
|
|
|
(HTTPREQ_POST_FORM == data->set.httpreq))?"POST":
|
|
|
|
(HTTPREQ_PUT == data->set.httpreq)?"PUT":"GET"),
|
2001-10-09 08:52:37 +02:00
|
|
|
ppath, httpstring,
|
2001-03-14 15:11:11 +01:00
|
|
|
(conn->bits.proxy_user_passwd &&
|
|
|
|
conn->allocptr.proxyuserpwd)?conn->allocptr.proxyuserpwd:"",
|
|
|
|
(conn->bits.user_passwd && conn->allocptr.userpwd)?
|
|
|
|
conn->allocptr.userpwd:"",
|
2001-04-18 09:25:11 +02:00
|
|
|
(conn->bits.use_range && conn->allocptr.rangeline)?
|
2001-03-14 15:11:11 +01:00
|
|
|
conn->allocptr.rangeline:"",
|
2001-08-31 00:48:34 +02:00
|
|
|
(data->set.useragent && *data->set.useragent && conn->allocptr.uagent)?
|
2001-03-14 15:11:11 +01:00
|
|
|
conn->allocptr.uagent:"",
|
2001-02-23 00:32:02 +01:00
|
|
|
(conn->allocptr.cookie?conn->allocptr.cookie:""), /* Cookie: <data> */
|
|
|
|
(conn->allocptr.host?conn->allocptr.host:""), /* Host: host */
|
2000-10-03 13:01:32 +02:00
|
|
|
http->p_pragma?http->p_pragma:"",
|
|
|
|
http->p_accept?http->p_accept:"",
|
2002-09-03 00:31:18 +02:00
|
|
|
(data->set.encoding && *data->set.encoding && conn->allocptr.accept_encoding)?
|
|
|
|
conn->allocptr.accept_encoding:"", /* 08/28/02 jhrg */
|
2002-11-11 09:40:37 +01:00
|
|
|
(data->change.referer && conn->allocptr.ref)?conn->allocptr.ref:"" /* Referer: <data> <CRLF> */,
|
|
|
|
te
|
2000-10-03 13:01:32 +02:00
|
|
|
);
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
if(co) {
|
|
|
|
int count=0;
|
2000-11-17 15:03:58 +01:00
|
|
|
struct Cookie *store=co;
|
1999-12-29 15:20:26 +01:00
|
|
|
/* now loop through all cookies that matched */
|
|
|
|
while(co) {
|
2000-02-11 00:15:33 +01:00
|
|
|
if(co->value && strlen(co->value)) {
|
|
|
|
if(0 == count) {
|
2000-11-13 12:29:32 +01:00
|
|
|
add_bufferf(req_buffer, "Cookie: ");
|
2000-02-11 00:15:33 +01:00
|
|
|
}
|
2000-10-03 13:01:32 +02:00
|
|
|
add_bufferf(req_buffer,
|
|
|
|
"%s%s=%s", count?"; ":"", co->name, co->value);
|
2000-05-22 16:12:12 +02:00
|
|
|
count++;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
co = co->next; /* next cookie please */
|
|
|
|
}
|
|
|
|
if(count) {
|
2000-10-03 13:01:32 +02:00
|
|
|
add_buffer(req_buffer, "\r\n", 2);
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
2001-01-05 11:11:41 +01:00
|
|
|
Curl_cookie_freelist(store); /* free the cookie list */
|
1999-12-29 15:20:26 +01:00
|
|
|
co=NULL;
|
|
|
|
}
|
|
|
|
|
2001-08-31 00:48:34 +02:00
|
|
|
if(data->set.timecondition) {
|
1999-12-29 15:20:26 +01:00
|
|
|
struct tm *thistime;
|
|
|
|
|
2001-04-17 09:28:49 +02:00
|
|
|
/* Phil Karn (Fri, 13 Apr 2001) pointed out that the If-Modified-Since
|
|
|
|
* header family should have their times set in GMT as RFC2616 defines:
|
|
|
|
* "All HTTP date/time stamps MUST be represented in Greenwich Mean Time
|
|
|
|
* (GMT), without exception. For the purposes of HTTP, GMT is exactly
|
|
|
|
* equal to UTC (Coordinated Universal Time)." (see page 20 of RFC2616).
|
|
|
|
*/
|
|
|
|
|
2001-12-07 16:51:59 +01:00
|
|
|
#ifdef HAVE_GMTIME_R
|
2000-07-30 00:21:10 +02:00
|
|
|
/* thread-safe version */
|
|
|
|
struct tm keeptime;
|
2001-08-31 00:48:34 +02:00
|
|
|
thistime = (struct tm *)gmtime_r(&data->set.timevalue, &keeptime);
|
2000-07-30 00:21:10 +02:00
|
|
|
#else
|
2001-08-31 00:48:34 +02:00
|
|
|
thistime = gmtime(&data->set.timevalue);
|
2000-07-30 00:21:10 +02:00
|
|
|
#endif
|
|
|
|
if(NULL == thistime) {
|
|
|
|
failf(data, "localtime() failed!");
|
|
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
}
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2000-03-16 12:40:48 +01:00
|
|
|
#ifdef HAVE_STRFTIME
|
1999-12-29 15:20:26 +01:00
|
|
|
/* format: "Tue, 15 Nov 1994 12:45:26 GMT" */
|
2001-11-16 12:21:50 +01:00
|
|
|
strftime(buf, BUFSIZE-1, "%a, %d %b %Y %H:%M:%S GMT", thistime);
|
1999-12-29 15:20:26 +01:00
|
|
|
#else
|
2000-01-16 19:52:24 +01:00
|
|
|
/* TODO: Right, we *could* write a replacement here */
|
1999-12-29 15:20:26 +01:00
|
|
|
strcpy(buf, "no strftime() support");
|
|
|
|
#endif
|
2001-08-31 00:48:34 +02:00
|
|
|
switch(data->set.timecondition) {
|
2002-04-23 01:53:15 +02:00
|
|
|
case CURL_TIMECOND_IFMODSINCE:
|
1999-12-29 15:20:26 +01:00
|
|
|
default:
|
2000-10-03 13:01:32 +02:00
|
|
|
add_bufferf(req_buffer,
|
|
|
|
"If-Modified-Since: %s\r\n", buf);
|
1999-12-29 15:20:26 +01:00
|
|
|
break;
|
2002-04-23 01:53:15 +02:00
|
|
|
case CURL_TIMECOND_IFUNMODSINCE:
|
2000-10-03 13:01:32 +02:00
|
|
|
add_bufferf(req_buffer,
|
|
|
|
"If-Unmodified-Since: %s\r\n", buf);
|
1999-12-29 15:20:26 +01:00
|
|
|
break;
|
2002-04-23 01:53:15 +02:00
|
|
|
case CURL_TIMECOND_LASTMOD:
|
2000-10-03 13:01:32 +02:00
|
|
|
add_bufferf(req_buffer,
|
|
|
|
"Last-Modified: %s\r\n", buf);
|
1999-12-29 15:20:26 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-06-05 10:23:50 +02:00
|
|
|
while(headers) {
|
2000-07-31 23:30:19 +02:00
|
|
|
char *ptr = strchr(headers->data, ':');
|
|
|
|
if(ptr) {
|
|
|
|
/* we require a colon for this to be a true header */
|
|
|
|
|
|
|
|
ptr++; /* pass the colon */
|
2000-11-21 10:31:03 +01:00
|
|
|
while(*ptr && isspace((int)*ptr))
|
2000-07-31 23:30:19 +02:00
|
|
|
ptr++;
|
|
|
|
|
|
|
|
if(*ptr) {
|
|
|
|
/* only send this if the contents was non-blank */
|
|
|
|
|
2000-10-03 13:01:32 +02:00
|
|
|
add_bufferf(req_buffer, "%s\r\n", headers->data);
|
2000-07-31 23:30:19 +02:00
|
|
|
}
|
|
|
|
}
|
2000-06-05 10:23:50 +02:00
|
|
|
headers = headers->next;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
|
2002-03-14 15:39:23 +01:00
|
|
|
switch(data->set.httpreq) {
|
|
|
|
|
|
|
|
case HTTPREQ_POST_FORM:
|
2001-01-05 11:11:41 +01:00
|
|
|
if(Curl_FormInit(&http->form, http->sendit)) {
|
2001-12-11 14:13:01 +01:00
|
|
|
failf(data, "Internal HTTP POST error!");
|
2000-06-14 19:15:07 +02:00
|
|
|
return CURLE_HTTP_POST_ERROR;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
|
2002-12-09 16:37:54 +01:00
|
|
|
/* set the read function to read from the generated form data */
|
|
|
|
conn->fread = (curl_read_callback)Curl_FormReader;
|
|
|
|
conn->fread_in = &http->form;
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2002-12-10 14:10:00 +01:00
|
|
|
http->sending = HTTPSEND_BODY;
|
|
|
|
|
2002-12-01 12:20:41 +01:00
|
|
|
if(!conn->bits.upload_chunky)
|
|
|
|
/* only add Content-Length if not uploading chunked */
|
|
|
|
add_bufferf(req_buffer,
|
|
|
|
"Content-Length: %d\r\n", http->postsize);
|
2000-02-14 23:57:42 +01:00
|
|
|
|
2001-08-21 15:18:07 +02:00
|
|
|
if(!checkheaders(data, "Expect:")) {
|
|
|
|
/* if not disabled explicitly we add a Expect: 100-continue
|
|
|
|
to the headers which actually speeds up post operations (as
|
|
|
|
there is one packet coming back from the web server) */
|
|
|
|
add_bufferf(req_buffer,
|
|
|
|
"Expect: 100-continue\r\n");
|
2001-08-31 00:48:34 +02:00
|
|
|
data->set.expect100header = TRUE;
|
2002-02-17 15:42:44 +01:00
|
|
|
}
|
2001-08-21 15:18:07 +02:00
|
|
|
|
2002-02-17 15:42:44 +01:00
|
|
|
if(!checkheaders(data, "Content-Type:")) {
|
2001-08-21 15:18:07 +02:00
|
|
|
/* Get Content-Type: line from Curl_FormReadOneLine, which happens
|
|
|
|
to always be the first line. We can know this for sure since
|
2002-02-17 15:42:44 +01:00
|
|
|
we always build the formpost linked list the same way!
|
|
|
|
|
|
|
|
The Content-Type header line also contains the MIME boundary
|
|
|
|
string etc why disabling this header is likely to not make things
|
|
|
|
work, but we support it anyway.
|
|
|
|
*/
|
|
|
|
char contentType[256];
|
|
|
|
int linelength=0;
|
2001-08-21 15:18:07 +02:00
|
|
|
linelength = Curl_FormReadOneLine (contentType,
|
|
|
|
sizeof(contentType),
|
|
|
|
1,
|
|
|
|
(FILE *)&http->form);
|
|
|
|
if(linelength == -1) {
|
2001-12-11 14:13:01 +01:00
|
|
|
failf(data, "Could not get Content-Type header line!");
|
2001-08-21 15:18:07 +02:00
|
|
|
return CURLE_HTTP_POST_ERROR;
|
|
|
|
}
|
|
|
|
add_buffer(req_buffer, contentType, linelength);
|
|
|
|
}
|
|
|
|
|
2002-02-17 15:42:44 +01:00
|
|
|
/* make the request end in a true CRLF */
|
|
|
|
add_buffer(req_buffer, "\r\n", 2);
|
|
|
|
|
2000-10-03 13:01:32 +02:00
|
|
|
/* set upload size to the progress meter */
|
2001-01-05 11:11:41 +01:00
|
|
|
Curl_pgrsSetUploadSize(data, http->postsize);
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2001-08-21 15:18:07 +02:00
|
|
|
/* fire away the whole request to the server */
|
2002-12-09 16:37:54 +01:00
|
|
|
result = add_buffer_send(req_buffer, conn->firstsocket, conn,
|
2001-10-31 15:57:00 +01:00
|
|
|
&data->info.request_size);
|
|
|
|
if(result)
|
|
|
|
failf(data, "Failed sending POST request");
|
|
|
|
else
|
|
|
|
/* setup variables for the upcoming transfer */
|
|
|
|
result = Curl_Transfer(conn, conn->firstsocket, -1, TRUE,
|
|
|
|
&http->readbytecount,
|
|
|
|
conn->firstsocket,
|
|
|
|
&http->writebytecount);
|
2000-06-14 19:15:07 +02:00
|
|
|
if(result) {
|
2001-08-06 14:36:18 +02:00
|
|
|
Curl_formclean(http->sendit); /* free that whole lot */
|
2000-06-14 19:15:07 +02:00
|
|
|
return result;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
2002-03-14 15:39:23 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
case HTTPREQ_PUT: /* Let's PUT the data to the server! */
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2002-12-01 12:20:41 +01:00
|
|
|
if((data->set.infilesize>0) && !conn->bits.upload_chunky)
|
|
|
|
/* only add Content-Length if not uploading chunked */
|
2000-10-03 13:01:32 +02:00
|
|
|
add_bufferf(req_buffer,
|
2002-12-01 12:20:41 +01:00
|
|
|
"Content-Length: %d\r\n", /* file size */
|
2001-08-31 00:48:34 +02:00
|
|
|
data->set.infilesize );
|
2002-12-01 12:20:41 +01:00
|
|
|
|
|
|
|
add_bufferf(req_buffer, "\r\n");
|
2000-02-14 23:57:42 +01:00
|
|
|
|
2000-10-03 13:01:32 +02:00
|
|
|
/* set the upload size to the progress meter */
|
2001-08-31 00:48:34 +02:00
|
|
|
Curl_pgrsSetUploadSize(data, data->set.infilesize);
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2000-10-03 13:01:32 +02:00
|
|
|
/* this sends the buffer and frees all the buffer resources */
|
2002-12-09 16:37:54 +01:00
|
|
|
result = add_buffer_send(req_buffer, conn->firstsocket, conn,
|
2001-10-31 15:57:00 +01:00
|
|
|
&data->info.request_size);
|
|
|
|
if(result)
|
2002-12-09 16:37:54 +01:00
|
|
|
failf(data, "Failed sending POST request");
|
2001-10-31 15:57:00 +01:00
|
|
|
else
|
|
|
|
/* prepare for transfer */
|
|
|
|
result = Curl_Transfer(conn, conn->firstsocket, -1, TRUE,
|
|
|
|
&http->readbytecount,
|
|
|
|
conn->firstsocket,
|
|
|
|
&http->writebytecount);
|
1999-12-29 15:20:26 +01:00
|
|
|
if(result)
|
|
|
|
return result;
|
2002-03-14 15:39:23 +01:00
|
|
|
break;
|
2001-08-15 15:38:36 +02:00
|
|
|
|
2002-03-14 15:39:23 +01:00
|
|
|
case HTTPREQ_POST:
|
|
|
|
/* this is the simple POST, using x-www-form-urlencoded style */
|
2000-08-11 08:39:53 +02:00
|
|
|
|
2002-12-01 12:20:41 +01:00
|
|
|
if(!conn->bits.upload_chunky) {
|
|
|
|
/* We only set Content-Length and allow a custom Content-Length if
|
|
|
|
we don't upload data chunked, as RFC2616 forbids us to set both
|
|
|
|
kinds of headers (Transfer-Encoding: chunked and Content-Length) */
|
|
|
|
|
|
|
|
if(!checkheaders(data, "Content-Length:"))
|
|
|
|
/* we allow replacing this header, although it isn't very wise to
|
|
|
|
actually set your own */
|
|
|
|
add_bufferf(req_buffer,
|
|
|
|
"Content-Length: %d\r\n",
|
|
|
|
data->set.postfieldsize?
|
|
|
|
data->set.postfieldsize:
|
|
|
|
(data->set.postfields?strlen(data->set.postfields):0) );
|
|
|
|
}
|
2000-08-11 08:39:53 +02:00
|
|
|
|
2002-03-14 15:39:23 +01:00
|
|
|
if(!checkheaders(data, "Content-Type:"))
|
|
|
|
add_bufferf(req_buffer,
|
|
|
|
"Content-Type: application/x-www-form-urlencoded\r\n");
|
|
|
|
|
|
|
|
add_buffer(req_buffer, "\r\n", 2);
|
|
|
|
|
2002-12-09 17:05:57 +01:00
|
|
|
/* and here we setup the pointers to the actual data */
|
|
|
|
if(data->set.postfields) {
|
|
|
|
if(data->set.postfieldsize)
|
|
|
|
http->postsize = data->set.postfieldsize;
|
|
|
|
else
|
|
|
|
http->postsize = strlen(data->set.postfields);
|
|
|
|
http->postdata = data->set.postfields;
|
|
|
|
|
2002-12-10 14:10:00 +01:00
|
|
|
http->sending = HTTPSEND_BODY;
|
|
|
|
|
|
|
|
conn->fread = (curl_read_callback)readmoredata;
|
|
|
|
conn->fread_in = (void *)conn;
|
|
|
|
|
|
|
|
/* set the upload size to the progress meter */
|
|
|
|
Curl_pgrsSetUploadSize(data, http->postsize);
|
2000-06-14 19:15:07 +02:00
|
|
|
}
|
2002-12-10 14:10:00 +01:00
|
|
|
else
|
|
|
|
/* set the upload size to the progress meter */
|
|
|
|
Curl_pgrsSetUploadSize(data, data->set.infilesize);
|
2002-03-14 15:39:23 +01:00
|
|
|
|
2002-12-09 17:05:57 +01:00
|
|
|
/* issue the request, headers-only */
|
2002-12-09 16:37:54 +01:00
|
|
|
result = add_buffer_send(req_buffer, conn->firstsocket, conn,
|
2002-03-14 15:39:23 +01:00
|
|
|
&data->info.request_size);
|
|
|
|
|
|
|
|
if(result)
|
|
|
|
failf(data, "Failed sending HTTP POST request");
|
2000-06-14 19:15:07 +02:00
|
|
|
else
|
2002-03-14 15:39:23 +01:00
|
|
|
result =
|
2002-09-13 14:40:36 +02:00
|
|
|
Curl_Transfer(conn, conn->firstsocket, -1, TRUE,
|
|
|
|
&http->readbytecount,
|
2002-12-09 17:05:57 +01:00
|
|
|
conn->firstsocket,
|
|
|
|
&http->writebytecount);
|
2002-03-14 15:39:23 +01:00
|
|
|
break;
|
2000-05-22 16:12:12 +02:00
|
|
|
|
2002-03-14 15:39:23 +01:00
|
|
|
default:
|
|
|
|
add_buffer(req_buffer, "\r\n", 2);
|
|
|
|
|
2000-10-04 15:07:43 +02:00
|
|
|
/* issue the request */
|
2002-12-09 16:37:54 +01:00
|
|
|
result = add_buffer_send(req_buffer, conn->firstsocket, conn,
|
2001-10-31 15:57:00 +01:00
|
|
|
&data->info.request_size);
|
2000-10-04 15:07:43 +02:00
|
|
|
|
2001-10-31 15:57:00 +01:00
|
|
|
if(result)
|
|
|
|
failf(data, "Failed sending HTTP request");
|
|
|
|
else
|
|
|
|
/* HTTP GET/HEAD download: */
|
2002-09-13 14:40:36 +02:00
|
|
|
result = Curl_Transfer(conn, conn->firstsocket, -1, TRUE,
|
|
|
|
&http->readbytecount,
|
2002-12-10 14:10:00 +01:00
|
|
|
http->postdata?conn->firstsocket:-1,
|
|
|
|
http->postdata?&http->writebytecount:NULL);
|
2000-02-02 00:52:11 +01:00
|
|
|
}
|
1999-12-29 15:20:26 +01:00
|
|
|
if(result)
|
|
|
|
return result;
|
|
|
|
} while (0); /* this is just a left-over from the multiple document download
|
|
|
|
attempts */
|
|
|
|
|
2000-05-22 16:12:12 +02:00
|
|
|
return CURLE_OK;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
|
2001-09-07 06:01:32 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* local variables:
|
|
|
|
* eval: (load-file "../curl-mode.el")
|
|
|
|
* end:
|
2001-10-11 11:32:19 +02:00
|
|
|
* vim600: fdm=marker
|
|
|
|
* vim: et sw=2 ts=2 sts=2 tw=78
|
2001-09-07 06:01:32 +02:00
|
|
|
*/
|
2002-06-11 13:13:01 +02:00
|
|
|
#endif
|