fielding 98/02/08 17:09:42
Modified: src CHANGES
src/main http_main.c http_protocol.c
Log:
Improve the error_log message for "lost connection" so that
clueless wankers won't automatically think the server is at fault.
Revision Changes Path
1.624 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.623
retrieving revision 1.624
diff -u -r1.623 -r1.624
--- CHANGES 1998/02/08 20:50:57 1.623
+++ CHANGES 1998/02/09 01:09:37 1.624
@@ -186,6 +186,9 @@
*) "File does not exist" error message was erroneously including the
errno. [Marc Slemko]
+ *) Improve the warning message generated when a client drops the
+ connection (hits stop button, etc.) during a send. [Roy Fielding]
+
*) Defining GPROF will disable profiling in the parent and enable it
in the children. If you're profiling under Linux this is pretty much
necessary because SIGPROF is lost across a fork(). [Dean Gaudet]
1.286 +4 -3 apache-1.3/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- http_main.c 1998/02/09 00:45:56 1.285
+++ http_main.c 1998/02/09 01:09:39 1.286
@@ -834,9 +834,10 @@
else
dirconf = current_conn->server->lookup_defaults;
if (sig == SIGPIPE) {
- ap_snprintf(errstr, sizeof(errstr), "%s lost connection to %s",
- timeout_name ? timeout_name : "request",
- get_remote_host(current_conn, dirconf, REMOTE_NAME));
+ ap_snprintf(errstr, sizeof(errstr),
+ "%s client stopped connection before %s completed",
+ get_remote_host(current_conn, dirconf, REMOTE_NAME),
+ timeout_name ? timeout_name : "request");
}
else {
ap_snprintf(errstr, sizeof(errstr), "%s timed out for %s",
1.188 +3 -3 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- http_protocol.c 1998/02/09 00:45:57 1.187
+++ http_protocol.c 1998/02/09 01:09:40 1.188
@@ -1689,7 +1689,7 @@
continue;
else {
aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
- "send body lost connection to %s",
+ "%s client stopped connection before send body
completed",
get_remote_host(r->connection,
r->per_dir_config,
REMOTE_NAME));
@@ -1778,7 +1778,7 @@
continue;
else {
aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
- "send body lost connection to %s",
+ "%s client stopped connection before send body
completed",
get_remote_host(r->connection,
r->per_dir_config,
REMOTE_NAME));
@@ -1846,7 +1846,7 @@
continue;
else {
aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
- "send mmap lost connection to %s",
+ "%s client stopped connection before send mmap
completed",
get_remote_host(r->connection,
r->per_dir_config,
REMOTE_NAME));
