Changeset 2c16687563b6e6096f5621db56917d9ef05424b2

Timestamp:

22/06/08 19:31:07 (5 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1214155867 +0300

git-parent:

[f5623dec1ca290e9adcbbc34ba4fe3f03a4c2e69]

git-author:

Bill C. Riemers <briemers+git@redhat.com> 1214009271 -0400

Message:

http: fix Content-Length and stream closure issues.

Changes:
1. Don't send Connection: close or Connection: Keep-Alive.

So we will maintain a persistent connection with HTTP 1.1.

2. Close the connection if and only if the server does not send

Connection: close, and a zero length is received indicated by either
Content-Length: 0 or a 0 length size in the byte range.

3. Correct i_remaining to deal with file larger than 2GBi.
4. Update i_remaining in Read and OpenWithCookies?.
5. Use -1 for uninitialized size so we can tell the difference from a

zero length result.

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>

Files:

• modules/access/http.c (modified) (12 diffs)

modules/access/http.c

@@ -189 +189 @@
-    char       *psz_icy_title;
-
-
+64_t
-
-    bool b_seekable;
@@ -195 +195 @@
-    bool b_continuous;
-    bool b_pace_control;
+    bool b_persist;
-
-    vlc_array_t * cookies;
@@ -280 +281 @@
-    p_sys->psz_icy_title = NULL;
-    p_sys->i_remaining = 0;
+    p_sys->b_persist = false;
+    p_access->info.i_size = -1;
+    p_access->info.i_pos  = 0;
+    p_access->info.b_eof  = false;
-
-    p_sys->cookies = saved_cookies;
@@ -639 +644 @@
-    }
-
-
+=
-        i_len + p_access->info.i_pos > p_access->info.i_size )
-    {
@@ -683 +688 @@
-        }
-    }
-
-
-
+
-        /* Only ask for the remaining length */
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    if( p_sys->i_icy_meta > 0 && p_access->info.i_pos > 0 )
@@ -765 +766 @@
-    }
-
-sys->b_continuous
+access->info.i_size != -1
-    {
-        p_sys->i_remaining -= i_read;
@@ -1008 +1009 @@
-    p_sys->psz_icy_genre = NULL;
-    p_sys->psz_icy_title = NULL;
-
-
+
+
+
+
-    p_access->info.i_pos  = i_tell;
-    p_access->info.b_eof  = false;
@@ -1107 +1110 @@
-    char           *psz ;
-    v_socket_t     *pvs = p_sys->p_vs;
-
+
+
+
+
-    if( p_sys->b_proxy )
-    {
@@ -1150 +1156 @@
-                p_sys->psz_user_agent );
-    /* Offset */
-
-
+
+
+
-        net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
-                    "Range: bytes=%"PRIu64"-\r\n", i_tell );
@@ -1194 +1201 @@
-
-
-    if( p_sys->b_continuous )
-    {
-        net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs,
-                    "Connection: Keep-Alive\r\n" );
-    }
-    else if( p_sys->i_version == 1 )
-    {
-        net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs,
-                    "Connection: Close\r\n");
-    }
-
-    if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "\r\n" ) < 0 )
-    {
@@ -1294 +1290 @@
-        if( !strcasecmp( psz, "Content-Length" ) )
-        {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -1456 +1469 @@
-
-        free( psz );
+    }
+    /* We close the stream for zero length data, unless of course the
+     * server has already promised to do this for us.
+     */
+    if( p_access->info.i_size != -1 && p_sys->i_remaining == 0 && p_sys->b_persist ) {
+        Disconnect( p_access );
-    }
-    return VLC_SUCCESS;