generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

now counts header size return from server and if nothing is returned from a

Browse Source 
HTTP server we return error
This commit is contained in:
Daniel Stenberg 2001-10-19 11:58:32 +00:00
parent 74d5a6fb3b
commit 4e37187e44
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/http.c
View File

@ -352,6 +352,13 @@ CURLcode Curl_http_done(struct connectdata *conn)
*bytecount = http->readbytecount + http->writebytecount; *bytecount = http->readbytecount + http->writebytecount;
} }
if(0 == (http->readbytecount + conn->headerbytecount)) {
/* nothing was read from the HTTP server, this can't be right
so we return an error here */
failf(data, "Empty reply from server\n");
return CURLE_GOT_NOTHING;
}
return CURLE_OK; return CURLE_OK;
} }

6
lib/transfer.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2001, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* In order to be useful for every potential user, curl and libcurl are * In order to be useful for every potential user, curl and libcurl are
* dual-licensed under the MPL and the MIT/X-derivate licenses. * dual-licensed under the MPL and the MIT/X-derivate licenses.
@ -450,12 +450,14 @@ Transfer(struct connectdata *c_conn)
if (data->set.http_include_header) if (data->set.http_include_header)
writetype |= CLIENTWRITE_BODY; writetype |= CLIENTWRITE_BODY;
urg = Curl_client_write(data, writetype, data->state.headerbuff, urg = Curl_client_write(data, writetype,
data->state.headerbuff,
p - data->state.headerbuff); p - data->state.headerbuff);
if(urg) if(urg)
return urg; return urg;
data->info.header_size += p - data->state.headerbuff; data->info.header_size += p - data->state.headerbuff;
conn->headerbytecount += p - data->state.headerbuff;
if(!header) { if(!header) {
/* /*

1
lib/url.c
View File

@ -2034,6 +2034,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
conn->now = Curl_tvnow(); /* time this *after* the connect is done */ conn->now = Curl_tvnow(); /* time this *after* the connect is done */
conn->bytecount = 0; conn->bytecount = 0;
conn->headerbytecount = 0;
/* Figure out the ip-number and display the first host name it shows: */ /* Figure out the ip-number and display the first host name it shows: */
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6

1
lib/urldata.h
View File

@ -242,6 +242,7 @@ struct connectdata {
not the proxy port! */ not the proxy port! */
char *ppath; char *ppath;
long bytecount; long bytecount;
long headerbytecount; /* only count received headers */
char *range; /* range, if used. See README for detailed specification on char *range; /* range, if used. See README for detailed specification on
this syntax. */ this syntax. */