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

Merge commit 'fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc'

* commit 'fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc':
  Support other kinds of HTTP redirect in NuHTTPDataSource
This commit is contained in:
Andreas Huber
2010-09-27 09:28:06 -07:00
committed by Android Git Automerger

View File

@@ -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));