summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/include/HTTPStream.h
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-11-19 09:36:13 -0800
committerAndreas Huber <andih@google.com>2010-11-19 09:36:13 -0800
commit87995623c1865721daeb0da9efffca42e940c854 (patch)
tree731556a670ba743415037fbf4c60246e9986ebb5 /media/libstagefright/include/HTTPStream.h
parentb9ff444a7eaf7ffd43970c0477110c6808bd4a7c (diff)
downloadframeworks_av-87995623c1865721daeb0da9efffca42e940c854.zip
frameworks_av-87995623c1865721daeb0da9efffca42e940c854.tar.gz
frameworks_av-87995623c1865721daeb0da9efffca42e940c854.tar.bz2
Squashed commit of the following:
commit 610ed879d57785cb0457f7f127889496d325f732 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 09:28:52 2010 -0800 HTTP header keys are to be treated case insensitive. Change-Id: I9690880528a6b0f611958de7996c2753948a03c3 commit 554a2499a293d8d53907d01d972a9cfe9b92738e Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 09:22:45 2010 -0800 Remove one more legacy "string" implementation. Change-Id: I7638d849427a39bbc040082a8663b3b9b81a632b Change-Id: I626a60abdcd1dd6403be880dad4d0499d77ca71f
Diffstat (limited to 'media/libstagefright/include/HTTPStream.h')
-rw-r--r--media/libstagefright/include/HTTPStream.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/media/libstagefright/include/HTTPStream.h b/media/libstagefright/include/HTTPStream.h
index 793798f..545cd0c 100644
--- a/media/libstagefright/include/HTTPStream.h
+++ b/media/libstagefright/include/HTTPStream.h
@@ -18,10 +18,9 @@
#define HTTP_STREAM_H_
-#include "stagefright_string.h"
-
#include <sys/types.h>
+#include <media/stagefright/foundation/AString.h>
#include <media/stagefright/MediaErrors.h>
#include <utils/KeyedVector.h>
#include <utils/threads.h>
@@ -50,7 +49,7 @@ public:
static const char *kStatusKey;
bool find_header_value(
- const string &key, string *value) const;
+ const AString &key, AString *value) const;
// Pass a negative value to disable the timeout.
void setReceiveTimeout(int seconds);
@@ -70,7 +69,7 @@ private:
Mutex mLock;
int mSocket;
- KeyedVector<string, string> mHeaders;
+ KeyedVector<AString, AString> mHeaders;
HTTPStream(const HTTPStream &);
HTTPStream &operator=(const HTTPStream &);