Mercurial > hg > nginx
comparison src/http/modules/ngx_http_ssl_module.c @ 1310:33d6c994a0b2
Sun Studio on sparc uses different bit order
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 17 Jul 2007 09:23:23 +0000 |
parents | 86c5c9288acc |
children | 4c43e25d11ea |
comparison
equal
deleted
inserted
replaced
1309:08c6ee7a1b11 | 1310:33d6c994a0b2 |
---|---|
195 ngx_http_ssl_static_variable(ngx_http_request_t *r, | 195 ngx_http_ssl_static_variable(ngx_http_request_t *r, |
196 ngx_http_variable_value_t *v, uintptr_t data) | 196 ngx_http_variable_value_t *v, uintptr_t data) |
197 { | 197 { |
198 ngx_ssl_variable_handler_pt handler = (ngx_ssl_variable_handler_pt) data; | 198 ngx_ssl_variable_handler_pt handler = (ngx_ssl_variable_handler_pt) data; |
199 | 199 |
200 size_t len; | 200 size_t len; |
201 ngx_str_t s; | |
201 | 202 |
202 if (r->connection->ssl) { | 203 if (r->connection->ssl) { |
203 | 204 |
204 (void) handler(r->connection, NULL, (ngx_str_t *) v); | 205 (void) handler(r->connection, NULL, &s); |
206 | |
207 v->data = s.data; | |
205 | 208 |
206 for (len = 0; v->data[len]; len++) { /* void */ } | 209 for (len = 0; v->data[len]; len++) { /* void */ } |
207 | 210 |
208 v->len = len; | 211 v->len = len; |
209 v->valid = 1; | 212 v->valid = 1; |
223 ngx_http_ssl_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, | 226 ngx_http_ssl_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, |
224 uintptr_t data) | 227 uintptr_t data) |
225 { | 228 { |
226 ngx_ssl_variable_handler_pt handler = (ngx_ssl_variable_handler_pt) data; | 229 ngx_ssl_variable_handler_pt handler = (ngx_ssl_variable_handler_pt) data; |
227 | 230 |
231 ngx_str_t s; | |
232 | |
228 if (r->connection->ssl) { | 233 if (r->connection->ssl) { |
229 if (handler(r->connection, r->pool, (ngx_str_t *) v) != NGX_OK) { | 234 |
235 if (handler(r->connection, r->pool, &s) != NGX_OK) { | |
230 return NGX_ERROR; | 236 return NGX_ERROR; |
231 } | 237 } |
238 | |
239 v->len = s.len; | |
240 v->data = s.data; | |
232 | 241 |
233 if (v->len) { | 242 if (v->len) { |
234 v->valid = 1; | 243 v->valid = 1; |
235 v->no_cachable = 0; | 244 v->no_cachable = 0; |
236 v->not_found = 0; | 245 v->not_found = 0; |