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

Commit a54abd06 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am fa5c8fc4: am abaabb2c: Merge "Support other kinds of HTTP redirect in... 

am fa5c8fc4: am abaabb2c: Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread

Merge commit 'fa5c8fc4'

* commit 'fa5c8fc4':
  Support other kinds of HTTP redirect in NuHTTPDataSource
parents 5e18ad0c fa5c8fc4

media/libstagefright/NuHTTPDataSource.cpp

+6 −1
Original line number Diff line number Diff line
@@ -96,6 +96,11 @@ status_t NuHTTPDataSource::connect( 
    return connect(host, port, path, headers, offset);

}



static bool IsRedirectStatusCode(int httpStatus) {

    return httpStatus == 301 || httpStatus == 302

        || httpStatus == 303 || httpStatus == 307;

}



status_t NuHTTPDataSource::connect(

        const char *host, unsigned port, const char *path,

        const String8 &headers,
@@ -161,7 +166,7 @@ status_t NuHTTPDataSource::connect( 
            return err;

        }



        if (httpStatus == 302) {

        if (IsRedirectStatusCode(httpStatus)) {

            string value;

            CHECK(mHTTP.find_header_value("Location", &value));