diff options
author | Andreas Huber <andih@google.com> | 2010-12-16 10:51:15 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-16 10:51:15 -0800 |
commit | 5a7f242cfc0bd3b5208c21c27c0f5f348e98a0dc (patch) | |
tree | 833c872f88ef10f4ff8df23eff3de39a7e5bba54 /media/libstagefright | |
parent | 49bcbaed50918071ec9508acdb6c1ea398e64751 (diff) | |
parent | ac13b81c590386b3a42e381b31d7614ca53b79c5 (diff) | |
download | frameworks_av-5a7f242cfc0bd3b5208c21c27c0f5f348e98a0dc.zip frameworks_av-5a7f242cfc0bd3b5208c21c27c0f5f348e98a0dc.tar.gz frameworks_av-5a7f242cfc0bd3b5208c21c27c0f5f348e98a0dc.tar.bz2 |
Merge "The HTTP/1.1 Host request header must include port if it's not the default (80)."
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/NuHTTPDataSource.cpp | 3 | ||||
-rw-r--r-- | media/libstagefright/httplive/M3UParser.cpp | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/media/libstagefright/NuHTTPDataSource.cpp b/media/libstagefright/NuHTTPDataSource.cpp index 4ce7265..653c85e 100644 --- a/media/libstagefright/NuHTTPDataSource.cpp +++ b/media/libstagefright/NuHTTPDataSource.cpp @@ -158,6 +158,9 @@ status_t NuHTTPDataSource::connect( request.append(" HTTP/1.1\r\n"); request.append("Host: "); request.append(mHost); + if (mPort != 80) { + request.append(StringPrintf(":%u", mPort).c_str()); + } request.append("\r\n"); if (offset != 0) { diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp index d4a29c0..38a7cc5 100644 --- a/media/libstagefright/httplive/M3UParser.cpp +++ b/media/libstagefright/httplive/M3UParser.cpp @@ -14,6 +14,10 @@ * limitations under the License. */ +//#define LOG_NDEBUG 0 +#define LOG_TAG "M3UParser" +#include <utils/Log.h> + #include "include/M3UParser.h" #include <media/stagefright/foundation/AMessage.h> @@ -88,6 +92,9 @@ static bool MakeURL(const char *baseURL, const char *url, AString *out) { if (!strncasecmp("http://", url, 7)) { // "url" is already an absolute URL, ignore base URL. out->setTo(url); + + LOGV("base:'%s', url:'%s' => '%s'", baseURL, url, out->c_str()); + return true; } @@ -108,6 +115,8 @@ static bool MakeURL(const char *baseURL, const char *url, AString *out) { out->append(url); } + LOGV("base:'%s', url:'%s' => '%s'", baseURL, url, out->c_str()); + return true; } |