diff options
| author | Romain Guy <romainguy@android.com> | 2010-07-15 09:39:42 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-07-15 09:39:42 -0700 |
| commit | c9c987d7e1171cad82a70c2392709d3d5d23f2eb (patch) | |
| tree | b9a7ff333bfee42ff37b343c9ed85acc716ba9b6 /core | |
| parent | 32ca6aae619ba027f76c3b4a9d4bab6b13fbe148 (diff) | |
| parent | c692e8c4da1c5e481ec8564839d47576e643f50c (diff) | |
| download | frameworks_base-c9c987d7e1171cad82a70c2392709d3d5d23f2eb.zip frameworks_base-c9c987d7e1171cad82a70c2392709d3d5d23f2eb.tar.gz frameworks_base-c9c987d7e1171cad82a70c2392709d3d5d23f2eb.tar.bz2 | |
Merge "Make HTTP Header class handle multiple cache-control fields."
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/net/http/Headers.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/net/http/Headers.java b/core/java/android/net/http/Headers.java index 09f6f4f..74c0de8 100644 --- a/core/java/android/net/http/Headers.java +++ b/core/java/android/net/http/Headers.java @@ -262,7 +262,14 @@ public final class Headers { break; case HASH_CACHE_CONTROL: if (name.equals(CACHE_CONTROL)) { - mHeaders[IDX_CACHE_CONTROL] = val; + // In case where we receive more than one header, create a ',' separated list. + // This should be ok, according to RFC 2616 chapter 4.2 + if (mHeaders[IDX_CACHE_CONTROL] != null && + mHeaders[IDX_CACHE_CONTROL].length() > 0) { + mHeaders[IDX_CACHE_CONTROL] += (',' + val); + } else { + mHeaders[IDX_CACHE_CONTROL] = val; + } } break; case HASH_LAST_MODIFIED: |