← Back to branch summary

~britco/nginx/master

« back to all changes in this revision

Viewing changes to src/mail/ngx_mail_auth_http_module.c

  • Committer: Bazaar Package Importer
  • Author(s): Kartik Mistry, Kartik Mistry, Michael Lustfield
  • Date: 2010-11-27 21:04:02 UTC
  • mfrom: (1.3.8 upstream)
  • mto: This revision was merged to the branch mainline in revision 36.
  • Revision ID: james.westby@ubuntu.com-20101127210402-14sgjpe6r3jup8a9
Tags: 0.8.53-1
http://bugs.debian.org/592147
http://bugs.debian.org/593142
http://bugs.debian.org/593143
http://bugs.debian.org/594598
http://bugs.debian.org/602970
http://bugs.debian.org/581416
[Kartik Mistry]
* debian/control:
  + Added Michael Lustfield as co-maintainer
* nginx.conf:
  + No need to use regex in gzip_disable for msie6, Thanks to António P. P.
    Almeida <appa@perusio.net> (Closes: #592147)
* conf/sites-available/default:
  + Fixed typo for "include fastcgi", Thanks to Mostafa Ghadamyari
    <nginx@gigfa.com> (Closes: #593142, #593143)
* debian/patches/fix_reloading_ipv6.diff:
  + Removed, merged upstream
* debian/init.d:
  + Added fix to control nginx by user in a simple way by setting DAEMON
    variable to an invalid name in /etc/default/nginx. Patch by Toni Mueller
    <support@oeko.net> (Closes: #594598)
* debian/NEWS.Debian:
  + Updated news for 0.8.x as stable branch

[Michael Lustfield]
* New upstream release (Closes: #602970)
  + 0.8.x branch is declared stable by upstream now
* Add a UFW profile set:
  + debian/nginx.ufw.profile: Added.
  + debian/control: nginx: Suggests ufw.
  + debian/dirs: Add 'etc/ufw/applications.d'
  + debian/rules: Add install rule for the nginx UFW profile.
* Moved debian/dirs to debian/nginx.dirs
* Added types_hash_max_size to nginx.conf
* Install simple default index.html file (Closes: #581416)
  + debian/dirs: Add 'usr/share/nginx/www'.
  + debian/nginx.install: Add 'html/* usr/share/nginx/www'.
* debian/patches/nginx-echo.diff:
  + Added Echo module
* Added files for nginx.docs
  - /usr/share/doc/nginx/
    + debian/help/docs/fcgiwrap
    + debian/help/docs/php
    + debian/help/docs/support-irc
    + debian/help/docs/upstream
* Added files for nginx.examples
  - /usr/share/doc/nginx/examples/
    + debian/help/docs/drupal
    + debian/help/docs/http
    + debian/help/docs/mail
    + debian/help/docs/mailman
    + debian/help/docs/nginx.conf
    + debian/help/docs/virtual_hosts
    + debian/help/docs/wordpress
* debian/conf/:
  + Removed excess spaces
  + Added tabs where appropriate
  + Added SCRIPT_FILENAME to fastcgi_params

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mail/ngx_mail_auth_http_module.c
12
12
 
13
13
 
14
14
typedef struct {
15
 
    ngx_peer_addr_t                *peer;
 
15
    ngx_addr_t                     *peer;
16
16
 
17
17
    ngx_msec_t                      timeout;
18
18
 
457
457
    time_t               timer;
458
458
    size_t               len, size;
459
459
    ngx_int_t            rc, port, n;
460
 
    ngx_peer_addr_t     *peer;
 
460
    ngx_addr_t          *peer;
461
461
    struct sockaddr_in  *sin;
462
462
 
463
463
    ngx_log_debug0(NGX_LOG_DEBUG_MAIL, s->connection->log, 0,
764
764
                return;
765
765
            }
766
766
 
767
 
            peer = ngx_pcalloc(s->connection->pool, sizeof(ngx_peer_addr_t));
 
767
            peer = ngx_pcalloc(s->connection->pool, sizeof(ngx_addr_t));
768
768
            if (peer == NULL) {
769
769
                ngx_destroy_pool(ctx->pool);
770
770
                ngx_mail_session_internal_server_error(s);
795
795
 
796
796
            sin->sin_port = htons((in_port_t) port);
797
797
 
798
 
            ctx->addr.data[ctx->addr.len] = '\0';
799
 
            sin->sin_addr.s_addr = inet_addr((char *) ctx->addr.data);
 
798
            sin->sin_addr.s_addr = ngx_inet_addr(ctx->addr.data, ctx->addr.len);
800
799
            if (sin->sin_addr.s_addr == INADDR_NONE) {
801
800
                ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
802
801
                              "auth http server %V sent invalid server "
1406
1405
 
1407
1406
    ahcf->peer = u.addrs;
1408
1407
 
1409
 
    ahcf->host_header = u.host;
 
1408
    if (u.family != AF_UNIX) {
 
1409
        ahcf->host_header = u.host;
 
1410
 
 
1411
    } else {
 
1412
        ngx_str_set(&ahcf->host_header, "localhost");
 
1413
    }
 
1414
 
1410
1415
    ahcf->uri = u.uri;
1411
1416
 
1412
1417
    if (ahcf->uri.len == 0) {
1413
 
        ahcf->uri.len = sizeof("/") - 1;
1414
 
        ahcf->uri.data = (u_char *) "/";
 
1418
        ngx_str_set(&ahcf->uri, "/");
1415
1419
    }
1416
1420
 
1417
1421
    return NGX_CONF_OK;