~ubuntu-branches/ubuntu/maverick/postfix/maverick-security

« back to all changes in this revision

Viewing changes to src/qmgr/qmgr_transport.c

  • Committer: Bazaar Package Importer
  • Author(s): LaMont Jones, Wietse Venema, LaMont Jones
  • Date: 2009-06-03 14:17:08 UTC
  • mfrom: (1.1.22 upstream)
  • Revision ID: james.westby@ubuntu.com-20090603141708-o9u59xlor7nmd2x1
[Wietse Venema]

* New upstream release: 2.6.2~rc1

[LaMont Jones]

* move postfix-add-{filter,policy} manpages to section 8, and deliver
* provide: default-mta on ubuntu

Show diffs side-by-side

added added

removed removed

Lines of Context:
291
291
            continue;
292
292
        need = xport->pending + 1;
293
293
        for (queue = xport->queue_list.next; queue; queue = queue->peers.next) {
 
294
            if (QMGR_QUEUE_READY(queue) == 0)
 
295
                continue;
294
296
            if ((need -= MIN5af51743e4eef(queue->window - queue->busy_refcount,
295
297
                                          queue->todo_refcount)) <= 0) {
296
298
                QMGR_LIST_ROTATE(qmgr_transport_list, xport, peers);
342
344
    transport->pending += 1;
343
345
    if ((alloc->stream = mail_connect(MAIL_CLASS_PRIVATE, transport->name,
344
346
                                      NON_BLOCKING)) == 0) {
345
 
        msg_warn("connect to transport %s: %m", transport->name);
 
347
        msg_warn("connect to transport %s/%s: %m",
 
348
                 MAIL_CLASS_PRIVATE, transport->name);
346
349
        event_request_timer(qmgr_transport_event, (char *) alloc, 0);
347
350
        return;
348
351
    }
390
393
        get_mail_conf_int2(name, _INIT_DEST_CON,
391
394
                           var_init_dest_concurrency, 1, 0);
392
395
    transport->rate_delay = get_mail_conf_time2(name, _DEST_RATE_DELAY,
393
 
                                                var_dest_rate_delay, 
 
396
                                                var_dest_rate_delay,
394
397
                                                's', 0, 0);
395
398
 
396
399
    if (transport->rate_delay > 0)