Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b777bf31 authored by Andreas Huber's avatar Andreas Huber
Browse files

Don't use a HEAD request to determine redirects, instead do a regular GET... 

Don't use a HEAD request to determine redirects, instead do a regular GET (since that's always supported), also limit the number of redirects to avoid infinite redirects. Finally, properly handle the end of stream.

related-to-bug: 2403674
parent 2d65817f

include/media/stagefright/HTTPDataSource.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,6 @@ private: 
    void *mBuffer;

    void *mBuffer;

    size_t mBufferLength;

    size_t mBufferLength;

    off_t mBufferOffset;

    off_t mBufferOffset;

    bool mFirstRequest;





    bool mContentLengthValid;

    bool mContentLengthValid;

    unsigned long long mContentLength;

    unsigned long long mContentLength;

media/libstagefright/HTTPDataSource.cpp

+14 −10
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ static bool PerformRedirectIfNecessary( 
        HTTPStream *http, const String8 &headers,

        HTTPStream *http, const String8 &headers,

        string *host, string *path, int *port) {

        string *host, string *path, int *port) {

    String8 request;

    String8 request;

    request.append("HEAD ");

    request.append("GET ");

    request.append(path->c_str());

    request.append(path->c_str());

    request.append(" HTTP/1.1\r\n");

    request.append(" HTTP/1.1\r\n");

    request.append(headers);

    request.append(headers);
@@ -142,7 +142,6 @@ void HTTPDataSource::init( 
    mBuffer = malloc(kBufferSize);

    mBuffer = malloc(kBufferSize);

    mBufferLength = 0;

    mBufferLength = 0;

    mBufferOffset = 0;

    mBufferOffset = 0;

    mFirstRequest = true;

    mContentLengthValid = false;

    mContentLengthValid = false;





    initHeaders(headers);

    initHeaders(headers);
@@ -153,13 +152,15 @@ void HTTPDataSource::init( 
    LOGI("Connecting to host '%s', port %d, path '%s'",

    LOGI("Connecting to host '%s', port %d, path '%s'",

         host.c_str(), port, path.c_str());

         host.c_str(), port, path.c_str());





    int numRedirectsRemaining = 5;

    do {

    do {

        mInitCheck = mHttp->connect(host.c_str(), port);

        mInitCheck = mHttp->connect(host.c_str(), port);





        if (mInitCheck != OK) {

        if (mInitCheck != OK) {

            return;

            return;

        }

        }

    } while (PerformRedirectIfNecessary(mHttp, mHeaders, &host, &path, &port));

    } while (PerformRedirectIfNecessary(mHttp, mHeaders, &host, &path, &port)

             && numRedirectsRemaining-- > 0);





    string value;

    string value;

    if (mHttp->find_header_value("Content-Length", &value)) {

    if (mHttp->find_header_value("Content-Length", &value)) {
@@ -280,14 +281,11 @@ ssize_t HTTPDataSource::readAt(off_t offset, void *data, size_t size) { 
    }

    }





    ssize_t contentLength = 0;

    ssize_t contentLength = 0;

    if (mFirstRequest || offset != (off_t)(mBufferOffset + mBufferLength)) {

    if (offset != (off_t)(mBufferOffset + mBufferLength)) {

        if (!mFirstRequest) {

        LOGV("new range offset=%ld (old=%ld)",

        LOGV("new range offset=%ld (old=%ld)",

             offset, mBufferOffset + mBufferLength);

             offset, mBufferOffset + mBufferLength);





        mHttp->disconnect();

        mHttp->disconnect();

        }

        mFirstRequest = false;





        contentLength = sendRangeRequest(offset);

        contentLength = sendRangeRequest(offset);
@@ -306,6 +304,12 @@ ssize_t HTTPDataSource::readAt(off_t offset, void *data, size_t size) { 




    ssize_t num_bytes_received = mHttp->receive(mBuffer, contentLength);

    ssize_t num_bytes_received = mHttp->receive(mBuffer, contentLength);





    if (num_bytes_received < 0) {

        mBufferLength = 0;



        return num_bytes_received;

    }



    mBufferLength = (size_t)num_bytes_received;

    mBufferLength = (size_t)num_bytes_received;





    size_t copy = mBufferLength;

    size_t copy = mBufferLength;

media/libstagefright/HTTPStream.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -257,11 +257,11 @@ ssize_t HTTPStream::receive(void *data, size_t size) { 
            }

            }





            disconnect();

            disconnect();

            return ERROR_IO;

            return total == 0 ? ERROR_IO : total;

        } else if (n == 0) {

        } else if (n == 0) {

            disconnect();

            disconnect();





            return ERROR_CONNECTION_LOST;

            return total == 0 ? ERROR_CONNECTION_LOST : total;

        }

        }





        total += (size_t)n;

        total += (size_t)n;