← Back to branch summary

~ubuntu-branches/ubuntu/raring/nginx/raring-proposed

« back to all changes in this revision

Viewing changes to src/mail/ngx_mail.c

  • Committer: Package Import Robot
  • Author(s): Kartik Mistry, Kartik Mistry, Michael Lustfield
  • Date: 2011-12-14 09:45:40 UTC
  • mfrom: (1.1.27)
  • Revision ID: package-import@ubuntu.com-20111214094540-kdlo7qnrpm73l2rn
Tags: 1.1.11-1
[Kartik Mistry]
* New upstream release.
* debian/control:
  + Set priority to extra for nginx-light and nginx-extras binaries
    (Policy: Section 2.5)
* debian/patches/607418-ipv6-addresses.diff:
  + Removed. Merged upstream with 1.1.9 release.
* debian/copyright:
  + Updated upstream copyright year, updated Michael's email address, misc
    changes for format.

[Michael Lustfield]
* debian/conf/fastcgi_params:
  + Changed $server_https to $https per new feature in 1.1.11.
* debian/conf/nginx.conf:
  + Removed map for $server_https as it's no longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mail/ngx_mail.c
308
308
    addr->ctx = listen->ctx;
309
309
    addr->bind = listen->bind;
310
310
    addr->wildcard = listen->wildcard;
 
311
    addr->so_keepalive = listen->so_keepalive;
 
312
#if (NGX_HAVE_KEEPALIVE_TUNABLE)
 
313
    addr->tcp_keepidle = listen->tcp_keepidle;
 
314
    addr->tcp_keepintvl = listen->tcp_keepintvl;
 
315
    addr->tcp_keepcnt = listen->tcp_keepcnt;
 
316
#endif
311
317
#if (NGX_MAIL_SSL)
312
318
    addr->ssl = listen->ssl;
313
319
#endif
373
379
            ls->log.data = &ls->addr_text;
374
380
            ls->log.handler = ngx_accept_log_error;
375
381
 
 
382
            ls->keepalive = addr[i].so_keepalive;
 
383
#if (NGX_HAVE_KEEPALIVE_TUNABLE)
 
384
            ls->keepidle = addr[i].tcp_keepidle;
 
385
            ls->keepintvl = addr[i].tcp_keepintvl;
 
386
            ls->keepcnt = addr[i].tcp_keepcnt;
 
387
#endif
 
388
 
376
389
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
377
390
            ls->ipv6only = addr[i].ipv6only;
378
391
#endif