summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-07-27 05:33:33 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-27 05:33:33 -0700
commit132b21899b96208dbae42d76628aa0d019705412 (patch)
treed05723649a08bb80e803ff29d8c3f1f4c1c1a80c /media/libstagefright
parentf4a28b5aa0c81086c55497ff921a80335ffe22d1 (diff)
parent3192e397afa1bb18e89f77498094dace48f5f86a (diff)
downloadframeworks_base-132b21899b96208dbae42d76628aa0d019705412.zip
frameworks_base-132b21899b96208dbae42d76628aa0d019705412.tar.gz
frameworks_base-132b21899b96208dbae42d76628aa0d019705412.tar.bz2
Merge "Fix for bug 5049763 HLS: Cookies set in main playlist request aren't being passed to subsequent HTTP requests"
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/chromium_http/support.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/chromium_http/support.cpp b/media/libstagefright/chromium_http/support.cpp
index f4b3668..eb10ab7 100644
--- a/media/libstagefright/chromium_http/support.cpp
+++ b/media/libstagefright/chromium_http/support.cpp
@@ -25,6 +25,7 @@
#include "android/net/android_network_library_impl.h"
#include "base/threading/thread.h"
#include "net/base/cert_verifier.h"
+#include "net/base/cookie_monster.h"
#include "net/base/host_resolver.h"
#include "net/base/ssl_config_service.h"
#include "net/http/http_auth_handler_factory.h"
@@ -140,6 +141,8 @@ SfRequestContext::SfRequestContext() {
network_delegate(),
net_log(),
NULL)); // backend_factory
+
+ set_cookie_store(new net::CookieMonster(NULL, NULL));
}
const std::string &SfRequestContext::GetUserAgent(const GURL &url) const {