[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27804] trunk/blender/source/blender/ blenkernel/intern/writeframeserver.c: Change \n to more strict \r\n in HTTP headers (plus misc cleanups).

Sun Mar 28 19:01:46 CEST 2010

Revision: 27804
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27804
Author:   gsrb3d
Date:     2010-03-28 19:01:46 +0200 (Sun, 28 Mar 2010)

Log Message:
-----------
Change \n to more strict \r\n in HTTP headers (plus misc cleanups).
Reported by Ralph Giles via bug 21797.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/writeframeserver.c

Modified: trunk/blender/source/blender/blenkernel/intern/writeframeserver.c
===================================================================

--- trunk/blender/source/blender/blenkernel/intern/writeframeserver.c	2010-03-28 15:00:43 UTC (rev 27803)
+++ trunk/blender/source/blender/blenkernel/intern/writeframeserver.c	2010-03-28 17:01:46 UTC (rev 27804)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * Frameserver
  * Makes Blender accessible from TMPGenc directly using VFAPI (you can
  * use firefox too ;-)
@@ -93,7 +95,7 @@
 	return (errno == EINTR);
 }
 
-static int closesocket(int fd) 
+static int closesocket(int fd)
 {
 	return close(fd);
 }
@@ -140,10 +142,10 @@
 	return 1;
 }
 
-static char index_page[] 
-= 
-"HTTP/1.1 200 OK\n"
-"Content-Type: text/html\n\n"
+static char index_page[] =
+"HTTP/1.1 200 OK\r\n"
+"Content-Type: text/html\r\n"
+"\r\n"
 "<html><head><title>Blender Frameserver</title></head>\n"
 "<body><pre>\n"
 "<H2>Blender Frameserver</H2>\n"
@@ -156,9 +158,10 @@
 "\n"
 "</pre></body></html>\n";
 
-static char good_bye[]
-= "HTTP/1.1 200 OK\n"
-"Content-Type: text/html\n\n"
+static char good_bye[] =
+"HTTP/1.1 200 OK\r\n"
+"Content-Type: text/html\r\n"
+"\r\n"
 "<html><head><title>Blender Frameserver</title></head>\n"
 "<body><pre>\n"
 "Render stopped. Goodbye</pre></body></html>";
@@ -216,13 +219,14 @@
 	if (strcmp(path, "/info.txt") == 0) {
 		char buf[4096];
 
-		sprintf(buf, 
-			"HTTP/1.1 200 OK\n"
-			"Content-Type: text/html\n\n"
+		sprintf(buf,
+			"HTTP/1.1 200 OK\r\n"
+			"Content-Type: text/html\r\n"
+			"\r\n"
 			"start %d\n"
 			"end %d\n"
 			"width %d\n"
-			"height %d\n" 
+			"height %d\n"
 			"rate %d\n"
 			"ratescale %d\n",
 			rd->sfra,
@@ -317,10 +321,11 @@
 	int y;
 	char header[1024];
 
-	sprintf(header, 
-		"HTTP/1.1 200 OK\n"
-		"Content-Type: image/ppm\n"
-		"Connection: close\n\n"
+	sprintf(header,
+		"HTTP/1.1 200 OK\r\n"
+		"Content-Type: image/ppm\r\n"
+		"Connection: close\r\n"
+		"\r\n"
 		"P6\n"
 		"# Creator: blender frameserver v0.0.1\n"
 		"%d %d\n"
@@ -343,7 +348,7 @@
 			target += 3;
 			src += 4;
 		}
-		safe_write((char*)row, 3 * rectx); 
+		safe_write((char*)row, 3 * rectx);
 	}
 	free(row);
 	closesocket(connsock);



