← Back to branch summary

~ubuntu-branches/ubuntu/precise/nginx/precise-security

« back to all changes in this revision

Viewing changes to src/http/modules/ngx_http_ssl_module.c

  • Committer: Package Import Robot
  • Author(s): Kartik Mistry, Kartik Mistry, Michael Lustfield
  • Date: 2011-11-18 23:44:00 UTC
  • mfrom: (4.2.39 sid)
  • Revision ID: package-import@ubuntu.com-20111118234400-atj8d0zog78vgdte
Tags: 1.1.8-1
http://bugs.debian.org/649061
https://launchpad.net/bugs/825349
https://launchpad.net/bugs/857831
https://launchpad.net/bugs/883440
http://bugs.debian.org/642995
https://launchpad.net/bugs/840358
[Kartik Mistry]
* New upstream release.
* debian/modules/chunkin-nginx-module:
  + Removed as of now, as it breaks with Perl 5.14 (Closes: #649061)

[Michael Lustfield]
* debian/control:
  + Added Map module to nginx-light modules list.
* debian/rules:
  + Removed --without-http_map_module form nginx-light.
* debian/nginx-common.install:
  + Changed ufw profile installation (LP: #825349).
    - debian/ufw.profile -> debian/ufw/nginx.
* debian/nginx-common.preinst:
  + Cleanup of moved nginx profile.
* debian/conf/nginx.conf:
  + Added a default map for $server_https (on|off).
* debian/conf/fastcgi_params:
  + Pass HTTPS so $_SERVER['HTTPS'] is set (LP: #857831).
* debian/conf/mime.types:
  + Added json type (LP: #883440).
* debian/conf/sites-available/default:
  + Added notes about PHP (Closes: #642995).
  + Changed location /doc from root to alias.
  + Changed location /doc to /doc/ for people that don't bother reading or
    learning anything about Nginx configuration files (LP: #840358).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/http/modules/ngx_http_ssl_module.c
101
101
      NULL },
102
102
 
103
103
    { ngx_string("ssl_verify_client"),
104
 
      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
 
104
      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
105
105
      ngx_conf_set_enum_slot,
106
106
      NGX_HTTP_SRV_CONF_OFFSET,
107
107
      offsetof(ngx_http_ssl_srv_conf_t, verify),
346
346
 
347
347
    ngx_pool_cleanup_t  *cln;
348
348
 
349
 
    ngx_conf_merge_value(conf->enable, prev->enable, 0);
 
349
    if (conf->enable == NGX_CONF_UNSET) {
 
350
        if (prev->enable == NGX_CONF_UNSET) {
 
351
            conf->enable = 0;
 
352
 
 
353
        } else {
 
354
            conf->enable = prev->enable;
 
355
            conf->file = prev->file;
 
356
            conf->line = prev->line;
 
357
        }
 
358
    }
350
359
 
351
360
    ngx_conf_merge_value(conf->session_timeout,
352
361
                         prev->session_timeout, 300);
616
625
                return NGX_CONF_ERROR;
617
626
            }
618
627
 
 
628
            sscf->shm_zone->init = ngx_ssl_session_cache_init;
 
629
 
619
630
            continue;
620
631
        }
621
632
 
626
637
        sscf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE;
627
638
    }
628
639
 
629
 
    sscf->shm_zone->init = ngx_ssl_session_cache_init;
630
 
 
631
640
    return NGX_CONF_OK;
632
641
 
633
642
invalid: