moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

comment cleanup

Browse Source
This commit is contained in:
Daniel Stenberg 2004-12-02 22:52:14 +00:00
parent 2f26069a41
commit 8726a6b6ed
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/http.c
View File

@ -1031,7 +1031,7 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
ssize_t gotbytes; ssize_t gotbytes;
char *ptr; char *ptr;
long timeout = 3600; /* default timeout in seconds */ long timeout = 3600; /* default timeout in seconds */
int interval_ms;
char *line_start; char *line_start;
char *host_port; char *host_port;
curl_socket_t tunnelsocket = conn->sock[sockindex]; curl_socket_t tunnelsocket = conn->sock[sockindex];
@ -1087,7 +1087,6 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
keepon=TRUE; keepon=TRUE;
while((nread<BUFSIZE) && (keepon && !error)) { while((nread<BUFSIZE) && (keepon && !error)) {
interval_ms = 1; /* timeout each second and check the timeout */
if(data->set.timeout) { if(data->set.timeout) {
/* if timeout is requested, find out how much remaining time we have */ /* if timeout is requested, find out how much remaining time we have */
@ -1100,7 +1099,8 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
} }
} }
switch (Curl_select(tunnelsocket, CURL_SOCKET_BAD, interval_ms)) { /* timeout each second and check the timeout */
switch (Curl_select(tunnelsocket, CURL_SOCKET_BAD, 1000)) {
case -1: /* select() error, stop reading */ case -1: /* select() error, stop reading */
error = SELECT_ERROR; error = SELECT_ERROR;
failf(data, "Proxy CONNECT aborted due to select() error"); failf(data, "Proxy CONNECT aborted due to select() error");
@ -1108,12 +1108,7 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
case 0: /* timeout */ case 0: /* timeout */
break; break;
default: default:
/* res = Curl_read(conn, tunnelsocket, ptr, BUFSIZE-nread, &gotbytes);
* 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!
*/
res= Curl_read(conn, tunnelsocket, ptr, BUFSIZE-nread, &gotbytes);
if(res< 0) if(res< 0)
/* EWOULDBLOCK */ /* EWOULDBLOCK */
continue; /* go loop yourself */ continue; /* go loop yourself */
@ -1128,12 +1123,7 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
/* /*
* We got a whole chunk of data, which can be anything from one byte * 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. * to a set of lines and possibly just a piece of the last line.
* */
* TODO: To make this code work less error-prone, we need to make
* sure that we read and create full lines before we compare them,
* as there is really nothing that stops the proxy from delivering
* the response lines in multiple parts, each part consisting of
* only a little piece of the line(s). */
int i; int i;
nread += gotbytes; nread += gotbytes;
@ -1143,7 +1133,7 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
char letter; char letter;
int writetype; int writetype;
/* output debug output if that is requested */ /* output debug if that is requested */
if(data->set.verbose) if(data->set.verbose)
Curl_debug(data, CURLINFO_HEADER_IN, line_start, perline, Curl_debug(data, CURLINFO_HEADER_IN, line_start, perline,
conn->host.dispname); conn->host.dispname);