~ubuntu-branches/ubuntu/jaunty/nginx/jaunty-updates

« back to all changes in this revision

Viewing changes to src/mail/ngx_mail_proxy_module.c

  • Committer: Bazaar Package Importer
  • Author(s): Jose Parrella
  • Date: 2007-12-08 11:27:54 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20071208112754-23ohg2b1zshkdayw
Tags: 0.5.33-1
* New stable upstream release (Closes: #451173)
* nginx now provides httpd, httpd-cgi virtual packages
  (Closes: #439468, #452025)
* sites-enabled/default link is now provided only on fresh 
  installations (Closes: #432961)
* Updated code for online upgrading of nginx (Closes: #445246)
* Reviewed maintainer scripts for correct behaviour on updates
  (Closes: #452787, #435965)
* Removed debian/nginx.links and debian/preinst.
* Changing Maintainer address to bureado@debian.org.
* Welcoming Fabio Tranchitella <kobold@debian.org> as an nginx 
  uploader for Debian. Thanks for your patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
78
78
 
79
79
 
80
80
static ngx_mail_module_t  ngx_mail_proxy_module_ctx = {
 
81
    NULL,                                  /* protocol */
 
82
 
81
83
    NULL,                                  /* create main configuration */
82
84
    NULL,                                  /* init main configuration */
83
85
 
866
868
 
867
869
    c->log->action = "proxying";
868
870
 
869
 
    if ((s->connection->read->eof || s->proxy->upstream.connection->read->eof)
870
 
        && s->buffer->pos == s->buffer->last
871
 
        && s->proxy->buffer->pos == s->proxy->buffer->last)
 
871
    if ((s->connection->read->eof && s->buffer->pos == s->buffer->last)
 
872
        || (s->proxy->upstream.connection->read->eof
 
873
            && s->proxy->buffer->pos == s->proxy->buffer->last)
 
874
        || (s->connection->read->eof
 
875
            && s->proxy->upstream.connection->read->eof))
872
876
    {
873
877
        action = c->log->action;
874
878
        c->log->action = NULL;