fetch: fix segfault after destination was not reached

[project/uclient.git] / uclient-http.c

diff --git a/uclient-http.c b/uclient-http.c
index ee161e6..47c890f 100644 (file)
--- a/uclient-http.c
+++ b/uclient-http.c
@@ -497,9 +497,6 @@ uclient_http_send_headers(struct uclient_http *uh)
        if (uh->state >= HTTP_STATE_HEADERS_SENT)
                return;
 
-       if (uh->auth_type == AUTH_TYPE_UNKNOWN)
-               req_type = REQ_HEAD;
-
        ustream_printf(uh->us,
                "%s %s HTTP/1.1\r\n"
                "Host: %s\r\n",
@@ -527,7 +524,8 @@ static void uclient_http_headers_complete(struct uclient_http *uh)
        uh->uc.meta = uh->meta.head;
        uclient_http_process_headers(uh);
 
-       if (auth_type == AUTH_TYPE_UNKNOWN) {
+       if (auth_type == AUTH_TYPE_UNKNOWN && uh->uc.status_code == 401 &&
+           (uh->req_type == REQ_HEAD || uh->req_type == REQ_GET)) {
                uclient_http_init_request(uh);
                uclient_http_send_headers(uh);
                uh->state = HTTP_STATE_REQUEST_DONE;
@@ -653,6 +651,12 @@ static void __uclient_notify_read(struct uclient_http *uh)
                uc->cb->data_read(uc);
 }
 
+static void __uclient_notify_write(struct uclient_http *uh)
+{
+       struct uclient *uc = &uh->uc;
+       uc->cb->data_sent(uc);
+}
+
 static void uclient_notify_read(struct ustream *us, int bytes)
 {
        struct uclient_http *uh = container_of(us, struct uclient_http, ufd.stream);
@@ -660,6 +664,13 @@ static void uclient_notify_read(struct ustream *us, int bytes)
        __uclient_notify_read(uh);
 }
 
+static void uclient_notify_write(struct ustream *us, int bytes)
+{
+       struct uclient_http *uh = container_of(us, struct uclient_http, ufd.stream);
+
+       __uclient_notify_write(uh);
+}
+
 static void uclient_notify_state(struct ustream *us)
 {
        struct uclient_http *uh = container_of(us, struct uclient_http, ufd.stream);
@@ -678,6 +689,7 @@ static int uclient_setup_http(struct uclient_http *uh)
        us->string_data = true;
        us->notify_state = uclient_notify_state;
        us->notify_read = uclient_notify_read;
+       us->notify_write = uclient_notify_write;
 
        ret = uclient_do_connect(uh, "80");
        if (ret)
@@ -693,6 +705,13 @@ static void uclient_ssl_notify_read(struct ustream *us, int bytes)
        __uclient_notify_read(uh);
 }
 
+static void uclient_ssl_notify_write(struct ustream *us, int bytes)
+{
+       struct uclient_http *uh = container_of(us, struct uclient_http, ussl.stream);
+
+       __uclient_notify_write(uh);
+}
+
 static void uclient_ssl_notify_state(struct ustream *us)
 {
        struct uclient_http *uh = container_of(us, struct uclient_http, ussl.stream);
@@ -746,6 +765,7 @@ static int uclient_setup_https(struct uclient_http *uh)
        us->string_data = true;
        us->notify_state = uclient_ssl_notify_state;
        us->notify_read = uclient_ssl_notify_read;
+       us->notify_write = uclient_ssl_notify_write;
        uh->ussl.notify_error = uclient_ssl_notify_error;
        uh->ussl.notify_verify_error = uclient_ssl_notify_verify_error;
        uh->ussl.notify_connected = uclient_ssl_notify_connected;
@@ -928,8 +948,10 @@ uclient_http_read(struct uclient *cl, char *buf, unsigned int len)
                read_len += sep + 2 - data;
                data = sep + 2;
 
-               if (!uh->read_chunked)
+               if (!uh->read_chunked) {
                        uh->eof = true;
+                       uh->uc.data_eof = true;
+               }
        }
 
        if (len > data_end - data)
@@ -945,8 +967,10 @@ uclient_http_read(struct uclient *cl, char *buf, unsigned int len)
                        len = uh->content_length;
 
                uh->content_length -= len;
-               if (!uh->content_length)
+               if (!uh->content_length) {
                        uh->eof = true;
+                       uh->uc.data_eof = true;
+               }
        }
 
        if (len > 0) {