← Back to branch summary

~blankon/blankon/nginx.head

« back to all changes in this revision

Viewing changes to src/mail/ngx_mail_pop3_handler.c

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2010-11-28 08:38:27 UTC
  • mfrom: (4.2.24 sid)
  • Revision ID: james.westby@ubuntu.com-20101128083827-yxc30ucpllbu3h08
Tags: 0.8.53-1ubuntu1
https://launchpad.net/bugs/547267
https://launchpad.net/bugs/674224
* Merge from debian unstable. Remaining changes:
  - Don't copy the default site directly into /var/www/ in the package,
    but instead keep it in /usr/share/nginx/nginx-default and move it to
   /var/www/nginx-default/ just after installation. (LP: #547267)
* debian/patches/nginx-html5-codecs.diff
  - Add support for html5 codecs (LP: #674224)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mail/ngx_mail_pop3_handler.c
59
59
        s->out.len = p - s->out.data;
60
60
 
61
61
    } else {
62
 
        s->out.len = sizeof(pop3_greeting) - 1;
63
 
        s->out.data = pop3_greeting;
 
62
        ngx_str_set(&s->out, pop3_greeting);
64
63
    }
65
64
 
66
65
    c->read->handler = ngx_mail_pop3_init_protocol;
149
148
        return;
150
149
    }
151
150
 
152
 
    s->out.len = sizeof(pop3_ok) - 1;
153
 
    s->out.data = pop3_ok;
 
151
    ngx_str_set(&s->out, pop3_ok);
154
152
 
155
153
    if (rc == NGX_OK) {
156
154
        switch (s->mail_state) {
226
224
        case ngx_pop3_auth_login_username:
227
225
            rc = ngx_mail_auth_login_username(s, c, 0);
228
226
 
229
 
            s->out.len = sizeof(pop3_password) - 1;
230
 
            s->out.data = pop3_password;
 
227
            ngx_str_set(&s->out, pop3_password);
231
228
            s->mail_state = ngx_pop3_auth_login_password;
232
229
            break;
233
230
 
259
256
        s->mail_state = ngx_pop3_start;
260
257
        s->state = 0;
261
258
 
262
 
        s->out.len = sizeof(pop3_invalid_command) - 1;
263
 
        s->out.data = pop3_invalid_command;
 
259
        ngx_str_set(&s->out, pop3_invalid_command);
264
260
 
265
261
        /* fall through */
266
262
 
466
462
 
467
463
    case NGX_MAIL_AUTH_LOGIN:
468
464
 
469
 
        s->out.len = sizeof(pop3_username) - 1;
470
 
        s->out.data = pop3_username;
 
465
        ngx_str_set(&s->out, pop3_username);
471
466
        s->mail_state = ngx_pop3_auth_login_username;
472
467
 
473
468
        return NGX_OK;
474
469
 
475
470
    case NGX_MAIL_AUTH_LOGIN_USERNAME:
476
471
 
477
 
        s->out.len = sizeof(pop3_password) - 1;
478
 
        s->out.data = pop3_password;
 
472
        ngx_str_set(&s->out, pop3_password);
479
473
        s->mail_state = ngx_pop3_auth_login_password;
480
474
 
481
475
        return ngx_mail_auth_login_username(s, c, 1);
482
476
 
483
477
    case NGX_MAIL_AUTH_PLAIN:
484
478
 
485
 
        s->out.len = sizeof(pop3_next) - 1;
486
 
        s->out.data = pop3_next;
 
479
        ngx_str_set(&s->out, pop3_next);
487
480
        s->mail_state = ngx_pop3_auth_plain;
488
481
 
489
482
        return NGX_OK;