[pull] master from haproxy:master#251
Merged
pull[bot] merged 2 commits intoPhoenixRedflash:masterfrom Sep 28, 2023
Merged
Conversation
Added set-timeout for frontend side of session, so it can be used to set custom per-client timeouts if needed. Added cur_client_timeout to fetch client timeout samples.
When rcv_buf stream callback is invoked, mux tasklet is woken up if demux was previously blocked due to lack of buffer space. A BUG_ON() is present to ensure there is data in qcs Rx buffer. If this is not the case, wakeup is unneeded : BUG_ON(!ncb_data(&qcs->rx.ncbuf, 0)); This BUG_ON() may be triggered if RESET_STREAM is received after demux has been blocked. On reset, Rx buffer is purged according to RFC 9000 which allows to discard any data not yet consumed. This will trigger the BUG_ON() assertion if rcv_buf stream callback is invoked after this. To prevent BUG_ON() crash, just clear demux block flag each time Rx buffer is purged. This covers accordingly RESET_STREAM reception. This should be backported up to 2.7. This may fix github issue #2293. This bug relies on several precondition so its occurence is rare. This was reproduced by using a custom client which post big enough data to fill the buffer. It then emits a RESET_STREAM in place of a proper FIN. Moreover, mux code has been edited to artificially stalled stream read to force demux blocking. h3_data_to_htx: - return htx_sent; + return 1; qcc_recv_reset_stream: qcs_free_ncbuf(qcs, &qcs->rx.ncbuf); + qcs_notify_recv(qcs); qmux_strm_rcv_buf: char fin = 0; + static int i = 0; + if (++i < 2) + return 0; TRACE_ENTER(QMUX_EV_STRM_RECV, qcc->conn, qcs);
pull bot
pushed a commit
that referenced
this pull request
Oct 9, 2023
This patch add a hash of the Origin header to the cache's secondary key. This enables to manage store responses that have a "Vary: Origin" header in the cache when vary is enabled. This cannot be considered as a means to manage CORS requests though, it only processes the Origin header and hashes the presented value without any form of URI normalization. This need was expressed by Philipp Hossner in GitHub issue #251. Co-Authored-by: Philipp Hossner <philipp.hossner@posteo.de>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )