git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1025661 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1025504 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1025500 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1024372 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1024270 13f79535-47bb-0310-9956-ffa450edef68

enough granularity.  PR46318.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1024264 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1024060 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1024059 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1024051 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1023907 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1023906 13f79535-47bb-0310-9956-ffa450edef68

Additional comment about the role of ServerName


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1023856 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1023831 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1023660 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1023449 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1023446 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1023111 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1022608 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1022602 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1022576 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1021735 13f79535-47bb-0310-9956-ffa450edef68

Trivial backport of r1021529


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1021627 13f79535-47bb-0310-9956-ffa450edef68

in spite of faulty apr_reslist code.

Backports: r943650
PR: 43857
Submitted by: Tom Donovan
Reviewed by: trawick, rjung, wrowe
 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1021621 13f79535-47bb-0310-9956-ffa450edef68

Caution against using non-regex ProxyPass inside of a <LocationMatch> container.
PR#50048

Submitted By: Luke Meyer
Reviewed By: Eric Covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1021471 13f79535-47bb-0310-9956-ffa450edef68

Mention that the required ThreadStackSize depends on the modules loaded.
Instead of recommending a value, recommend not to reduce it unless necessary.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1005975 13f79535-47bb-0310-9956-ffa450edef68

don't need to mention CVE-2010-1623 in the changelog.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1005957 13f79535-47bb-0310-9956-ffa450edef68

Fix a denial of service attack against mod_reqtimeout.
[Stefan Fritsch]

mod_req-timeout/core: Backport bugfixes from trunk up to r935339:
    - Do not wrongly enforce timeouts for mod_proxy's backend
      connections and other protocol handlers (like mod_ftp).
    - Enforce the timeout for AP_MODE_GETLINE.
    - If there is a timeout, shorten the lingering close time from 30 to
      2 seconds (involves a change in the core).

Backports: r921378, r921526, r922407, r923418, r923429, r925986, r928881
           r933341, r933547, r935339, r983116, r984985&view=rev
Submitted by: sf
Reviewed by: wrowe, trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1005669 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1005646 13f79535-47bb-0310-9956-ffa450edef68

This was the only one with CRLF.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1005591 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1005584 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1005576 13f79535-47bb-0310-9956-ffa450edef68

statuses are found

PR: 48939
Backports: 930125, 930254, 962972, 987359
Submitted by: Daniel Ruggeri <DRuggeri primary.net>
Reviewed by: trawick, niq, wrowe



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1005571 13f79535-47bb-0310-9956-ffa450edef68

PR: 45318
Backports: r902654
Submitted by: Johannes Mueller <joh_m gmx.de>, sf
Reviewed by: rpluem, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1005561 13f79535-47bb-0310-9956-ffa450edef68

mod_authnz_ldap: If AuthLDAPCharsetConfig is set, also convert the password to
UTF-8.

PR: 45318
Adapted patch from Johannes Mueller


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1005537 13f79535-47bb-0310-9956-ffa450edef68

Document that a ThreadStackSize of 128K or lower will crash on Linux and
recommend at least 200K


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1005531 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1005526 13f79535-47bb-0310-9956-ffa450edef68

Backports: r750094
Submitted by: trawick
Reviewed by: sf, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1005524 13f79535-47bb-0310-9956-ffa450edef68

Backports;

 r991516, mod_rewrite.c::cmd_rewritecond(): use enum value instead of 
          integer literal
 r991515, util.c::ap_pregsub(): don't needlessly set var
 r991507, scoreboard.c::ap_create_scoreboard(): don't needlessly set var
 r987629+r987631, config.c::ap_build_cont_config(): don't needlessly
                  check var for NULL
 r986901+r987860, core.c::dirsection(): remove dead error check
 r983066, mod_cern_meta.c: remove unexpected ";" after end of block
 r987339, main.c::usage(): don't overlay stack buffer with impossibly
          long argv[0]
 r982050, mpm_unix.c (backported to mpm_common.c): remove unused vars

Author: trawick
Reviewed by: sf, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1005523 13f79535-47bb-0310-9956-ffa450edef68

Backport r999694; AUthor: trawick, reviewed by: sf, wrowe.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1004983 13f79535-47bb-0310-9956-ffa450edef68

REviewed by: wrowe, rjung.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1004980 13f79535-47bb-0310-9956-ffa450edef68