Comment 4 for bug 1509083

Created attachment 30829
proposed patch v2

Better patch respecting previous "conn->worker->s->timeout" timeout if set.