Merge from 1.1.

1 files changed, 15 insertions, 2 deletions

diff --git a/src/input/http_helper.c b/src/input/http_helper.c
index f4950a084..9bd54cb6e 100644
--- a/src/input/http_helper.c
+++ b/src/input/http_helper.c
@@ -29,8 +29,18 @@
 #include <xine/xine_internal.h>
 #include "http_helper.h"
 
+
+const char *_x_url_user_agent (const char *url)
+{
+  if (!strncasecmp (url, "qthttp://", 9))
+    return "QuickTime"; /* needed for Apple trailers */
+  return NULL;
+}
+
 int _x_parse_url (char *url, char **proto, char** host, int *port,
-                         char **user, char **password, char **uri) {
+                  char **user, char **password, char **uri,
+                  const char **user_agent)
+{
   char   *start      = NULL;
   char   *authcolon  = NULL;
   char	 *at         = NULL;
@@ -63,6 +73,9 @@ int _x_parse_url (char *url, char **proto, char** host, int *port,
   end  = start + strlen(start) - 1;
   *proto = strndup(url, start - url);
 
+  if (user_agent)
+    *user_agent = _x_url_user_agent (url);
+
   /* user:password */
   start += 3;
   at = strchr(start, '@');
@@ -234,7 +247,7 @@ static int check_url(char *url, int ok) {
   printf("--------------------------------\n");
   printf("url=%s\n", url);
   res = _x_parse_url (url,
-                      &proto, &host, &port, &user, &password, &uri);
+                      &proto, &host, &port, &user, &password, &uri, NULL);
   if (res) {
     printf("proto=%s, host=%s, port=%d, user=%s, password=%s, uri=%s\n",
            proto, host, port, user, password, uri);