View | Details | Raw Unified | Return to bug 30730
Collapse All | Expand All

(-)server/scoreboard.c (-3 / +16 lines)
Lines 338-343 Link Here
338
    return (ap_scoreboard_image ? 1 : 0);
338
    return (ap_scoreboard_image ? 1 : 0);
339
}
339
}
340
340
341
static void increment_bytes(worker_score *ws, request_rec *r)
342
{
343
    ws->bytes_served += r->bytes_sent;
344
    ws->my_bytes_served += r->bytes_sent;
345
    ws->conn_bytes += r->bytes_sent;
346
}
347
341
AP_DECLARE(void) ap_increment_counts(ap_sb_handle_t *sb, request_rec *r)
348
AP_DECLARE(void) ap_increment_counts(ap_sb_handle_t *sb, request_rec *r)
342
{
349
{
343
    worker_score *ws;
350
    worker_score *ws;
Lines 350-360 Link Here
350
    ws->access_count++;
357
    ws->access_count++;
351
    ws->my_access_count++;
358
    ws->my_access_count++;
352
    ws->conn_count++;
359
    ws->conn_count++;
353
    ws->bytes_served += r->bytes_sent;
360
    increment_bytes(ws, r);
354
    ws->my_bytes_served += r->bytes_sent;
355
    ws->conn_bytes += r->bytes_sent;
356
}
361
}
357
362
363
AP_DECLARE(void) ap_increment_bytes(ap_sb_handle_t *sb, request_rec *r)
364
{
365
    worker_score *ws;
366
367
    ws = &ap_scoreboard_image->servers[sb->child_num][sb->thread_num];
368
    increment_bytes(ws, r);
369
}
370
358
int find_child_by_pid(apr_proc_t *pid)
371
int find_child_by_pid(apr_proc_t *pid)
359
{
372
{
360
    int i;
373
    int i;
(-)modules/http/http_request.c (+3 lines)
Lines 526-531 Link Here
526
            return;
526
            return;
527
        }
527
        }
528
        ap_finalize_request_protocol(new);
528
        ap_finalize_request_protocol(new);
529
        if (ap_extended_status && new->connection) {
530
            ap_increment_bytes(new->connection->sbh, new);
531
        }
529
    }
532
    }
530
    else {
533
    else {
531
        ap_die(access_status, new);
534
        ap_die(access_status, new);

Return to bug 30730