Browse files

Get rid of the reader and writer timeout on the ApplicationPool::Sess…

…ion object: it's not useful.

Apache already aborts the connection if it cannot write data to the client
within TimeOut seconds and doesn't need our Session timeout. The Session
timeout might potentially mask frozen processes which can cause problems
later on.

Also, improve the error message that's displayed when a client write
timeout occurs.
  • Loading branch information...
1 parent d642002 commit 23e425115b218f1f43d29df1d26d450edeed8df2 @FooBarWidget FooBarWidget committed Aug 22, 2009
Showing with 7 additions and 6 deletions.
  1. +7 −6 ext/apache2/Hooks.cpp
View
13 ext/apache2/Hooks.cpp
@@ -554,8 +554,6 @@ class Hooks {
}
UPDATE_TRACE_POINT();
- session->setReaderTimeout(r->server->timeout / 1000);
- session->setWriterTimeout(r->server->timeout / 1000);
sendHeaders(r, session, mapper.getBaseURI());
if (expectingUploadData) {
if (uploadDataFile != NULL) {
@@ -637,11 +635,14 @@ class Hooks {
ap_pass_brigade(r->output_filters, bb);
if (r->connection->aborted) {
- P_WARN("The HTTP client closed the connection before "
- "the response could be completely sent. As a "
- "result, you will probably see a 'Broken Pipe' "
+ P_WARN("Either the vistor clicked on the 'Stop' button in the "
+ "web browser, or the visitor's connection has stalled "
+ "and couldn't receive the data that Apache is sending "
+ "to it. As a result, you will probably see a 'Broken Pipe' "
"error in this log file. Please ignore it, "
- "this is normal.");
+ "this is normal. You might also want to increase Apache's "
+ "TimeOut configuration option if you experience this "
+ "problem often.");
} else if (!bucketState->completed) {
P_WARN("Apache stopped forwarding the backend's response, "
"even though the HTTP client did not close the "

0 comments on commit 23e4251

Please sign in to comment.