Checkout Tools
  • last updated 4 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.
Fix typo in comment

(r1739569 in trunk)

Merge r1756038 from trunk:

Fix spelling in comments and text files.

No functional change.

PR 59990

Submitted by: rjung

Reviewed/backported by: jim

  1. … 72 more files in changeset.
Add APLOGNO, first chunk (those that were

detected by coccinelle).

There are some more but they are easier to

backport once these here are applied.

Backport of r1725392, r1725394, r1725395

and r1725468 from trunk.

Submitted by: rjung

Reviewed by: jim, ylavic

  1. … 38 more files in changeset.
Merge r1611978, r1612068 from trunk:

Add missing APLOGNO.

Refactor to keep APLOGNO on the same line as ap_log_error, when applicable.

Add missing APLOGNO.

Refactor some lines to keep APLOGNO on the same line as ap_log_error, when applicable.

Split lines longer than 80.

Improve alignment.

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 18 more files in changeset.
Merge r1546730, r1583008, r1571369, r1552130, r1578760, r1592615, r1592632, r1595321, r1550302, r1550307, r1585435 from trunk:

fix whitespace in a debug message


normalize an ugly construct which somehow manages to return the correct value

This is annoying to see in a casual "LogLevel debug foo:traceX ..."

Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory.

Follow-up to r1592529:

Define default port for "scgi" schemes (as chosen by

mod_proxy_scgi) in a common location.

Suggested by: jailletc36

fix Doxygen markup error

Submitted by: jailletc36

Tweak a AP_DEBUG_ASSERT condition.

Valid index to use 'req_header_var_names' are 0...6

mod_auth_form: Add a debug message when the fields on a form are not


mod_auth_form: Make the trace logging consistent through the notes, session

and form authentication steps.

mod_auth_form: update empty log tags.

Submitted by: trawick, covener, jailletc36, trawick, trawick, jailletc36, minfrin, minfrin, ylavic

Reviewed/backported by: jim

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

mod_auth_form: Make sure the optional functions are loaded even when

the AuthFormProvider isn't specified.

Submitted by: minfrin

Reviewed/backported by: jim

  1. … 3 more files in changeset.
* easy proposals to synch 2.4.x and trunk

- Use apr_file_printf(... "%pm"...) instead of explicit call to apr_strerror

- remove unused variables

- axe some useless assignments (clang scan-build)

- Remove useless apr_pstrdup as done for other mod_auth modules in r1026660

- Remove unused APXS setting from template for generated Makefile

  1. … 4 more files in changeset.
Merge r1406068, r1425777, r1427546, r1462643, r1487530, r1493330 from trunk:

Replace duplicate log tags

Check that AsyncRequestWorkerFactor is not negative

PR :54254

Submitted by: Jackie Zhang <jackie qq zhang gmail com>

remove unneeded include statements

Name pool + concat string at compile time when possible

* modules/filters/mod_ratelimit.c (rate_limit_filter): Log the error


Correct typo in error message

Submitted by: sf, jailletc36, jorton, jailletc36

Reviewed/backported by: jim

  1. … 9 more files in changeset.
mod_auth_form: Make sure that get_notes_auth() sets the user as does

get_form_auth() and get_session_auth(). Makes sure that REMOTE_USER

does not vanish during mod_include driven subrequests.

trunk patch:

Submitted by: minfrin

Reviewed by: minfrin, jim, gsmith

  1. … 2 more files in changeset.
mod_auth_form: Support the expr parser in the

AuthFormLoginRequiredLocation, AuthFormLoginSuccessLocation

and AuthFormLogoutLocation directives.

mod_auth_form: Make sure 500 Internal Server Error is

returned should an error occur while parsing an expression.

Submitted by: minfrin

Backported by: minfrin

Reviewed by: minfrin, sf, rjung

Backports of r1388648 and r1418721 from trunk.

  1. … 6 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.

mod_auth_form: Use apr_status_t for the mod_session API.

  1. … 1 more file in changeset.
Merge r1208816:

Remove some more now redundant log prefixes

  1. … 4 more files in changeset.