summaryrefslogtreecommitdiff
path: root/source4/web_server
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-07-12 06:17:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:20:10 -0500
commit9d70babef12ba2971d73622b9c3cd7248deeac16 (patch)
tree5abb9cc9a1608d9380de99e76e64cc9a5c65f1be /source4/web_server
parentdd750b98af22c34cc6f50102f2dbe6c93ee94e32 (diff)
downloadsamba-9d70babef12ba2971d73622b9c3cd7248deeac16.tar.gz
samba-9d70babef12ba2971d73622b9c3cd7248deeac16.tar.bz2
samba-9d70babef12ba2971d73622b9c3cd7248deeac16.zip
r8351: When finished sending call stream_terminate_connection() with a nice
message instead of NULL. Fix up some other terminate messgages to be consistent. (This used to be commit c0428ef3376e439cdc04fea046738cecb7a01560)
Diffstat (limited to 'source4/web_server')
-rw-r--r--source4/web_server/web_server.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index 71bdc8f646..50a01db3d4 100644
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -52,7 +52,7 @@ static void websrv_timeout(struct event_context *event_context,
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 @@ static void websrv_recv(struct stream_connection *conn, uint16_t flags)
return;
failed:
- stream_terminate_connection(conn, "websrv_recv: failed\n");
+ stream_terminate_connection(conn, "websrv_recv: failed");
}
@@ -164,7 +164,7 @@ static void websrv_send(struct stream_connection *conn, uint16_t flags)
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 @@ static void websrv_task_init(struct task_server *task)
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");
}