summaryrefslogtreecommitdiff
path: root/server
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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