summaryrefslogtreecommitdiff
path: root/lib/libfetch/http.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libfetch/http.c')
-rw-r--r--lib/libfetch/http.c30
1 files changed, 22 insertions, 8 deletions
diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c
index c9b2802b2e66..ce748c5c646f 100644
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -772,12 +772,13 @@ _http_request(struct url *URL, char *op, struct url_stat *us, char *flags)
for (url = URL, i = 0; i < n; ++i) {
new = NULL;
- us->size = -1;
- us->atime = us->mtime = 0;
+ if (us) {
+ us->size = -1;
+ us->atime = us->mtime = 0;
+ }
chunked = 0;
need_auth = 0;
offset = 0;
- fd = -1;
retry:
/* connect to server or proxy */
if ((fd = _http_connect(url, &proxy, flags)) == -1)
@@ -884,13 +885,15 @@ _http_request(struct url *URL, char *op, struct url_stat *us, char *flags)
_http_seterr(HTTP_PROTOCOL_ERROR);
goto ouch;
case hdr_content_length:
- us->size = _http_parse_length(p);
+ if (us)
+ us->size = _http_parse_length(p);
break;
case hdr_content_range:
offset = _http_parse_range(p);
break;
case hdr_last_modified:
- us->atime = us->mtime = _http_parse_mtime(p);
+ if (us)
+ us->atime = us->mtime = _http_parse_mtime(p);
break;
case hdr_location:
if (!HTTP_REDIRECT(code))
@@ -935,6 +938,7 @@ _http_request(struct url *URL, char *op, struct url_stat *us, char *flags)
/* we have a redirect */
close(fd);
+ fd = -1;
if (url != URL)
fetchFreeURL(url);
url = new;
@@ -978,16 +982,26 @@ _http_request(struct url *URL, char *op, struct url_stat *us, char *flags)
*/
/*
+ * Retrieve and stat a file by HTTP
+ */
+FILE *
+fetchXGetHTTP(struct url *URL, struct url_stat *us, char *flags)
+{
+ return _http_request(URL, "GET", us, flags);
+}
+
+/*
* Retrieve a file by HTTP
*/
FILE *
fetchGetHTTP(struct url *URL, char *flags)
{
- struct url_stat us;
-
- return _http_request(URL, "GET", &us, flags);
+ return fetchXGetHTTP(URL, NULL, flags);
}
+/*
+ * Store a file by HTTP
+ */
FILE *
fetchPutHTTP(struct url *URL, char *flags)
{