Author: mdounin
Date: 2011-10-31 09:57:14 +0000 (Mon, 31 Oct 2011)
New Revision: 4235

Log:
Fixed segfault on configuration testing with ssl (ticket #37).

The following config caused segmentation fault due to conf->file not
being properly set if "ssl on" was inherited from the http level:

http {
ssl on;
server {
}
}


Modified:
trunk/src/http/modules/ngx_http_ssl_module.c

Modified: trunk/src/http/modules/ngx_http_ssl_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_ssl_module.c 2011-10-31 09:54:55 UTC (rev 4234)
+++ trunk/src/http/modules/ngx_http_ssl_module.c 2011-10-31 09:57:14 UTC (rev 4235)
@@ -346,8 +346,17 @@

ngx_pool_cleanup_t *cln;

- ngx_conf_merge_value(conf->enable, prev->enable, 0);
+ if (conf->enable == NGX_CONF_UNSET) {
+ if (prev->enable == NGX_CONF_UNSET) {
+ conf->enable = 0;

+ } else {
+ conf->enable = prev->enable;
+ conf->file = prev->file;
+ conf->line = prev->line;
+ }
+ }
+
ngx_conf_merge_value(conf->session_timeout,
prev->session_timeout, 300);


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel