Checkout Tools
  • last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge r1824811 from trunk:

10 years after r567503 , fix this properly.

The lock is created in post_config, so we can't copy it

around in a merge_server_config() callback.

Submitted by: covener

Reviewed by: covener, rpluem, jim

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

PR61891: looping over mostly full LDAP cache

*) mod_ldap: Fix a case where a full LDAP cache would continually fail to

purge old entries and log AH01323. PR61891.

Submitted By: Hendrik Harms <hendrik.harms gmail.com>

Committed By: covener

Reviewed By: covener, jim, ylavic

  1. … 5 more files in changeset.
Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326, r1700328, r1700330, r1700331, r1700332, r1700334, r1700336, r1700338 from trunk:

Fix some spurious ident spotted by sparse

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting + some minor style issues

Remove useless line

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Fix some spurious ident spotted by sparse

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 16 more files in changeset.
mod_ldap: Fix unexpected return codes from LDAP lib being coerced

into LDAP_NO_SUCH_ATTRIBUTE + some new tracing.

trunk patch: http://svn.apache.org/r1687980

http://svn.apache.org/r1689694

http://svn.apache.org/r1689698

Backports: 1687980, 1689694, 1689698

Submitted by: covener

Reviewied by: covener, wrowe, ylavic

  1. … 3 more files in changeset.
Merge r1685650 from trunk:

LDAP connection pool did not release/close connections with

"LDAPConnectionPoolTTL 0". PR58037.

Submitted by: Ted Phelps <phelps gnusto.com>

committed by: covener

Submitted by: covener

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1685659 from trunk:

Fix directive name in error message + fix some style issue

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 2 more files in changeset.
Merge r1611979, r1611725, r1588448, r1642803, r1657949, r1451108 (part of it),

r1643672, r1496178 from trunk

* Synch with trunk:

- Add missing APLOGNO.

- mod_deflate: don't require <limits.h> by using APR_INT32_MAX instead of INT_MAX.

- Move two variable assignments off the fast path.

- Fix curly braces style. Remove useless empty lines

- tab vs space

- Removed tabs.

- dump fcgi headers with trace8 instead of debug+compile-time flag.

- Drop severity of "LDAP: Setting referrals to ON" from DEBUG to TRACE4

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

Reviewed by: jailletc36, minfrin, ylavic

Backported by: jailletc36

  1. … 12 more files in changeset.
Merge r1613682 from trunk:

In 2.4.10, AuthLDAPBindDN might not be used for some LDAP searches, causing

LDAP authz failures if AuthLDAPBindDN was able to search through more of

LDAP than web users.

  1. … 2 more files in changeset.
Merge r1452551, r1607960 from trunk:

PR54587: LDAP connections used for authn were not respecting

LDAPConnectionPoolTimeout due to confusion over what "bound" means.

Added some LDAP trace at TRACE5 to track how LDAP connections are

reused and rebound.

make LDAPConnectionPoolTTL more conservative, use r->request_time rather than

end-of-request time, and only update it after a round-trip with the LDAP

server rather than every time we check back into the pool.

Submitted by: covener

Reviewed/backported by: jim

  1. … 6 more files in changeset.
* mod_ldap: Don't filter subgroups on cn=*

Proposed by: covener

Reviewed by: jim, rjung

Backport of r1528143 from trunk.

  1. … 3 more files in changeset.
mod_ldap: add TRACE5 for LDAP retries

trunk patch: http://svn.apache.org/r1510085

Submitted by: covener

Reviewed by: jim, humbedooh

  1. … 3 more files in changeset.
mod_ldap: retry on an LDAP timeout during authn.

trunk patch: http://svn.apache.org/r1510084

Submitted by: covener

Reviewed by: jim, humbedooh

  1. … 3 more files in changeset.
mod_ldap: "LDAPReferrals off" does not disable LDAPReferrals feature.

Make "off" really "off" and add "unset" to take SDK defaults

trunk patch: http://svn.apache.org/r1517388

docs: http://svn.apache.org/r1518265

Submitted by: covener

Reviewed by: jim, humbedooh

  1. … 6 more files in changeset.
Merge r1384913, r1399687, r1419719, r1419755, r1416278, r1330189 from trunk:

Add a few AP_DEBUG_ASSERT()s for the benefit of clang

style tweak

No need to clear memory that is fully initialized just the line after.

Avoid unnecessary %s substitution

Avoid processing some files twice if APR_INCLUDEDIR and

APU_INCLUDEDIR containin the same path but differing in

doubled slashes.

Fixed position of the NEED_ENHANCED_ESCAPES define.

This define should be outside of the else case so that it

gets also defined if we cross-compile for Win32 or OS2.

Submitted by: sf, trawick, jailletc36, jailletc36, sf, fuankg

Reviewed/backported by: jim

  1. … 9 more files in changeset.
Merge r1337344, r1378178, r1397636, r1398025, r1398040, r1398481, r1407004, r1407006, r1407088, r1407528 from trunk:

* support/suexec.c: Add gcc format-string attributes to logging

functions.

(main): Always print uid/gid as unsigned long, and cast to avoid

warnings (which somewhat defeats the point of the format string

attrs, but is necessary since the size of gid/uid varies).

remove an unnecessary check in a nest loop of ap_create_environment()

s/;;/;/

No need to test for NULL before calling apr_pstrdup.

No need it apr_pcalloc here, the memory is fully initialized the line just after

cppCheck: unreadVariable - 'serviceFlag' is not used in the function, so remove it

Remove unused code. "Next week" hasn't happened in the last 10 years or so.

log client error at level debug, log broken Host header value

remove some more old unused code

remove obsolete comment from 1.3 days

Submitted by: jorton, pqf, jailletc36, jailletc36, jailletc36, jailletc36, sf, sf, sf, sf

Reviewed/backported by: jim

  1. … 16 more files in changeset.
Revert r1373105, the merging of incompatible DefaultRuntimeDir

changes.

The trunk patches for these all have some configuration breakage

as 2.4.x interprets the individual directive or API parameter as

relative to ServerRoot whereas trunk interprets everything

relative to DefaultRuntimeDir.

  1. … 24 more files in changeset.
Merge r1364695, r1369477, r1369808, r1370288, r1370225, r1370763, r1371684 from trunk:

mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/

DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file.

core: Respect DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR for the

scoreboard (ScoreBoardFile).

The Pidfile directive and ap_log_pid()/ap_remove_pid()/ap_read_pid()

now respect DefaultRuntimeDir

Mutex directive: finish support of DefaultRuntimeDir

a partial conversion was made in r1299718, but I'm not

sure when that change is effective

mod_socache_shmcb and mod_socache_dbm: finish support of

DefaultRuntimeDir

a partial conversion was made in r1299718, affecting cases

where no filename was specified

mod_slotmem_plain: make the "filename" key relative to

DefaultRuntimeDir if not absolute

mod_slotmem_plain does not externalize or check the full path

in any way, so this change is just for consistency with other

modules which build paths to run-time artifacts.

make LDAPSharedCacheFile relative to DefaultRuntimeDir

Submitted by: trawick

Reviewed/backported by: jim

  1. … 24 more files in changeset.
Merge r1369568 from trunk:

bytes is not a unit of filename

  1. … 1 more file 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.
Merge r1209601:

Fix segfault with Solaris LDAP SDK when enabling ldaps.

Enable SSL by passing secure=1 to apr_ldap_init instead of calling

apr_ldap_set_option(... APR_LDAP_OPT_TLS ...).

This change carefully avoids any change of behavior on non-Solaris LDAP SDKs.

PR: 42682

  1. … 2 more files in changeset.