svn commit: samba r8351 - in branches/SAMBA_4_0/source/web_server: .

tpot at samba.org tpot at samba.org
Tue Jul 12 06:17:19 GMT 2005


Author: tpot
Date: 2005-07-12 06:17:19 +0000 (Tue, 12 Jul 2005)
New Revision: 8351

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8351

Log:
When finished sending call stream_terminate_connection() with a nice
message instead of NULL.

Fix up some other terminate messgages to be consistent.

Modified:
   branches/SAMBA_4_0/source/web_server/web_server.c


Changeset:
Modified: branches/SAMBA_4_0/source/web_server/web_server.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/web_server.c	2005-07-12 06:12:52 UTC (rev 8350)
+++ branches/SAMBA_4_0/source/web_server/web_server.c	2005-07-12 06:17:19 UTC (rev 8351)
@@ -52,7 +52,7 @@
 			   struct timeval t, void *private)
 {
 	struct websrv_context *web = talloc_get_type(private, struct websrv_context);
-	stream_terminate_connection(web->conn, "websrv_context: timeout");
+	stream_terminate_connection(web->conn, "websrv_timeout: timed out");
 }
 
 /*
@@ -110,7 +110,7 @@
 	return;
 
 failed:
-	stream_terminate_connection(conn, "websrv_recv: failed\n");
+	stream_terminate_connection(conn, "websrv_recv: failed");
 }
 
 
@@ -164,7 +164,7 @@
 	    web->output.fd == -1) {
 		talloc_free(web->tls);
 		web->tls = NULL;
-		stream_terminate_connection(web->conn, NULL);
+		stream_terminate_connection(web->conn, "websrv_send: finished sending");
 	}
 }
 
@@ -248,7 +248,7 @@
 	return;
 
 failed:
-	task_server_terminate(task, "Failed to startup web server task");
+	task_server_terminate(task, "websrv_task_init: failed to startup web server task");
 }
 
 



More information about the samba-cvs mailing list