summaryrefslogtreecommitdiff
path: root/server
Commit message (Expand)AuthorAgeFilesLines
* Follow up to r1821624: sync with 2.4.x.Yann Ylavic2018-02-163-34/+135
|\
| * *) regex: Allow to configure global/default options for regexes, likeGraham Leggett2018-02-162-0/+93
| * core: For consistency, ensure that read lines are NUL terminated on anyGraham Leggett2018-02-161-34/+42
* | Merge r1821624, r1821625, r1821626, r1821627, r1821629, r1821632, r1821635, r...Yann Ylavic2018-02-1610-726/+252
|/
* mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections,Graham Leggett2018-02-132-21/+26
* Merge r1821558, r1821561, r1821595 from trunk:Yann Ylavic2018-02-091-42/+64
* Merge r1819855, r1821562 from trunk:Yann Ylavic2018-02-091-45/+49
* Merge r1643279, r1703241, r1802535, r1819847, r1819848, r1819852, r1819853 fr...Yann Ylavic2018-02-093-101/+106
* Merge r1605328, r1629576 from trunk:Yann Ylavic2018-02-091-17/+16
* Revert r1823629 to stage backport commits too.Yann Ylavic2018-02-093-210/+180
* On the 2.4.x branch:Stefan Eissing2018-02-093-180/+210
* Merge r1821504, r1821505 from trunk:Yann Ylavic2018-01-182-9/+12
* Merge r1809302, r1809303, r1809305, r1809311, r1809314, r1809713 from trunk:Yann Ylavic2018-01-132-7/+27
* Merge r1802618, r1820808 from trunk:Yann Ylavic2018-01-132-14/+20
* Merge r1740910, r1741277, r1820809 from trunk:Yann Ylavic2018-01-131-0/+2
* Merge r1818804, r1818951, r1818958, r1818960, r1819027, r1819214, r1820035 fr...Yann Ylavic2018-01-101-18/+60
* Merge r1809881, r1809973, r1809976, r1812075 from trunk:Yann Ylavic2018-01-105-14/+57
* Merge r1814968 from trunk:Jim Jagielski2017-12-211-0/+15
* Merge r1809273, r1814719 from trunk:Jim Jagielski2017-12-211-14/+12
* Merge r1812307 from trunk:Joe Orton2017-10-171-2/+2
* Merge r1808746, r1809028 from trunk:Yann Ylavic2017-10-131-2/+12
* Merge r1808230 from trunk:Joe Orton2017-10-101-37/+63
* Merge r1798785 from trunk:Joe Orton2017-10-101-2/+1
* Merge r1802875 from trunk:Yann Ylavic2017-09-221-100/+172
* Merge r1807655 from trunk:Yann Ylavic2017-09-081-0/+6
* Merge r1784318 from trunk:Yann Ylavic2017-09-081-6/+30
* Merge r1713043, r1802305, r1802309 from trunk:Jim Jagielski2017-08-163-23/+30
* Merge r1618555 from trunk:Jim Jagielski2017-08-161-0/+10
* Merge r1789220, r1792675 from trunk:Jim Jagielski2017-08-161-17/+33
* Merge r1762580, r1762701, r1762702, r1762718, r1762723, r1762742, r1762743, r...Jim Jagielski2017-07-171-162/+286
* Merge r1735906 from trunk:Jim Jagielski2017-06-291-3/+3
* Restore single-char field names inadvertantly disallowed in 2.4.25.William A. Rowe Jr2017-06-291-9/+6
* Merge from trunk:Eric Covener2017-06-052-14/+16
* Merge r1783849 from trunk:Yann Ylavic2017-06-024-614/+210
* SECURITY: CVE-2017-7668 (cve.mitre.org)Jim Jagielski2017-05-301-4/+2
* SECURITY: CVE-2017-3167 (cve.mitre.org)Jim Jagielski2017-05-302-3/+62
* Merge r1796446 from trunk:Jim Jagielski2017-05-301-22/+4
* revert r1796447, this should be RTC.Eric Covener2017-05-271-4/+22
* Merge r1796446 from trunk:Eric Covener2017-05-271-22/+4
* Merge r1792589 from trunk:Jim Jagielski2017-05-231-3/+18
* Merge r1788032, r1788033, r1783764, r1707512, r1783770 from trunk:Jim Jagielski2017-05-021-7/+7
* Merge r1791975 from trunk:Jim Jagielski2017-05-021-4/+13
* On the 2.4.x branch:Stefan Eissing2017-04-211-4/+2
* On the 2.4.x branch:Stefan Eissing2017-04-111-1/+3
* On the trunk:Stefan Eissing2017-04-111-3/+1
* Merge r1777556, r1777557, r1777593, r1777594, r1783056 from trunk:Jim Jagielski2017-03-291-3/+3
* Merge r1776459, r1788508 from trunk:Yann Ylavic2017-03-281-0/+3
* Revert r1789213 and r1789214: wrong branch...Yann Ylavic2017-03-281-33/+17
* core: Disallow multiple Listen on the same IP:port when listener bucketsYann Ylavic2017-03-281-17/+33
* Merge r1780095 from trunk:Jim Jagielski2017-03-241-1/+4