summaryrefslogtreecommitdiff
path: root/server
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge r1777354 from trunk:Jim Jagielski2017-03-241-2/+17
* Merge r1777923 from trunk:Joe Orton2017-03-171-1/+1
* Fix some spelling errors in commentsMike Rumph2017-03-101-4/+4
* Merge r1774541 from trunk:Jim Jagielski2017-02-171-0/+3
* Merge r1775487 from trunk:Jim Jagielski2017-01-091-4/+7
* Merge r1775199, r1775664 from trunk:Jim Jagielski2016-12-231-4/+1
* assign logno from trunkEric Covener2016-12-201-1/+1
* Merge r1773159 from trunk:Jim Jagielski2016-12-121-7/+4
* Meant to commit this to the merge branch for consideration; reverting r1773158William A. Rowe Jr2016-12-071-4/+7
* As noted by rpluem, r->protocol isn't const char *. Ensure the exit casesWilliam A. Rowe Jr2016-12-071-7/+4
* ------------------------------------------------------------------------Jim Jagielski2016-12-055-277/+856
* silence warning. No functional changeJim Jagielski2016-12-021-1/+1
* Merge r1738631, r1738633, r1738635, r1757030, r1757031, r1770752, r1770768 fr...Jim Jagielski2016-12-022-166/+141
* Merge r1705922, r1706523, r1738464, r1738466, r1738486 from trunk:Jim Jagielski2016-12-023-19/+93
* Merge r1757061, r1770750 from trunk:Jim Jagielski2016-12-021-10/+21
* Merge r1698334 from trunk:Jim Jagielski2016-11-211-2/+12
* Merge of r1767936,1768160,1769192,1769550 from trunk:Stefan Eissing2016-11-141-3/+3
* Merge r1766160 from trunk:Jim Jagielski2016-11-041-1/+4
* revert 1767482 backportEric Covener2016-11-021-11/+2
* Merge r1698239 from trunk:Jim Jagielski2016-11-011-2/+11
* Merge r1732228 from trunk:Jim Jagielski2016-10-101-1/+1
* Merge r1758307, r1758308, r1758309, r1758311 from trunk:Jim Jagielski2016-09-064-97/+18
* Merge r1758310 from trunk:Jim Jagielski2016-09-061-0/+7
* Merge r1756038 from trunk:Jim Jagielski2016-08-259-15/+15
* Merge r1753228, r1753229 from trunk:Yann Ylavic2016-08-161-0/+8
* Merge r1750218 from trunk:Jim Jagielski2016-06-282-4/+16
* mpm_event, mpm_worker: Fix computation of MinSpareThreads' lower boundGraham Leggett2016-06-132-14/+16
* Add ap_cstr_casecmp[n]() - placeholder of apr_cstr_casecmp[n] functionsGraham Leggett2016-06-131-1/+125
* core: Add -DDUMP_INCLUDES configtest to show the Include tree.Graham Leggett2016-06-133-0/+89
* Merge r1506474 from trunk:Jim Jagielski2016-06-061-1/+3
* Merge r1744980 from trunk:Jim Jagielski2016-06-061-2/+12
* reversal of r1747004 bc unwanted changesStefan Eissing2016-06-061-119/+0
* voteStefan Eissing2016-06-061-0/+119
* Merge r1722177, r1722195, r1722229, r1722320, r1722328, r1722334, r1722350, r...Jim Jagielski2016-05-211-0/+54
* Merge r1742135 from trunk:Jim Jagielski2016-05-121-1/+4
* Don't globber scoreboard request info if read_request_line() fails withWilliam A. Rowe Jr2016-05-121-1/+1
* Merge r1741310, r1741461 from trunk:Ruediger Pluem2016-05-035-20/+27
* Merge r1734947, 1735952 from trunk:Jeff Trawick2016-04-272-1/+50
* Merge r1739008, r1739146, r1739151, r1739193 from trunk:Jim Jagielski2016-04-271-48/+40
* Merge r1737114 from trunk:Yann Ylavic2016-04-011-1/+3