mirror of
https://github.com/moparisthebest/curl
synced 2024-12-23 00:28:48 -05:00
bdec6f2b20
curl_easy_duphandle did not necessarily duplicate the CURLOPT_COOKIEFILE option. It only enabled the cookie engine in the destination handle if data->cookies is not NULL (where data is the source handle). In case of a newly initialized handle which just had the cookie support enabled by a curl_easy_setopt(handle, CURL_COOKIEFILE, "")-call, handle->cookies was still NULL because the setopt-call only appends the value to data->change.cookielist, hence duplicating this handle would not have the cookie engine switched on. We also concluded that the slist-functionality would be suitable for being put in its own module rather than simply hanging out in lib/sendf.c so I created lib/slist.[ch] for them.
689 lines
20 KiB
C
689 lines
20 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at http://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* $Id$
|
|
***************************************************************************/
|
|
|
|
#include "setup.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
|
|
#ifdef HAVE_SYS_SOCKET_H
|
|
#include <sys/socket.h> /* required for send() & recv() prototypes */
|
|
#endif
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include <curl/curl.h>
|
|
#include "urldata.h"
|
|
#include "sendf.h"
|
|
#include "connect.h"
|
|
#include "sslgen.h"
|
|
#include "ssh.h"
|
|
#include "multiif.h"
|
|
|
|
#define _MPRINTF_REPLACE /* use the internal *printf() functions */
|
|
#include <curl/mprintf.h>
|
|
|
|
/* the krb4 functions only exists for FTP and if krb4 or gssapi is defined */
|
|
#if !defined(CURL_DISABLE_FTP) && (defined(HAVE_KRB4) || defined(HAVE_GSSAPI))
|
|
#include "krb4.h"
|
|
#else
|
|
#define Curl_sec_send(a,b,c,d) -1
|
|
#define Curl_sec_read(a,b,c,d) -1
|
|
#endif
|
|
|
|
#include <string.h>
|
|
#include "memory.h"
|
|
#include "strerror.h"
|
|
#include "easyif.h" /* for the Curl_convert_from_network prototype */
|
|
/* The last #include file should be: */
|
|
#include "memdebug.h"
|
|
|
|
#ifdef CURL_DO_LINEEND_CONV
|
|
/*
|
|
* convert_lineends() changes CRLF (\r\n) end-of-line markers to a single LF
|
|
* (\n), with special processing for CRLF sequences that are split between two
|
|
* blocks of data. Remaining, bare CRs are changed to LFs. The possibly new
|
|
* size of the data is returned.
|
|
*/
|
|
static size_t convert_lineends(struct SessionHandle *data,
|
|
char *startPtr, size_t size)
|
|
{
|
|
char *inPtr, *outPtr;
|
|
|
|
/* sanity check */
|
|
if((startPtr == NULL) || (size < 1)) {
|
|
return(size);
|
|
}
|
|
|
|
if(data->state.prev_block_had_trailing_cr == TRUE) {
|
|
/* The previous block of incoming data
|
|
had a trailing CR, which was turned into a LF. */
|
|
if(*startPtr == '\n') {
|
|
/* This block of incoming data starts with the
|
|
previous block's LF so get rid of it */
|
|
memmove(startPtr, startPtr+1, size-1);
|
|
size--;
|
|
/* and it wasn't a bare CR but a CRLF conversion instead */
|
|
data->state.crlf_conversions++;
|
|
}
|
|
data->state.prev_block_had_trailing_cr = FALSE; /* reset the flag */
|
|
}
|
|
|
|
/* find 1st CR, if any */
|
|
inPtr = outPtr = memchr(startPtr, '\r', size);
|
|
if(inPtr) {
|
|
/* at least one CR, now look for CRLF */
|
|
while(inPtr < (startPtr+size-1)) {
|
|
/* note that it's size-1, so we'll never look past the last byte */
|
|
if(memcmp(inPtr, "\r\n", 2) == 0) {
|
|
/* CRLF found, bump past the CR and copy the NL */
|
|
inPtr++;
|
|
*outPtr = *inPtr;
|
|
/* keep track of how many CRLFs we converted */
|
|
data->state.crlf_conversions++;
|
|
}
|
|
else {
|
|
if(*inPtr == '\r') {
|
|
/* lone CR, move LF instead */
|
|
*outPtr = '\n';
|
|
}
|
|
else {
|
|
/* not a CRLF nor a CR, just copy whatever it is */
|
|
*outPtr = *inPtr;
|
|
}
|
|
}
|
|
outPtr++;
|
|
inPtr++;
|
|
} /* end of while loop */
|
|
|
|
if(inPtr < startPtr+size) {
|
|
/* handle last byte */
|
|
if(*inPtr == '\r') {
|
|
/* deal with a CR at the end of the buffer */
|
|
*outPtr = '\n'; /* copy a NL instead */
|
|
/* note that a CRLF might be split across two blocks */
|
|
data->state.prev_block_had_trailing_cr = TRUE;
|
|
}
|
|
else {
|
|
/* copy last byte */
|
|
*outPtr = *inPtr;
|
|
}
|
|
outPtr++;
|
|
inPtr++;
|
|
}
|
|
if(outPtr < startPtr+size) {
|
|
/* tidy up by null terminating the now shorter data */
|
|
*outPtr = '\0';
|
|
}
|
|
return(outPtr - startPtr);
|
|
}
|
|
return(size);
|
|
}
|
|
#endif /* CURL_DO_LINEEND_CONV */
|
|
|
|
/* Curl_infof() is for info message along the way */
|
|
|
|
void Curl_infof(struct SessionHandle *data, const char *fmt, ...)
|
|
{
|
|
if(data && data->set.verbose) {
|
|
va_list ap;
|
|
size_t len;
|
|
char print_buffer[2048 + 1];
|
|
va_start(ap, fmt);
|
|
vsnprintf(print_buffer, sizeof(print_buffer), fmt, ap);
|
|
va_end(ap);
|
|
len = strlen(print_buffer);
|
|
Curl_debug(data, CURLINFO_TEXT, print_buffer, len, NULL);
|
|
}
|
|
}
|
|
|
|
/* Curl_failf() is for messages stating why we failed.
|
|
* The message SHALL NOT include any LF or CR.
|
|
*/
|
|
|
|
void Curl_failf(struct SessionHandle *data, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
size_t len;
|
|
va_start(ap, fmt);
|
|
|
|
vsnprintf(data->state.buffer, BUFSIZE, fmt, ap);
|
|
|
|
if(data->set.errorbuffer && !data->state.errorbuf) {
|
|
snprintf(data->set.errorbuffer, CURL_ERROR_SIZE, "%s", data->state.buffer);
|
|
data->state.errorbuf = TRUE; /* wrote error string */
|
|
}
|
|
if(data->set.verbose) {
|
|
len = strlen(data->state.buffer);
|
|
if(len < BUFSIZE - 1) {
|
|
data->state.buffer[len] = '\n';
|
|
data->state.buffer[++len] = '\0';
|
|
}
|
|
Curl_debug(data, CURLINFO_TEXT, data->state.buffer, len, NULL);
|
|
}
|
|
|
|
va_end(ap);
|
|
}
|
|
|
|
/* Curl_sendf() sends formated data to the server */
|
|
CURLcode Curl_sendf(curl_socket_t sockfd, struct connectdata *conn,
|
|
const char *fmt, ...)
|
|
{
|
|
struct SessionHandle *data = conn->data;
|
|
ssize_t bytes_written;
|
|
size_t write_len;
|
|
CURLcode res = CURLE_OK;
|
|
char *s;
|
|
char *sptr;
|
|
va_list ap;
|
|
va_start(ap, fmt);
|
|
s = vaprintf(fmt, ap); /* returns an allocated string */
|
|
va_end(ap);
|
|
if(!s)
|
|
return CURLE_OUT_OF_MEMORY; /* failure */
|
|
|
|
bytes_written=0;
|
|
write_len = strlen(s);
|
|
sptr = s;
|
|
|
|
while(1) {
|
|
/* Write the buffer to the socket */
|
|
res = Curl_write(conn, sockfd, sptr, write_len, &bytes_written);
|
|
|
|
if(CURLE_OK != res)
|
|
break;
|
|
|
|
if(data->set.verbose)
|
|
Curl_debug(data, CURLINFO_DATA_OUT, sptr, (size_t)bytes_written, conn);
|
|
|
|
if((size_t)bytes_written != write_len) {
|
|
/* if not all was written at once, we must advance the pointer, decrease
|
|
the size left and try again! */
|
|
write_len -= bytes_written;
|
|
sptr += bytes_written;
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
|
|
free(s); /* free the output string */
|
|
|
|
return res;
|
|
}
|
|
|
|
static ssize_t send_plain(struct connectdata *conn,
|
|
int num,
|
|
const void *mem,
|
|
size_t len)
|
|
{
|
|
curl_socket_t sockfd = conn->sock[num];
|
|
ssize_t bytes_written = swrite(sockfd, mem, len);
|
|
|
|
if(-1 == bytes_written) {
|
|
int err = SOCKERRNO;
|
|
|
|
if(
|
|
#ifdef WSAEWOULDBLOCK
|
|
/* This is how Windows does it */
|
|
(WSAEWOULDBLOCK == err)
|
|
#else
|
|
/* errno may be EWOULDBLOCK or on some systems EAGAIN when it returned
|
|
due to its inability to send off data without blocking. We therefor
|
|
treat both error codes the same here */
|
|
(EWOULDBLOCK == err) || (EAGAIN == err) || (EINTR == err)
|
|
#endif
|
|
)
|
|
/* this is just a case of EWOULDBLOCK */
|
|
bytes_written=0;
|
|
else
|
|
failf(conn->data, "Send failure: %s",
|
|
Curl_strerror(conn, err));
|
|
}
|
|
return bytes_written;
|
|
}
|
|
|
|
/*
|
|
* Curl_write() is an internal write function that sends data to the
|
|
* server. Works with plain sockets, SCP, SSL or kerberos.
|
|
*/
|
|
CURLcode Curl_write(struct connectdata *conn,
|
|
curl_socket_t sockfd,
|
|
const void *mem,
|
|
size_t len,
|
|
ssize_t *written)
|
|
{
|
|
ssize_t bytes_written;
|
|
CURLcode retcode;
|
|
int num = (sockfd == conn->sock[SECONDARYSOCKET]);
|
|
|
|
if(conn->ssl[num].state == ssl_connection_complete)
|
|
bytes_written = Curl_ssl_send(conn, num, mem, len);
|
|
else if(Curl_ssh_enabled(conn, PROT_SCP))
|
|
bytes_written = Curl_scp_send(conn, num, mem, len);
|
|
else if(Curl_ssh_enabled(conn, PROT_SFTP))
|
|
bytes_written = Curl_sftp_send(conn, num, mem, len);
|
|
else if(conn->sec_complete)
|
|
bytes_written = Curl_sec_send(conn, num, mem, len);
|
|
else
|
|
bytes_written = send_plain(conn, num, mem, len);
|
|
|
|
*written = bytes_written;
|
|
retcode = (-1 != bytes_written)?CURLE_OK:CURLE_SEND_ERROR;
|
|
|
|
return retcode;
|
|
}
|
|
|
|
/*
|
|
* Curl_write_plain() is an internal write function that sends data to the
|
|
* server using plain sockets only. Otherwise meant to have the exact same
|
|
* proto as Curl_write()
|
|
*/
|
|
CURLcode Curl_write_plain(struct connectdata *conn,
|
|
curl_socket_t sockfd,
|
|
const void *mem,
|
|
size_t len,
|
|
ssize_t *written)
|
|
{
|
|
ssize_t bytes_written;
|
|
CURLcode retcode;
|
|
int num = (sockfd == conn->sock[SECONDARYSOCKET]);
|
|
|
|
bytes_written = send_plain(conn, num, mem, len);
|
|
|
|
*written = bytes_written;
|
|
retcode = (-1 != bytes_written)?CURLE_OK:CURLE_SEND_ERROR;
|
|
|
|
return retcode;
|
|
}
|
|
|
|
static CURLcode pausewrite(struct SessionHandle *data,
|
|
int type, /* what type of data */
|
|
const char *ptr,
|
|
size_t len)
|
|
{
|
|
/* signalled to pause sending on this connection, but since we have data
|
|
we want to send we need to dup it to save a copy for when the sending
|
|
is again enabled */
|
|
struct SingleRequest *k = &data->req;
|
|
char *dupl = malloc(len);
|
|
if(!dupl)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
memcpy(dupl, ptr, len);
|
|
|
|
/* store this information in the state struct for later use */
|
|
data->state.tempwrite = dupl;
|
|
data->state.tempwritesize = len;
|
|
data->state.tempwritetype = type;
|
|
|
|
/* mark the connection as RECV paused */
|
|
k->keepon |= KEEP_READ_PAUSE;
|
|
|
|
DEBUGF(infof(data, "Pausing with %d bytes in buffer for type %02x\n",
|
|
(int)len, type));
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
|
|
/* Curl_client_write() sends data to the write callback(s)
|
|
|
|
The bit pattern defines to what "streams" to write to. Body and/or header.
|
|
The defines are in sendf.h of course.
|
|
|
|
If CURL_DO_LINEEND_CONV is enabled, data is converted IN PLACE to the
|
|
local character encoding. This is a problem and should be changed in
|
|
the future to leave the original data alone.
|
|
*/
|
|
CURLcode Curl_client_write(struct connectdata *conn,
|
|
int type,
|
|
char *ptr,
|
|
size_t len)
|
|
{
|
|
struct SessionHandle *data = conn->data;
|
|
size_t wrote;
|
|
|
|
if(0 == len)
|
|
len = strlen(ptr);
|
|
|
|
/* If reading is actually paused, we're forced to append this chunk of data
|
|
to the already held data, but only if it is the same type as otherwise it
|
|
can't work and it'll return error instead. */
|
|
if(data->req.keepon & KEEP_READ_PAUSE) {
|
|
size_t newlen;
|
|
char *newptr;
|
|
if(type != data->state.tempwritetype)
|
|
/* major internal confusion */
|
|
return CURLE_RECV_ERROR;
|
|
|
|
DEBUGASSERT(data->state.tempwrite);
|
|
|
|
/* figure out the new size of the data to save */
|
|
newlen = len + data->state.tempwritesize;
|
|
/* allocate the new memory area */
|
|
newptr = realloc(data->state.tempwrite, newlen);
|
|
if(!newptr)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
/* copy the new data to the end of the new area */
|
|
memcpy(newptr + data->state.tempwritesize, ptr, len);
|
|
/* update the pointer and the size */
|
|
data->state.tempwrite = newptr;
|
|
data->state.tempwritesize = newlen;
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
if(type & CLIENTWRITE_BODY) {
|
|
if((conn->protocol&PROT_FTP) && conn->proto.ftpc.transfertype == 'A') {
|
|
#ifdef CURL_DOES_CONVERSIONS
|
|
/* convert from the network encoding */
|
|
size_t rc;
|
|
rc = Curl_convert_from_network(data, ptr, len);
|
|
/* Curl_convert_from_network calls failf if unsuccessful */
|
|
if(rc != CURLE_OK)
|
|
return rc;
|
|
#endif /* CURL_DOES_CONVERSIONS */
|
|
|
|
#ifdef CURL_DO_LINEEND_CONV
|
|
/* convert end-of-line markers */
|
|
len = convert_lineends(data, ptr, len);
|
|
#endif /* CURL_DO_LINEEND_CONV */
|
|
}
|
|
/* If the previous block of data ended with CR and this block of data is
|
|
just a NL, then the length might be zero */
|
|
if(len) {
|
|
wrote = data->set.fwrite_func(ptr, 1, len, data->set.out);
|
|
}
|
|
else {
|
|
wrote = len;
|
|
}
|
|
|
|
if(CURL_WRITEFUNC_PAUSE == wrote)
|
|
return pausewrite(data, type, ptr, len);
|
|
|
|
if(wrote != len) {
|
|
failf(data, "Failed writing body (%d != %d)", (int)wrote, (int)len);
|
|
return CURLE_WRITE_ERROR;
|
|
}
|
|
}
|
|
|
|
if((type & CLIENTWRITE_HEADER) &&
|
|
(data->set.fwrite_header || data->set.writeheader) ) {
|
|
/*
|
|
* Write headers to the same callback or to the especially setup
|
|
* header callback function (added after version 7.7.1).
|
|
*/
|
|
curl_write_callback writeit=
|
|
data->set.fwrite_header?data->set.fwrite_header:data->set.fwrite_func;
|
|
|
|
/* Note: The header is in the host encoding
|
|
regardless of the ftp transfer mode (ASCII/Image) */
|
|
|
|
wrote = writeit(ptr, 1, len, data->set.writeheader);
|
|
if(CURL_WRITEFUNC_PAUSE == wrote)
|
|
/* here we pass in the HEADER bit only since if this was body as well
|
|
then it was passed already and clearly that didn't trigger the pause,
|
|
so this is saved for later with the HEADER bit only */
|
|
return pausewrite(data, CLIENTWRITE_HEADER, ptr, len);
|
|
|
|
if(wrote != len) {
|
|
failf (data, "Failed writing header");
|
|
return CURLE_WRITE_ERROR;
|
|
}
|
|
}
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
int Curl_read_plain(curl_socket_t sockfd,
|
|
char *buf,
|
|
size_t bytesfromsocket,
|
|
ssize_t *n)
|
|
{
|
|
ssize_t nread = sread(sockfd, buf, bytesfromsocket);
|
|
|
|
if(-1 == nread) {
|
|
int err = SOCKERRNO;
|
|
#ifdef USE_WINSOCK
|
|
if(WSAEWOULDBLOCK == err)
|
|
#else
|
|
if((EWOULDBLOCK == err) || (EAGAIN == err) || (EINTR == err))
|
|
#endif
|
|
return -1;
|
|
else
|
|
return CURLE_RECV_ERROR;
|
|
}
|
|
|
|
/* we only return number of bytes read when we return OK */
|
|
*n = nread;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
/*
|
|
* Internal read-from-socket function. This is meant to deal with plain
|
|
* sockets, SSL sockets and kerberos sockets.
|
|
*
|
|
* If the read would block (EWOULDBLOCK) we return -1. Otherwise we return
|
|
* a regular CURLcode value.
|
|
*/
|
|
int Curl_read(struct connectdata *conn, /* connection data */
|
|
curl_socket_t sockfd, /* read from this socket */
|
|
char *buf, /* store read data here */
|
|
size_t sizerequested, /* max amount to read */
|
|
ssize_t *n) /* amount bytes read */
|
|
{
|
|
ssize_t nread = 0;
|
|
size_t bytesfromsocket = 0;
|
|
char *buffertofill = NULL;
|
|
bool pipelining = (bool)(conn->data->multi &&
|
|
Curl_multi_canPipeline(conn->data->multi));
|
|
|
|
/* Set 'num' to 0 or 1, depending on which socket that has been sent here.
|
|
If it is the second socket, we set num to 1. Otherwise to 0. This lets
|
|
us use the correct ssl handle. */
|
|
int num = (sockfd == conn->sock[SECONDARYSOCKET]);
|
|
|
|
*n=0; /* reset amount to zero */
|
|
|
|
/* If session can pipeline, check connection buffer */
|
|
if(pipelining) {
|
|
size_t bytestocopy = CURLMIN(conn->buf_len - conn->read_pos, sizerequested);
|
|
|
|
/* Copy from our master buffer first if we have some unread data there*/
|
|
if(bytestocopy > 0) {
|
|
memcpy(buf, conn->master_buffer + conn->read_pos, bytestocopy);
|
|
conn->read_pos += bytestocopy;
|
|
conn->bits.stream_was_rewound = FALSE;
|
|
|
|
*n = (ssize_t)bytestocopy;
|
|
return CURLE_OK;
|
|
}
|
|
/* If we come here, it means that there is no data to read from the buffer,
|
|
* so we read from the socket */
|
|
bytesfromsocket = CURLMIN(sizerequested, BUFSIZE * sizeof (char));
|
|
buffertofill = conn->master_buffer;
|
|
}
|
|
else {
|
|
bytesfromsocket = CURLMIN((long)sizerequested, conn->data->set.buffer_size ?
|
|
conn->data->set.buffer_size : BUFSIZE);
|
|
buffertofill = buf;
|
|
}
|
|
|
|
if(conn->ssl[num].state == ssl_connection_complete) {
|
|
nread = Curl_ssl_recv(conn, num, buffertofill, bytesfromsocket);
|
|
|
|
if(nread == -1) {
|
|
return -1; /* -1 from Curl_ssl_recv() means EWOULDBLOCK */
|
|
}
|
|
}
|
|
else if(Curl_ssh_enabled(conn, (PROT_SCP|PROT_SFTP))) {
|
|
if(conn->protocol & PROT_SCP)
|
|
nread = Curl_scp_recv(conn, num, buffertofill, bytesfromsocket);
|
|
else if(conn->protocol & PROT_SFTP)
|
|
nread = Curl_sftp_recv(conn, num, buffertofill, bytesfromsocket);
|
|
#ifdef LIBSSH2CHANNEL_EAGAIN
|
|
if((nread == LIBSSH2CHANNEL_EAGAIN) || (nread == 0))
|
|
/* EWOULDBLOCK */
|
|
return -1;
|
|
#endif
|
|
if(nread < 0)
|
|
/* since it is negative and not EAGAIN, it was a protocol-layer error */
|
|
return CURLE_RECV_ERROR;
|
|
}
|
|
else {
|
|
if(conn->sec_complete)
|
|
nread = Curl_sec_read(conn, sockfd, buffertofill,
|
|
bytesfromsocket);
|
|
/* TODO: Need to handle EAGAIN here somehow, similar to how it
|
|
* is done in Curl_read_plain, either right here or in Curl_sec_read
|
|
* itself. */
|
|
else {
|
|
int ret = Curl_read_plain(sockfd, buffertofill, bytesfromsocket,
|
|
&nread);
|
|
if(ret)
|
|
return ret;
|
|
}
|
|
}
|
|
if(nread >= 0) {
|
|
if(pipelining) {
|
|
memcpy(buf, conn->master_buffer, nread);
|
|
conn->buf_len = nread;
|
|
conn->read_pos = nread;
|
|
}
|
|
|
|
*n += nread;
|
|
}
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
/* return 0 on success */
|
|
static int showit(struct SessionHandle *data, curl_infotype type,
|
|
char *ptr, size_t size)
|
|
{
|
|
static const char s_infotype[CURLINFO_END][3] = {
|
|
"* ", "< ", "> ", "{ ", "} ", "{ ", "} " };
|
|
|
|
#ifdef CURL_DOES_CONVERSIONS
|
|
char buf[BUFSIZE+1];
|
|
size_t conv_size = 0;
|
|
|
|
switch(type) {
|
|
case CURLINFO_HEADER_OUT:
|
|
/* assume output headers are ASCII */
|
|
/* copy the data into my buffer so the original is unchanged */
|
|
if(size > BUFSIZE) {
|
|
size = BUFSIZE; /* truncate if necessary */
|
|
buf[BUFSIZE] = '\0';
|
|
}
|
|
conv_size = size;
|
|
memcpy(buf, ptr, size);
|
|
/* Special processing is needed for this block if it
|
|
* contains both headers and data (separated by CRLFCRLF).
|
|
* We want to convert just the headers, leaving the data as-is.
|
|
*/
|
|
if(size > 4) {
|
|
size_t i;
|
|
for(i = 0; i < size-4; i++) {
|
|
if(memcmp(&buf[i], "\x0d\x0a\x0d\x0a", 4) == 0) {
|
|
/* convert everthing through this CRLFCRLF but no further */
|
|
conv_size = i + 4;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
Curl_convert_from_network(data, buf, conv_size);
|
|
/* Curl_convert_from_network calls failf if unsuccessful */
|
|
/* we might as well continue even if it fails... */
|
|
ptr = buf; /* switch pointer to use my buffer instead */
|
|
break;
|
|
default:
|
|
/* leave everything else as-is */
|
|
break;
|
|
}
|
|
#endif /* CURL_DOES_CONVERSIONS */
|
|
|
|
if(data->set.fdebug)
|
|
return (*data->set.fdebug)(data, type, ptr, size,
|
|
data->set.debugdata);
|
|
|
|
switch(type) {
|
|
case CURLINFO_TEXT:
|
|
case CURLINFO_HEADER_OUT:
|
|
case CURLINFO_HEADER_IN:
|
|
fwrite(s_infotype[type], 2, 1, data->set.err);
|
|
fwrite(ptr, size, 1, data->set.err);
|
|
#ifdef CURL_DOES_CONVERSIONS
|
|
if(size != conv_size) {
|
|
/* we had untranslated data so we need an explicit newline */
|
|
fwrite("\n", 1, 1, data->set.err);
|
|
}
|
|
#endif
|
|
break;
|
|
default: /* nada */
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int Curl_debug(struct SessionHandle *data, curl_infotype type,
|
|
char *ptr, size_t size,
|
|
struct connectdata *conn)
|
|
{
|
|
int rc;
|
|
if(data->set.printhost && conn && conn->host.dispname) {
|
|
char buffer[160];
|
|
const char *t=NULL;
|
|
const char *w="Data";
|
|
switch (type) {
|
|
case CURLINFO_HEADER_IN:
|
|
w = "Header";
|
|
case CURLINFO_DATA_IN:
|
|
t = "from";
|
|
break;
|
|
case CURLINFO_HEADER_OUT:
|
|
w = "Header";
|
|
case CURLINFO_DATA_OUT:
|
|
t = "to";
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
if(t) {
|
|
snprintf(buffer, sizeof(buffer), "[%s %s %s]", w, t,
|
|
conn->host.dispname);
|
|
rc = showit(data, CURLINFO_TEXT, buffer, strlen(buffer));
|
|
if(rc)
|
|
return rc;
|
|
}
|
|
}
|
|
rc = showit(data, type, ptr, size);
|
|
return rc;
|
|
}
|