mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2025-01-03 02:32:03 +00:00
CLEANUP: assorted typo fixes in the code and comments
This is 35th iteration of typo fixes
This commit is contained in:
parent
7e6e0388d6
commit
07be66d21b
@ -230,7 +230,7 @@ max-frame-size <number>
|
|||||||
|
|
||||||
max-waiting-frames <number>
|
max-waiting-frames <number>
|
||||||
Set the maximum number of frames waiting for an acknowledgement on the same
|
Set the maximum number of frames waiting for an acknowledgement on the same
|
||||||
connection. This value is only used when the pipelinied or asynchronus
|
connection. This value is only used when the pipelinied or asynchronous
|
||||||
exchanges between HAProxy and SPOA are enabled. By default, it is set to 20.
|
exchanges between HAProxy and SPOA are enabled. By default, it is set to 20.
|
||||||
|
|
||||||
messages <msg-name> ...
|
messages <msg-name> ...
|
||||||
@ -248,7 +248,7 @@ messages <msg-name> ...
|
|||||||
|
|
||||||
option async
|
option async
|
||||||
no option async
|
no option async
|
||||||
Enable or disable the support of asynchronus exchanges between HAProxy and
|
Enable or disable the support of asynchronous exchanges between HAProxy and
|
||||||
SPOA. By default, this option is enabled.
|
SPOA. By default, this option is enabled.
|
||||||
|
|
||||||
|
|
||||||
|
@ -3390,7 +3390,7 @@ tune.ssl.ocsp-update.mindelay <number>
|
|||||||
tune.stick-counters <number>
|
tune.stick-counters <number>
|
||||||
Sets the number of stick-counters that may be tracked at the same time by a
|
Sets the number of stick-counters that may be tracked at the same time by a
|
||||||
connection or a request via "track-sc*" actions in "tcp-request" or
|
connection or a request via "track-sc*" actions in "tcp-request" or
|
||||||
"http-request" rules. The defaut value is set at build time by the macro
|
"http-request" rules. The default value is set at build time by the macro
|
||||||
MAX_SESS_STK_CTR, and defaults to 3. With this setting it is possible to
|
MAX_SESS_STK_CTR, and defaults to 3. With this setting it is possible to
|
||||||
change the value and ignore the one passed at build time. Increasing this
|
change the value and ignore the one passed at build time. Increasing this
|
||||||
value may be needed when porting complex configurations to haproxy, but users
|
value may be needed when porting complex configurations to haproxy, but users
|
||||||
@ -9175,7 +9175,7 @@ no option forwarded
|
|||||||
those result will be used as 'for' parameter nodeport value
|
those result will be used as 'for' parameter nodeport value
|
||||||
|
|
||||||
|
|
||||||
Since HAProxy works in reverse-proxy mode, servers are loosing some request
|
Since HAProxy works in reverse-proxy mode, servers are losing some request
|
||||||
context (request origin: client ip address, protocol used...)
|
context (request origin: client ip address, protocol used...)
|
||||||
|
|
||||||
A common way to address this limitation is to use the well known
|
A common way to address this limitation is to use the well known
|
||||||
@ -9189,7 +9189,7 @@ no option forwarded
|
|||||||
forwarded header (RFC7239).
|
forwarded header (RFC7239).
|
||||||
More information here: https://www.rfc-editor.org/rfc/rfc7239.html
|
More information here: https://www.rfc-editor.org/rfc/rfc7239.html
|
||||||
|
|
||||||
The use of this single header allow to convey multiple informations
|
The use of this single header allow to convey numerous details
|
||||||
within the same header, and most importantly, fixes the proxy chaining
|
within the same header, and most importantly, fixes the proxy chaining
|
||||||
issue. (the rfc allows for multiple chained proxies to append their own
|
issue. (the rfc allows for multiple chained proxies to append their own
|
||||||
values to an already existing header).
|
values to an already existing header).
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include <haproxy/http-t.h>
|
#include <haproxy/http-t.h>
|
||||||
#include <haproxy/htx-t.h>
|
#include <haproxy/htx-t.h>
|
||||||
|
|
||||||
/* ->extra field value when the payload lenght is unknown (non-chunked message
|
/* ->extra field value when the payload length is unknown (non-chunked message
|
||||||
* with no "Content-length" header)
|
* with no "Content-length" header)
|
||||||
*/
|
*/
|
||||||
#define HTX_UNKOWN_PAYLOAD_LENGTH ULLONG_MAX
|
#define HTX_UNKOWN_PAYLOAD_LENGTH ULLONG_MAX
|
||||||
|
@ -270,7 +270,7 @@ struct quic_frame {
|
|||||||
struct list reflist; /* List head containing duplicated children frames. */
|
struct list reflist; /* List head containing duplicated children frames. */
|
||||||
struct list ref; /* List elem from parent frame reflist. Set if frame is a duplicate (used for retransmission). */
|
struct list ref; /* List elem from parent frame reflist. Set if frame is a duplicate (used for retransmission). */
|
||||||
unsigned int flags; /* QUIC_FL_TX_FRAME_* */
|
unsigned int flags; /* QUIC_FL_TX_FRAME_* */
|
||||||
unsigned int loss_count; /* Counter for each occurence of this frame marked as lost. */
|
unsigned int loss_count; /* Counter for each occurrence of this frame marked as lost. */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -204,7 +204,7 @@ static inline struct quic_frame *qc_frm_alloc(int type)
|
|||||||
|
|
||||||
/* Allocate a quic_frame by duplicating <origin> frame. This will create a new
|
/* Allocate a quic_frame by duplicating <origin> frame. This will create a new
|
||||||
* frame of the same type with the same content. Internal fields such as packet
|
* frame of the same type with the same content. Internal fields such as packet
|
||||||
* owner and flags are however resetted for the newly allocated frame except
|
* owner and flags are however reset for the newly allocated frame except
|
||||||
* for the loss counter. Frame must be freed with qc_frm_free().
|
* for the loss counter. Frame must be freed with qc_frm_free().
|
||||||
*
|
*
|
||||||
* Returns the allocated frame or NULL on failure.
|
* Returns the allocated frame or NULL on failure.
|
||||||
|
@ -57,7 +57,7 @@
|
|||||||
|
|
||||||
/* Flags set on the SPOE applet */
|
/* Flags set on the SPOE applet */
|
||||||
#define SPOE_APPCTX_FL_PIPELINING 0x00000001 /* Set if pipelining is supported */
|
#define SPOE_APPCTX_FL_PIPELINING 0x00000001 /* Set if pipelining is supported */
|
||||||
#define SPOE_APPCTX_FL_ASYNC 0x00000002 /* Set if asynchronus frames is supported */
|
#define SPOE_APPCTX_FL_ASYNC 0x00000002 /* Set if asynchronous frames is supported */
|
||||||
#define SPOE_APPCTX_FL_FRAGMENTATION 0x00000004 /* Set if fragmentation is supported */
|
#define SPOE_APPCTX_FL_FRAGMENTATION 0x00000004 /* Set if fragmentation is supported */
|
||||||
|
|
||||||
#define SPOE_APPCTX_ERR_NONE 0x00000000 /* no error yet, leave it to zero */
|
#define SPOE_APPCTX_ERR_NONE 0x00000000 /* no error yet, leave it to zero */
|
||||||
|
@ -165,7 +165,7 @@ spoe_encode_data(struct sample *smp, char **buf, char *end)
|
|||||||
* context. ctx.a[0] is the pointer to the length and ctx.a[1] is the
|
* context. ctx.a[0] is the pointer to the length and ctx.a[1] is the
|
||||||
* pointer to the offset. If the offset is greater than 0, it means the
|
* pointer to the offset. If the offset is greater than 0, it means the
|
||||||
* sample is partially encoded. In this case, we only need to encode the
|
* sample is partially encoded. In this case, we only need to encode the
|
||||||
* reamining. When all the sample is encoded, the offset is reset to 0.
|
* remaining. When all the sample is encoded, the offset is reset to 0.
|
||||||
* So the caller know it can try to encode the next sample. */
|
* So the caller know it can try to encode the next sample. */
|
||||||
struct buffer *chk = &smp->data.u.str;
|
struct buffer *chk = &smp->data.u.str;
|
||||||
unsigned int *len = smp->ctx.a[0];
|
unsigned int *len = smp->ctx.a[0];
|
||||||
|
@ -204,7 +204,7 @@ struct stconn;
|
|||||||
* <flags> SE_FL_*
|
* <flags> SE_FL_*
|
||||||
*
|
*
|
||||||
* <lra> should be updated when a read activity is detected. It can be a
|
* <lra> should be updated when a read activity is detected. It can be a
|
||||||
* sucessful receive, when a shutr is reported or when receives are
|
* successful receive, when a shutr is reported or when receives are
|
||||||
* unblocked.
|
* unblocked.
|
||||||
|
|
||||||
* <fsb> should be updated when the first send of a series is blocked and reset
|
* <fsb> should be updated when the first send of a series is blocked and reset
|
||||||
|
@ -1379,7 +1379,7 @@ static enum act_return http_action_early_hint(struct act_rule *rule, struct prox
|
|||||||
s->txn->status = 103;
|
s->txn->status = 103;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Add the HTTP Early Hint HTTP 103 response heade */
|
/* Add the HTTP Early Hint HTTP 103 response header */
|
||||||
value->data = build_logline(s, b_tail(value), b_room(value), &rule->arg.http.fmt);
|
value->data = build_logline(s, b_tail(value), b_room(value), &rule->arg.http.fmt);
|
||||||
if (!htx_add_header(htx, rule->arg.http.str, ist2(b_head(value), b_data(value))))
|
if (!htx_add_header(htx, rule->arg.http.str, ist2(b_head(value), b_data(value))))
|
||||||
goto error;
|
goto error;
|
||||||
|
@ -354,7 +354,7 @@ static int smp_conv_req_capture(const struct arg *args, struct sample *smp, void
|
|||||||
fe = strm_fe(smp->strm);
|
fe = strm_fe(smp->strm);
|
||||||
idx = args->data.sint;
|
idx = args->data.sint;
|
||||||
|
|
||||||
/* Check the availibity of the capture id. */
|
/* Check the availability of the capture id. */
|
||||||
if (idx > fe->nb_req_cap - 1)
|
if (idx > fe->nb_req_cap - 1)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
@ -399,7 +399,7 @@ static int smp_conv_res_capture(const struct arg *args, struct sample *smp, void
|
|||||||
fe = strm_fe(smp->strm);
|
fe = strm_fe(smp->strm);
|
||||||
idx = args->data.sint;
|
idx = args->data.sint;
|
||||||
|
|
||||||
/* Check the availibity of the capture id. */
|
/* Check the availability of the capture id. */
|
||||||
if (idx > fe->nb_rsp_cap - 1)
|
if (idx > fe->nb_rsp_cap - 1)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
@ -166,7 +166,7 @@ static inline int http_7239_extract_ipv6(struct ist *input, struct in6_addr *ip)
|
|||||||
/* checks if <input> contains rfc7239 compliant host
|
/* checks if <input> contains rfc7239 compliant host
|
||||||
* <quoted> is used to determine if the current input is being extracted
|
* <quoted> is used to determine if the current input is being extracted
|
||||||
* from a quoted (non zero) or unquoted (zero) token, as the parsing rules
|
* from a quoted (non zero) or unquoted (zero) token, as the parsing rules
|
||||||
* differ wheteher the input is quoted or not according to the rfc.
|
* differ whether the input is quoted or not according to the rfc.
|
||||||
* Returns 1 for success and 0 for failure
|
* Returns 1 for success and 0 for failure
|
||||||
* if <host> is not NULL, it will be set to the extracted value contained
|
* if <host> is not NULL, it will be set to the extracted value contained
|
||||||
* in <input>
|
* in <input>
|
||||||
@ -213,7 +213,7 @@ static inline int http_7239_extract_host(struct ist *input, struct ist *host, in
|
|||||||
/* checks if <input> contains rfc7239 compliant nodename
|
/* checks if <input> contains rfc7239 compliant nodename
|
||||||
* <quoted> is used to determine if the current input is being extracted
|
* <quoted> is used to determine if the current input is being extracted
|
||||||
* from a quoted (non zero) or unquoted (zero) token, as the parsing rules
|
* from a quoted (non zero) or unquoted (zero) token, as the parsing rules
|
||||||
* differ wheteher the input is quoted or not according to the rfc.
|
* differ whether the input is quoted or not according to the rfc.
|
||||||
* Returns 1 for success and 0 for failure
|
* Returns 1 for success and 0 for failure
|
||||||
* if <nodename> is not NULL, it will be set to the extracted value contained
|
* if <nodename> is not NULL, it will be set to the extracted value contained
|
||||||
* in <input>
|
* in <input>
|
||||||
@ -279,7 +279,7 @@ static inline int http_7239_extract_nodename(struct ist *input, struct forwarded
|
|||||||
/* checks if <input> contains rfc7239 compliant nodeport
|
/* checks if <input> contains rfc7239 compliant nodeport
|
||||||
* <quoted> is used to determine if the current input is being extracted
|
* <quoted> is used to determine if the current input is being extracted
|
||||||
* from a quoted (non zero) or unquoted (zero) token, as the parsing rules
|
* from a quoted (non zero) or unquoted (zero) token, as the parsing rules
|
||||||
* differ wheteher the input is quoted or not according to the rfc.
|
* differ whether the input is quoted or not according to the rfc.
|
||||||
* Returns 1 for success and 0 for failure
|
* Returns 1 for success and 0 for failure
|
||||||
* if <nodeport> is not NULL, it will be set to the extracted value contained
|
* if <nodeport> is not NULL, it will be set to the extracted value contained
|
||||||
* in <input>
|
* in <input>
|
||||||
@ -317,7 +317,7 @@ static inline int http_7239_extract_nodeport(struct ist *input, struct forwarded
|
|||||||
/* checks if <input> contains rfc7239 compliant node (nodename:nodeport token)
|
/* checks if <input> contains rfc7239 compliant node (nodename:nodeport token)
|
||||||
* <quoted> is used to determine if the current input is being extracted
|
* <quoted> is used to determine if the current input is being extracted
|
||||||
* from a quoted (non zero) or unquoted (zero) token, as the parsing rules
|
* from a quoted (non zero) or unquoted (zero) token, as the parsing rules
|
||||||
* differ wheteher the input is quoted or not according to the rfc.
|
* differ whether the input is quoted or not according to the rfc.
|
||||||
* Returns 1 for success and 0 for failure
|
* Returns 1 for success and 0 for failure
|
||||||
* if <node> is not NULL, it will be set to the extracted value contained
|
* if <node> is not NULL, it will be set to the extracted value contained
|
||||||
* in <input>
|
* in <input>
|
||||||
@ -651,7 +651,7 @@ static inline void http_build_7239_header_host(struct buffer *out,
|
|||||||
{
|
{
|
||||||
struct ist validate = ist2(str, str_len);
|
struct ist validate = ist2(str, str_len);
|
||||||
/* host check, to ensure rfc compliant output
|
/* host check, to ensure rfc compliant output
|
||||||
* (assumming host is quoted/escaped)
|
* (assuming host is quoted/escaped)
|
||||||
*/
|
*/
|
||||||
if (http_7239_extract_host(&validate, NULL, 1) && !istlen(validate))
|
if (http_7239_extract_host(&validate, NULL, 1) && !istlen(validate))
|
||||||
chunk_memcat(out, str, str_len);
|
chunk_memcat(out, str, str_len);
|
||||||
@ -689,7 +689,7 @@ static int http_build_7239_header(struct buffer *out,
|
|||||||
((conn_is_ssl(cli_conn)) ? "https" : "http"));
|
((conn_is_ssl(cli_conn)) ? "https" : "http"));
|
||||||
}
|
}
|
||||||
if (curproxy->http_ext->fwd->p_host.mode) {
|
if (curproxy->http_ext->fwd->p_host.mode) {
|
||||||
/* always add quotes for host parameter to make output compliancy checks simpler */
|
/* always add quotes for host parameter to make output compliance checks simpler */
|
||||||
chunk_appendf(out, "%shost=\"", ((out->data) ? ";" : ""));
|
chunk_appendf(out, "%shost=\"", ((out->data) ? ";" : ""));
|
||||||
/* ignore return value for now, but could be useful some day */
|
/* ignore return value for now, but could be useful some day */
|
||||||
http_build_7239_header_host(out, s, curproxy, htx, &curproxy->http_ext->fwd->p_host);
|
http_build_7239_header_host(out, s, curproxy, htx, &curproxy->http_ext->fwd->p_host);
|
||||||
@ -1676,7 +1676,7 @@ void http_ext_softclean(struct proxy *curproxy)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Perform some consitency checks on px.http_ext after parsing
|
/* Perform some consistency checks on px.http_ext after parsing
|
||||||
* is completed.
|
* is completed.
|
||||||
* We make sure to perform a softclean in case some options were
|
* We make sure to perform a softclean in case some options were
|
||||||
* to be disabled in this check. This way we can release some memory.
|
* to be disabled in this check. This way we can release some memory.
|
||||||
|
@ -845,7 +845,7 @@ static int h2_avail_streams(struct connection *conn)
|
|||||||
return ret1;
|
return ret1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* inconditionally produce a trace of the header. Please do not call this one
|
/* Unconditionally produce a trace of the header. Please do not call this one
|
||||||
* and use h2_trace_header() instead which first checks if traces are enabled.
|
* and use h2_trace_header() instead which first checks if traces are enabled.
|
||||||
*/
|
*/
|
||||||
void _h2_trace_header(const struct ist hn, const struct ist hv,
|
void _h2_trace_header(const struct ist hn, const struct ist hv,
|
||||||
|
@ -58,7 +58,7 @@ static void qc_free_ncbuf(struct qcs *qcs, struct ncbuf *ncbuf)
|
|||||||
|
|
||||||
/* Free <qcs> instance. This function is reserved for internal usage : it must
|
/* Free <qcs> instance. This function is reserved for internal usage : it must
|
||||||
* only be called on qcs alloc error or on connection shutdown. Else
|
* only be called on qcs alloc error or on connection shutdown. Else
|
||||||
* qcs_destroy must be prefered to handle QUIC flow-control increase.
|
* qcs_destroy must be preferred to handle QUIC flow-control increase.
|
||||||
*/
|
*/
|
||||||
static void qcs_free(struct qcs *qcs)
|
static void qcs_free(struct qcs *qcs)
|
||||||
{
|
{
|
||||||
|
@ -2319,7 +2319,7 @@ int ssl_sock_get_alpn(const struct connection *conn, void *xprt_ctx,
|
|||||||
* MUST be called after having received the remote transport parameters which
|
* MUST be called after having received the remote transport parameters which
|
||||||
* are parsed when the TLS callback for the ClientHello message is called upon
|
* are parsed when the TLS callback for the ClientHello message is called upon
|
||||||
* SSL_do_handshake() calls, not necessarily at the first time as this TLS
|
* SSL_do_handshake() calls, not necessarily at the first time as this TLS
|
||||||
* message may be splitted between packets
|
* message may be split between packets
|
||||||
* Return 1 if succeeded, 0 if not.
|
* Return 1 if succeeded, 0 if not.
|
||||||
*/
|
*/
|
||||||
static int qc_conn_finalize(struct quic_conn *qc, int server)
|
static int qc_conn_finalize(struct quic_conn *qc, int server)
|
||||||
@ -2781,7 +2781,7 @@ static void qc_cc_err_count_inc(struct quic_conn *qc, struct quic_frame *frm)
|
|||||||
* TODO this function is closely related to H3. Its place should be in H3 layer
|
* TODO this function is closely related to H3. Its place should be in H3 layer
|
||||||
* instead of quic-conn but this requires an architecture adjustment.
|
* instead of quic-conn but this requires an architecture adjustment.
|
||||||
*
|
*
|
||||||
* Returns 1 on sucess else 0.
|
* Returns 1 on success else 0.
|
||||||
*/
|
*/
|
||||||
static int qc_h3_request_reject(struct quic_conn *qc, uint64_t id)
|
static int qc_h3_request_reject(struct quic_conn *qc, uint64_t id)
|
||||||
{
|
{
|
||||||
|
@ -3478,7 +3478,7 @@ static int ssl_sock_put_ckch_into_ctx(const char *path, struct ckch_data *data,
|
|||||||
/* Load OCSP Info into context
|
/* Load OCSP Info into context
|
||||||
* If OCSP update mode is set to 'on', an entry will be created in the
|
* If OCSP update mode is set to 'on', an entry will be created in the
|
||||||
* ocsp tree even if no ocsp_response was known during init, unless the
|
* ocsp tree even if no ocsp_response was known during init, unless the
|
||||||
* frontend's conf disables ocsp update explicitely.
|
* frontend's conf disables ocsp update explicitly.
|
||||||
*/
|
*/
|
||||||
if (ssl_sock_load_ocsp(path, ctx, data, find_chain) < 0) {
|
if (ssl_sock_load_ocsp(path, ctx, data, find_chain) < 0) {
|
||||||
if (data->ocsp_response)
|
if (data->ocsp_response)
|
||||||
|
@ -501,7 +501,7 @@ struct appctx *sc_applet_create(struct stconn *sc, struct applet *app)
|
|||||||
return appctx;
|
return appctx;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Conditionnaly forward the close to the wirte side. It return 1 if it can be
|
/* Conditionally forward the close to the write side. It return 1 if it can be
|
||||||
* forwarded. It is the caller responsibility to forward the close to the write
|
* forwarded. It is the caller responsibility to forward the close to the write
|
||||||
* side. Otherwise, 0 is returned. In this case, CF_SHUTW_NOW flag may be set on
|
* side. Otherwise, 0 is returned. In this case, CF_SHUTW_NOW flag may be set on
|
||||||
* the channel if we are only waiting for the outgoing data to be flushed.
|
* the channel if we are only waiting for the outgoing data to be flushed.
|
||||||
|
@ -1452,7 +1452,7 @@ int parse_thread_set(const char *arg, struct thread_set *ts, char **err)
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (sep != set && *sep && *sep != '-' && *sep != ',') {
|
if (sep != set && *sep && *sep != '-' && *sep != ',') {
|
||||||
// Only delimitors are permitted around digits.
|
// Only delimiters are permitted around digits.
|
||||||
memprintf(err, "invalid character '%c' in thread set specification: '%s'.", *sep, set);
|
memprintf(err, "invalid character '%c' in thread set specification: '%s'.", *sep, set);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user