Permalink
Browse files

Fix for "ssl_session_cache builtin" (broken since 1.1.1, r3993)

merge from 4154
  • Loading branch information...
1 parent d88ce06 commit ccae2388356e0df7f0bbdf2b68ae0c8fef67c4a1 @yaoweibin committed Mar 17, 2012
Showing with 20 additions and 0 deletions.
  1. +2 −0 modules/ngx_tcp_ssl_module.c
  2. +18 −0 test/t/ssl.t
@@ -476,6 +476,8 @@ ngx_tcp_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_ERROR;
}
+ sscf->shm_zone->init = ngx_ssl_session_cache_init;
+
continue;
}
View
@@ -59,3 +59,21 @@ GET /
--- request_https
GET /
--- response_body_like: ^<(.*)>$
+
+=== TEST 3: the ssl command with websocket
+
+--- config
+ upstream test{
+ server blog.163.com;
+ }
+
+ server {
+ listen 1984 ssl;
+
+ ssl_session_cache builtin:1000 shared:SSL:5m;
+
+ websocket_pass test;
+ }
+--- request_https
+GET /
+--- response_body_like: ^<(.*)>$

0 comments on commit ccae238

Please sign in to comment.