Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'abaabb2c7994e5a5026c2e2bd860d7f21eed0451' into gingerbread-plus-aosp

* commit 'abaabb2c7994e5a5026c2e2bd860d7f21eed0451':
  Support other kinds of HTTP redirect in NuHTTPDataSource
This commit is contained in:
Andreas Huber
2010-09-27 09:24:18 -07:00
committed by Android Git Automerger
parent 4a04a3129b abaabb2c79
commit fa5c8fc4a4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/libstagefright/NuHTTPDataSource.cpp
View File

@@ -96,6 +96,11 @@ status_t NuHTTPDataSource::connect(
return connect(host, port, path, headers, offset); 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( status_t NuHTTPDataSource::connect(
const char *host, unsigned port, const char *path, const char *host, unsigned port, const char *path,
const String8 &headers, const String8 &headers,
@@ -161,7 +166,7 @@ status_t NuHTTPDataSource::connect(
return err; return err;
} }
if (httpStatus == 302) { if (IsRedirectStatusCode(httpStatus)) {
string value; string value;
CHECK(mHTTP.find_header_value("Location", &value)); CHECK(mHTTP.find_header_value("Location", &value));