Checkout Tools
  • last updated 5 hours ago
Constraints: committers
Constraints: files
Constraints: dates
Merge r1490294, r1734635, r1749403, r1813116, r1816179, r1817598, r1832198, r1832200, r1832277, r1832317 from trunk:

Note that the function will be available in APR.

Silent a smatch warning:

mod_auth_form.c:626 get_form_auth() warn: variable dereferenced before check 'sent_user' (see line 616)

Use 'memcpy' instead of 'strcpy' when the size of the string has already been computed.

Fix compilation failure :

unixd.c: In function ‘ap_unixd_mpm_set_signals’:

unixd.c:579:5: error: implicit declaration of function ‘apr_signal’; did you mean ‘strsignal’? [-Werror=implicit-function-declaration]

apr_signal(SIGPIPE, SIG_IGN);



Not sure where it comes from, maybe related to r1812301.

mod_substitute: add runtime traces. PR 61132.

In verify_ocsp_status in ssl_engine_ocsp.c, the log message, "OCSP response not successful: %d" should print the value of r instead of rc.

The value of rc will always be 0.

PR 61876 [sam <sam.eastman.4114>]

Success of 'SHGetMalloc()' should be tested with the SUCCEEDED macro.

/!\ This commit is _NOT COMPILE TESTED_. (I don't have a windows build environment available)

See PR 60086.

Axe some dead code.

See PR 60086.

Fix typo

Fix a potential un-intialized variable usage warning.

This can not be a runtime ixsue, because, in such a case, we would assert and abort before.

PR 59819.

Submitted by: minfrin, jailletc36, jailletc36, jailletc36, ylavic, jailletc36, jailletc36, jailletc36, jailletc36, jailletc36

Reviewed by: jailletc36, ylavic, covener

  1. … 11 more files in changeset.
Merge r1791400 from trunk:

mod_substitute: use local/native LF for splitting

On platforms where the APR_ASCII_LF != '\n', like EBCDIC systems,

strmatch or pcre patterns from the source or config will be in

the native encoding, and this module will really only work on

content in the native encoding.

(mod_substitute runs before mod_charset_lite for a similar reason)

I thought #if APR_CHARSET_EBCDIC or even #ifdef __MVS__ was overkill


(CTR due to ebcdic-only)

  1. … 2 more files in changeset.
Merge r1601624 from trunk:

Strip useless apr_brigade_cleanup() calls.

Submitted/backported by: ylavic

Reviewed by: jailletc36, jim, ylavic

  1. … 7 more files in changeset.
Merge r1684900, r1687539, r1687680, r1688331, r1688339, r1688340, r1688341, r1688343, r1697013, r1697015 from trunk:

mod_substitute: Fix configuraton merge order.

PR 57641 [Marc.Stern]

mod_substitute: follow up r1684900.

Introduce the SubstituteInheritBefore directive to configure the merge order.

This allows to preserve 2.4 and earlier behaviour.

mod_substitute: follow up to r1687539.

Use tristate single inherit_before variable instead of two, according to

wrowe's advices.

mod_substitute: follow up to r1687680.

Fix dir config merger 'over'-write, thanks Bill (again).

Very difficult to read, and therefore was wrong.

Assert that the SubstituteInheritBefore option was explicitly toggled,

and do not default in 2.x to this legacy behavior.

Optimize in all cases that the members are all explicitly initialized.

Useful for 2.2 and 2.4, but trunk will require the subsequent patch.

Increase legibility of the max_line_length behavior, and adjust for

the requirement that all members are initialized explicitly due to

the previous patch.

Net -8 LoC, my usual specialty.

This didn't need to be reinvented; please use established helpers.

mod_substitute: follow up r1688339.

SubstituteInheritBefore is the default in 2.5.x but wasn't for ealier versions.

mod_substitute: follow up r1697013.

Update the doc.

Submitted by: niq, ylavic, ylavic, ylavic, wrowe, wrowe, wrowe, wrowe, ylavic, ylavic

Reviewed/backported by: jim

  1. … 4 more files in changeset.
Merge r1631983 from trunk:

mod_substitute: no real functional change, but:

- define default for maximum line length

indepenent of MAX_STRING_LEN

- Clarify line length check with a comment

- add supported 'b' suffix to directive


Submitted by: rjung

Reviewed by: jim, ylavic

  1. … 1 more file in changeset.
Merge r1628924 from trunk:

mod_substitute: Restrict configuration in .htaccess to

FileInfo as documented.

Submitted by: rjung

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1628919, r1628950 from trunk:

mod_substitute: Make maximum line length configurable.

Add docs for new directive SubstituteMaxLineLength

in mod_substitute.

Submitted by: rjung

Reviewed/backported by: jim

  1. … 4 more files in changeset.
Merge r1628104, r1628918 from trunk:

mod_substitute: Fix memory limitation in case of

regexp plus flatten.

The maxlen argument of ap_varbuf_regsub() is unsigned.

Passing in "AP_SUBST_MAX_LINE_LENGTH - vb.strlen"

in case vb.strlen got to big didn't result in the

expected error but instead was handled as a very big


Add CHANGES for r1628104.

(mod_substitue: Fix memory limitation in case of

regexp plus flatten.)

Submitted by: rjung

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Backport r1209766, r1210252, r1210284:

Add lots of unique tags to error log messages

ssl_util.c: Downgrade some dynamic locking messages from level DEBUG

to TRACE1-3

  1. … 164 more files in changeset.