[xiph-cvs] cvs commit: icecast/src connection.c slave.c xslt.c

[Michael Smith]

msmith      02/12/29 04:21:32

  Modified:    src      connection.c slave.c xslt.c
  Log:
  Minor incompatible change to relaying, to match actual protocol.

Revision  Changes    Path
1.32      +5 -0      icecast/src/connection.c

Index: connection.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/connection.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- connection.c	29 Dec 2002 08:10:10 -0000	1.31
+++ connection.c	29 Dec 2002 09:21:32 -0000	1.32
@@ -577,6 +577,11 @@
                         INFO0("Client attempted to fetch allstreams.txt with bad password");
             client_send_401(client);
                 } else {
+            client->respcode = 200;
+            bytes = sock_write(client->con->sock,
+                    "HTTP/1.0 200 OK\r\n\r\n");
+            if(bytes > 0) client->con->sent_bytes = bytes;
+
                         avl_node *node;
                         source_t *s;
                         avl_tree_rlock(global.source_tree);

<p><p>1.7       +5 -1      icecast/src/slave.c

Index: slave.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/slave.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- slave.c	17 Aug 2002 06:25:38 -0000	1.6
+++ slave.c	29 Dec 2002 09:21:32 -0000	1.7
@@ -104,7 +104,11 @@
                 sock_write(mastersock, "GET /allstreams.txt HTTP/1.0\r\nAuthorization: Basic %s\r\n\r\n", data);
         free(data);
                 while (sock_read_line(mastersock, buf, sizeof(buf))) {
-			buf[strlen(buf)] = 0;
+            if(!strlen(buf))
+                break;
+        }
+
+		while (sock_read_line(mastersock, buf, sizeof(buf))) {
                         avl_tree_rlock(global.source_tree);
                         if (!source_find_mount(buf)) {
                                 avl_tree_unlock(global.source_tree);

<p><p>1.6       +1 -0      icecast/src/xslt.c

Index: xslt.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/xslt.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xslt.c	13 Aug 2002 13:53:07 -0000	1.5
+++ xslt.c	29 Dec 2002 09:21:32 -0000	1.6
@@ -111,6 +111,7 @@
                     cache[i].stylesheet = xsltParseStylesheetFile(fn);
                     cache[i].cache_age = time(NULL);
                 }
+                DEBUG1("Using cached sheet %i", i);
                 return cache[i].stylesheet;
             }
         }

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.