mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 07:38:49 -05:00
parent
59813726d1
commit
87501e57f1
@ -356,7 +356,7 @@ typedef size_t (*curl_read_callback)(char *buffer,
|
|||||||
size_t nitems,
|
size_t nitems,
|
||||||
void *instream);
|
void *instream);
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
CURLSOCKTYPE_IPCXN, /* socket created for a specific IP connection */
|
CURLSOCKTYPE_IPCXN, /* socket created for a specific IP connection */
|
||||||
CURLSOCKTYPE_ACCEPT, /* socket created by accept() call */
|
CURLSOCKTYPE_ACCEPT, /* socket created by accept() call */
|
||||||
CURLSOCKTYPE_LAST /* never use */
|
CURLSOCKTYPE_LAST /* never use */
|
||||||
@ -398,7 +398,7 @@ typedef enum {
|
|||||||
CURLIOE_LAST /* never use */
|
CURLIOE_LAST /* never use */
|
||||||
} curlioerr;
|
} curlioerr;
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
CURLIOCMD_NOP, /* no operation */
|
CURLIOCMD_NOP, /* no operation */
|
||||||
CURLIOCMD_RESTARTREAD, /* restart the read stream from start */
|
CURLIOCMD_RESTARTREAD, /* restart the read stream from start */
|
||||||
CURLIOCMD_LAST /* never use */
|
CURLIOCMD_LAST /* never use */
|
||||||
|
@ -1469,7 +1469,7 @@ static CURLcode ftp_state_list(struct connectdata *conn)
|
|||||||
return CURLE_OUT_OF_MEMORY;
|
return CURLE_OUT_OF_MEMORY;
|
||||||
|
|
||||||
/* Check if path does not end with /, as then we cut off the file part */
|
/* Check if path does not end with /, as then we cut off the file part */
|
||||||
if(lstArg[strlen(lstArg) - 1] != '/') {
|
if(lstArg[strlen(lstArg) - 1] != '/') {
|
||||||
|
|
||||||
/* chop off the file part if format is dir/dir/file */
|
/* chop off the file part if format is dir/dir/file */
|
||||||
slashPos = strrchr(lstArg, '/');
|
slashPos = strrchr(lstArg, '/');
|
||||||
|
@ -306,7 +306,7 @@ fetch_addr(struct connectdata *conn,
|
|||||||
/* See if its already in our dns cache */
|
/* See if its already in our dns cache */
|
||||||
dns = Curl_hash_pick(data->dns.hostcache, entry_id, entry_len + 1);
|
dns = Curl_hash_pick(data->dns.hostcache, entry_id, entry_len + 1);
|
||||||
|
|
||||||
if(dns && (data->set.dns_cache_timeout != -1)) {
|
if(dns && (data->set.dns_cache_timeout != -1)) {
|
||||||
/* See whether the returned entry is stale. Done before we release lock */
|
/* See whether the returned entry is stale. Done before we release lock */
|
||||||
struct hostcache_prune_data user;
|
struct hostcache_prune_data user;
|
||||||
|
|
||||||
|
@ -2079,7 +2079,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifndef CURL_DISABLE_PROXY
|
#ifndef CURL_DISABLE_PROXY
|
||||||
if(conn->bits.httpproxy && !conn->bits.tunnel_proxy) {
|
if(conn->bits.httpproxy && !conn->bits.tunnel_proxy) {
|
||||||
/* Using a proxy but does not tunnel through it */
|
/* Using a proxy but does not tunnel through it */
|
||||||
|
|
||||||
/* The path sent to the proxy is in fact the entire URL. But if the remote
|
/* The path sent to the proxy is in fact the entire URL. But if the remote
|
||||||
@ -2624,7 +2624,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
|
|||||||
its size. */
|
its size. */
|
||||||
if(conn->httpversion != 20 &&
|
if(conn->httpversion != 20 &&
|
||||||
!data->state.expect100header &&
|
!data->state.expect100header &&
|
||||||
(postsize < MAX_INITIAL_POST_SIZE)) {
|
(postsize < MAX_INITIAL_POST_SIZE)) {
|
||||||
/* if we don't use expect: 100 AND
|
/* if we don't use expect: 100 AND
|
||||||
postsize is less than MAX_INITIAL_POST_SIZE
|
postsize is less than MAX_INITIAL_POST_SIZE
|
||||||
|
|
||||||
|
@ -107,7 +107,7 @@ static const char upper_digits[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
|||||||
} WHILE_FALSE
|
} WHILE_FALSE
|
||||||
|
|
||||||
/* Data type to read from the arglist */
|
/* Data type to read from the arglist */
|
||||||
typedef enum {
|
typedef enum {
|
||||||
FORMAT_UNKNOWN = 0,
|
FORMAT_UNKNOWN = 0,
|
||||||
FORMAT_STRING,
|
FORMAT_STRING,
|
||||||
FORMAT_PTR,
|
FORMAT_PTR,
|
||||||
|
@ -54,8 +54,8 @@ int Curl_splayremovebyaddr(struct Curl_tree *t,
|
|||||||
struct Curl_tree *removenode,
|
struct Curl_tree *removenode,
|
||||||
struct Curl_tree **newroot);
|
struct Curl_tree **newroot);
|
||||||
|
|
||||||
#define Curl_splaycomparekeys(i,j) ( ((i.tv_sec) < (j.tv_sec)) ? -1 : \
|
#define Curl_splaycomparekeys(i,j) ( ((i.tv_sec) < (j.tv_sec)) ? -1 : \
|
||||||
( ((i.tv_sec) > (j.tv_sec)) ? 1 : \
|
( ((i.tv_sec) > (j.tv_sec)) ? 1 : \
|
||||||
( ((i.tv_usec) < (j.tv_usec)) ? -1 : \
|
( ((i.tv_usec) < (j.tv_usec)) ? -1 : \
|
||||||
( ((i.tv_usec) > (j.tv_usec)) ? 1 : 0))))
|
( ((i.tv_usec) > (j.tv_usec)) ? 1 : 0))))
|
||||||
|
|
||||||
|
@ -1774,7 +1774,7 @@ CURLcode Curl_follow(struct Curl_easy *data,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!is_absolute_url(newurl)) {
|
if(!is_absolute_url(newurl)) {
|
||||||
/***
|
/***
|
||||||
*DANG* this is an RFC 2068 violation. The URL is supposed
|
*DANG* this is an RFC 2068 violation. The URL is supposed
|
||||||
to be absolute and this doesn't seem to be that!
|
to be absolute and this doesn't seem to be that!
|
||||||
|
Loading…
Reference in New Issue
Block a user