Mercurial > prosody-hg
comparison net/http.lua @ 13508:eac86b5fb04b
Merge 0.12->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 16 Aug 2024 17:06:41 +0200 |
| parents | 23f95714c386 a97c11584042 |
| children | 72018fe1c334 |
comparison
equal
deleted
inserted
replaced
| 13507:4fb6a3eb9c29 | 13508:eac86b5fb04b |
|---|---|
| 315 if using_https then | 315 if using_https then |
| 316 sslctx = ex and ex.sslctx or self.options and self.options.sslctx; | 316 sslctx = ex and ex.sslctx or self.options and self.options.sslctx; |
| 317 if ex and ex.use_dane ~= nil then | 317 if ex and ex.use_dane ~= nil then |
| 318 use_dane = ex.use_dane; | 318 use_dane = ex.use_dane; |
| 319 end | 319 end |
| 320 if not sslctx then | |
| 321 error("Attempt to make HTTPS request but no 'sslctx' provided in options"); | |
| 322 end | |
| 320 end | 323 end |
| 321 | 324 |
| 322 if self.pool then | 325 if self.pool then |
| 323 local pool_id = req.scheme .. "://" .. req.authority; | 326 local pool_id = req.scheme .. "://" .. req.authority; |
| 324 local conn = self.pool[pool_id]; | 327 local conn = self.pool[pool_id]; |
