Merge ~lucaskanashiro/ubuntu/+source/haproxy:focal-mre into ubuntu/+source/haproxy:ubuntu/focal-devel

Proposed by Lucas Kanashiro
Status: Superseded
Proposed branch: ~lucaskanashiro/ubuntu/+source/haproxy:focal-mre
Merge into: ubuntu/+source/haproxy:ubuntu/focal-devel
Diff against target: 26087 lines (+9825/-2857)
237 files modified
BRANCHES (+1/-1)
CHANGELOG (+811/-0)
CONTRIBUTING (+3/-3)
INSTALL (+3/-3)
MAINTAINERS (+10/-1)
Makefile (+24/-8)
SUBVERS (+1/-1)
VERDATE (+2/-2)
VERSION (+1/-1)
contrib/deviceatlas/dac.c (+3/-2)
contrib/halog/fgets2.c (+3/-3)
contrib/halog/halog.c (+8/-8)
contrib/modsecurity/README (+4/-4)
contrib/prometheus-exporter/README (+35/-5)
contrib/prometheus-exporter/service-prometheus.c (+50/-20)
contrib/spoa_example/include/mini-clist.h (+1/-1)
contrib/spoa_server/README (+2/-2)
contrib/spoa_server/ps_python.c (+79/-32)
contrib/systemd/haproxy.service.in (+4/-3)
debian/changelog (+13/-0)
debian/patches/haproxy.service-add-documentation.patch (+3/-5)
debian/patches/haproxy.service-start-after-syslog.patch (+4/-6)
debian/patches/series (+0/-13)
dev/null (+0/-51)
doc/SPOE.txt (+7/-2)
doc/architecture.txt (+2/-2)
doc/coding-style.txt (+2/-2)
doc/configuration.txt (+306/-212)
doc/internals/acl.txt (+3/-3)
doc/internals/buffer-api.txt (+1/-1)
doc/internals/filters.txt (+9/-9)
doc/internals/hashing.txt (+2/-2)
doc/internals/htx-api.txt (+498/-0)
doc/lua-api/index.rst (+27/-17)
doc/lua.txt (+2/-2)
doc/management.txt (+39/-24)
doc/peers-v2.0.txt (+7/-7)
doc/proxy-protocol.txt (+16/-4)
doc/regression-testing.txt (+1/-1)
ebtree/eb32sctree.h (+6/-1)
ebtree/eb32tree.h (+2/-1)
ebtree/eb64tree.h (+32/-19)
ebtree/ebimtree.h (+2/-2)
ebtree/ebmbtree.h (+8/-3)
ebtree/ebpttree.h (+4/-1)
ebtree/ebtree.c (+19/-0)
ebtree/ebtree.h (+10/-3)
include/common/compat.h (+10/-0)
include/common/compiler.h (+90/-0)
include/common/config.h (+0/-8)
include/common/h2.h (+2/-0)
include/common/hathreads.h (+105/-31)
include/common/hpack-tbl.h (+11/-0)
include/common/http.h (+3/-0)
include/common/htx.h (+27/-1)
include/common/ist.h (+12/-0)
include/common/memory.h (+41/-37)
include/common/mini-clist.h (+1/-1)
include/common/openssl-compat.h (+5/-2)
include/common/standard.h (+42/-3)
include/common/time.h (+2/-0)
include/import/atomic-ops.h (+11/-0)
include/import/plock.h (+0/-2)
include/proto/action.h (+5/-0)
include/proto/channel.h (+37/-33)
include/proto/checks.h (+3/-1)
include/proto/cli.h (+1/-0)
include/proto/connection.h (+9/-2)
include/proto/dns.h (+1/-1)
include/proto/filters.h (+4/-6)
include/proto/freq_ctr.h (+15/-11)
include/proto/hlua.h (+1/-0)
include/proto/http_htx.h (+2/-1)
include/proto/http_rules.h (+3/-0)
include/proto/lb_chash.h (+1/-1)
include/proto/mworker.h (+2/-1)
include/proto/obj_type.h (+1/-0)
include/proto/pattern.h (+2/-2)
include/proto/peers.h (+1/-1)
include/proto/port_range.h (+2/-0)
include/proto/protocol_buffers.h (+4/-4)
include/proto/proxy.h (+2/-2)
include/proto/queue.h (+2/-2)
include/proto/sample.h (+5/-2)
include/proto/server.h (+3/-1)
include/proto/shctx.h (+9/-4)
include/proto/signal.h (+5/-0)
include/proto/stream.h (+2/-1)
include/proto/stream_interface.h (+9/-0)
include/proto/task.h (+38/-0)
include/proto/tcp_rules.h (+5/-0)
include/types/channel.h (+1/-1)
include/types/checks.h (+6/-4)
include/types/cli.h (+3/-1)
include/types/connection.h (+6/-5)
include/types/counters.h (+1/-1)
include/types/dns.h (+8/-3)
include/types/filters.h (+1/-0)
include/types/global.h (+2/-0)
include/types/proto_http.h (+1/-0)
include/types/proxy.h (+5/-2)
include/types/server.h (+4/-3)
include/types/shctx.h (+4/-0)
include/types/signal.h (+20/-0)
include/types/spoe.h (+1/-0)
include/types/stats.h (+1/-0)
include/types/stick_table.h (+2/-1)
include/types/stream.h (+2/-1)
reg-tests/balance/balance-rr.vtc (+73/-0)
reg-tests/balance/balance-uri-path-only.vtc (+97/-0)
reg-tests/balance/balance-uri.vtc (+74/-0)
reg-tests/checks/http-check-send.vtc (+150/-0)
reg-tests/checks/ldap-check.vtc (+104/-0)
reg-tests/checks/tls_health_checks.vtc (+31/-6)
reg-tests/compression/lua_validation.vtc (+2/-2)
reg-tests/connection/proxy_protocol_tlv_validation.vtc (+140/-0)
reg-tests/converter/field.vtc (+1/-1)
reg-tests/http-errorfiles/errorfiles.vtc (+51/-0)
reg-tests/http-errorfiles/errors/400-1.http (+9/-0)
reg-tests/http-errorfiles/errors/400-2.http (+9/-0)
reg-tests/http-errorfiles/errors/400-3.http (+9/-0)
reg-tests/http-errorfiles/errors/400.http (+9/-0)
reg-tests/http-errorfiles/errors/403-1.http (+9/-0)
reg-tests/http-errorfiles/errors/403-2.http (+9/-0)
reg-tests/http-errorfiles/errors/403.http (+9/-0)
reg-tests/http-errorfiles/errors/404-1.http (+9/-0)
reg-tests/http-errorfiles/errors/404-2.http (+9/-0)
reg-tests/http-errorfiles/errors/404-3.http (+9/-0)
reg-tests/http-errorfiles/errors/404.http (+9/-0)
reg-tests/http-errorfiles/errors/500-1.http (+9/-0)
reg-tests/http-errorfiles/errors/500.http (+9/-0)
reg-tests/http-errorfiles/http_deny_errors.vtc (+57/-0)
reg-tests/http-errorfiles/http_errors.vtc (+134/-0)
reg-tests/http-messaging/h2_desync_attacks.vtc (+142/-0)
reg-tests/http-messaging/http_abortonclose.vtc (+115/-0)
reg-tests/http-messaging/http_request_buffer.vtc (+35/-1)
reg-tests/http-rules/acl_cli_spaces.vtc (+80/-0)
reg-tests/http-rules/agents.acl (+1/-0)
reg-tests/http-rules/h1or2_to_h1c.vtc (+2/-0)
reg-tests/http-rules/map_regm_with_backref.vtc (+1/-1)
reg-tests/lua/txn_get_priv.vtc (+1/-1)
reg-tests/sample_fetches/so_name.vtc (+22/-0)
reg-tests/seamless-reload/abns_socket.vtc (+5/-4)
reg-tests/server/cli_set_fdqn.vtc (+1/-1)
reg-tests/ssl/ca-auth.crt (+33/-0)
reg-tests/ssl/client1.pem (+81/-0)
reg-tests/ssl/client2_expired.pem (+81/-0)
reg-tests/ssl/client3_revoked.pem (+81/-0)
reg-tests/ssl/crl-auth.pem (+18/-0)
reg-tests/ssl/ssl_client_auth.vtc (+85/-0)
reg-tests/ssl/ssl_client_samples.vtc (+72/-0)
reg-tests/ssl/ssl_frontend_samples.vtc (+72/-0)
scripts/announce-release (+94/-40)
scripts/build-ssl.sh (+17/-7)
scripts/git-show-backports (+10/-4)
scripts/publish-release (+3/-2)
scripts/run-regtests.sh (+8/-2)
src/51d.c (+1/-1)
src/action.c (+29/-0)
src/applet.c (+10/-0)
src/arg.c (+7/-0)
src/auth.c (+4/-1)
src/backend.c (+42/-20)
src/base64.c (+6/-3)
src/buffer.c (+1/-1)
src/cache.c (+36/-26)
src/cfgparse-global.c (+26/-7)
src/cfgparse-listen.c (+138/-23)
src/cfgparse.c (+92/-104)
src/channel.c (+89/-4)
src/checks.c (+269/-59)
src/chunk.c (+2/-2)
src/cli.c (+185/-89)
src/compression.c (+7/-0)
src/connection.c (+54/-31)
src/debug.c (+18/-12)
src/dns.c (+221/-112)
src/ev_poll.c (+0/-1)
src/ev_select.c (+1/-5)
src/fd.c (+9/-3)
src/filters.c (+78/-10)
src/flt_http_comp.c (+34/-12)
src/flt_spoe.c (+122/-67)
src/flt_trace.c (+6/-6)
src/freq_ctr.c (+6/-6)
src/h2.c (+8/-0)
src/haproxy.c (+379/-86)
src/hathreads.c (+28/-3)
src/hlua.c (+218/-60)
src/hlua_fcn.c (+14/-4)
src/hpack-tbl.c (+2/-2)
src/http.c (+36/-2)
src/http_act.c (+15/-4)
src/http_conv.c (+22/-11)
src/http_fetch.c (+145/-72)
src/http_htx.c (+102/-23)
src/http_rules.c (+7/-3)
src/htx.c (+106/-52)
src/lb_chash.c (+8/-1)
src/lb_fwlc.c (+13/-7)
src/listener.c (+19/-1)
src/log.c (+35/-9)
src/map.c (+34/-23)
src/memory.c (+75/-71)
src/mux_h1.c (+160/-57)
src/mux_h2.c (+243/-95)
src/mux_pt.c (+29/-10)
src/mworker-prog.c (+7/-0)
src/mworker.c (+36/-2)
src/namespace.c (+2/-1)
src/pattern.c (+135/-50)
src/peers.c (+229/-108)
src/proto_http.c (+69/-52)
src/proto_htx.c (+103/-74)
src/proto_sockpair.c (+0/-4)
src/proto_tcp.c (+18/-6)
src/proto_uxst.c (+0/-4)
src/proxy.c (+22/-5)
src/queue.c (+15/-7)
src/raw_sock.c (+2/-3)
src/sample.c (+98/-39)
src/server.c (+306/-259)
src/session.c (+1/-1)
src/shctx.c (+10/-11)
src/signal.c (+9/-1)
src/ssl_sock.c (+285/-129)
src/standard.c (+168/-21)
src/stats.c (+21/-15)
src/stick_table.c (+21/-10)
src/stream.c (+108/-51)
src/stream_interface.c (+67/-12)
src/task.c (+47/-11)
src/tcp_rules.c (+25/-8)
src/time.c (+13/-1)
src/vars.c (+30/-11)
src/wdt.c (+8/-10)
src/xxhash.c (+14/-2)
Reviewer Review Type Date Requested Status
git-ubuntu import Pending
Review via email: mp+429078@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2022-08-29.

To post a comment you must log in.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches