7d1cc56a78Conflict resolution notes: - mix.lock: kept this branch's versions for cowlib, h2, hackney and hpax. Those upgrades are the point of the branch; develop is still on hackney 1.20.1. - .woodpecker/docker-armv7.yaml: accepted develop's deletion. It only existed here to build mdex_native on armv7, and mdex was already replaced with earmark again. - lib/pleroma/reverse_proxy.ex: took develop's version. It independently grew request_with_constraints/5 and the invalid-status close, which supersede the equivalent fixes on this branch. Re-applied this branch's recv_timeout seeding, which develop does not have. - lib/pleroma/gun/connection_pool/worker.ex and lib/pleroma/reverse_proxy/client/tesla.ex: took develop's versions. The gun pool rework (#7934) already guards the demonitor and makes release_conn/cancel_stream exit-safe, and it splits the Tesla client's graceful release from its abort path, so this branch's changes there are obsolete. That leaves the client leak fix as a Hackney-only concern, which stream_body/1 now handles the same way the gun client does. |
||
|---|---|---|
| .. | ||
| mix | ||
| pleroma | ||