summaryrefslogtreecommitdiff
path: root/server
Commit message (Expand)AuthorAgeFilesLines
...
* Merge r1601184, r1601274, r1601185 from trunk:Jim Jagielski2015-01-122-5/+16
* Merge r1642868 from trunk:Jim Jagielski2014-12-161-4/+6
* Merge r1638879, r1640031 from trunk:Jim Jagielski2014-12-022-10/+1
* Merge r1639614 from trunk:Jim Jagielski2014-12-021-16/+18
* Merge r1635428 from trunk:Jim Jagielski2014-12-022-0/+8
* Merge r1638073 from trunk:Jim Jagielski2014-12-021-2/+2
* Merge r1533765, r1621419, r1638159, r1638188, r1601603, r1638412, r1418763 fr...Christophe Jaillet2014-11-291-1/+1
* Merge r1635762 from trunk:Jim Jagielski2014-11-111-1/+4
* Merge r1611858, r1611908, r1611916 from trunkChristophe Jaillet2014-11-011-14/+0
* Merge r1629577 from trunk:Jim Jagielski2014-10-271-2/+2
* Merge r1619297, r1621806 from trunk:Jim Jagielski2014-09-262-4/+4
* Merge r1624349 from trunk:Jim Jagielski2014-09-261-2/+8
* number formatJim Jagielski2014-09-181-1/+1
* Merge r1611978, r1612068 from trunk:Jim Jagielski2014-09-054-8/+9
* Merge r1597642, r1608999, r1605207, r1610366, r1610353, r1611871 from trunk:Jim Jagielski2014-09-052-8/+8
* Merge r1618541 from trunk:Jim Jagielski2014-08-311-4/+0
* Merge r1615026 from trunk:Jim Jagielski2014-08-312-14/+7
* SECURITY: CVE-2013-5704 (cve.mitre.org)William A. Rowe Jr2014-08-222-1/+22
* Merge r1610652 from trunk:Jeff Trawick2014-07-151-1/+5
* Merge 1610491 from trunk:Joe Orton2014-07-141-0/+15
* Merge r1496709,r1601995 from trunk:Jeff Trawick2014-07-121-7/+1
* merge comment clarification from trunk r1608785Jeff Trawick2014-07-081-1/+1
* Merge r1606368 and r1607352 from trunk:Jeff Trawick2014-07-081-2/+24
* Backport r1604350 and r1605067 from trunk:Eric Covener2014-06-251-13/+5
* Merge r1572905, r1595305, r1597182, r1586827, r1534892, r1563193, r1597639 fr...Jim Jagielski2014-06-171-4/+5
* r1599852 and r1599799 in trunkChristophe Jaillet2014-06-091-2/+2
* Merge r1546730, r1583008, r1571369, r1552130, r1578760, r1592615, r1592632, r...Jim Jagielski2014-06-032-9/+9
* Fix some comment typosMike Rumph2014-05-132-2/+2
* Merge r1514255, r1514267 from trunk:Jim Jagielski2014-04-181-11/+11
* Merge r1546835, r1546836 from trunk:Jim Jagielski2014-04-181-18/+14
* Merge r1546759, r1546760 from trunk:Jim Jagielski2014-04-152-0/+77
* Merge r1524192, r1524770, r1527925, r1541270, r1541368 from trunk:Jim Jagielski2014-03-101-6/+30
* Merge r1542379 from trunk:Jim Jagielski2014-02-201-0/+5
* Merge r1487528, r1563379, r1563381, r1565711 from trunk:Jim Jagielski2014-02-192-12/+13
* Merge r1545286, r1545292, r1545325, r1545364, r1545408, r1545411 from trunk:Jim Jagielski2014-02-172-29/+26
* Merge r1523387 from trunk:Jim Jagielski2014-02-041-4/+5
* Merge r1557317, r1556911, r1556914, r1555259, r1556912, r1556937, r1559351, r...Jim Jagielski2014-01-282-5/+4
* Merge r1554300, r1554301, r1554994, r1555266 from trunk:Jim Jagielski2014-01-053-12/+168
* * easy proposals to synch 2.4.x and trunkGraham Leggett2013-12-262-7/+3
* missed in applied patchJim Jagielski2013-11-171-1/+1
* event: Use skiplist and fold in performance tweeks from trunkGraham Leggett2013-11-163-51/+89
* mpm_unix: Add ap_mpm_podx_* implementation to avoid code duplicationGraham Leggett2013-11-169-375/+131
* Potential rejection of valid MaxMemFree and ThreadStackSize directivesGraham Leggett2013-11-161-0/+2
* Revert mis-commit 1541372William A. Rowe Jr2013-11-131-30/+6
* Bump to v2 patch proposal, first patch missed lenp = NULLWilliam A. Rowe Jr2013-11-131-6/+30
* Merge r1538490 from trunk:Jim Jagielski2013-11-121-0/+2
* Merge r1526666, r1527220 from trunk:Jim Jagielski2013-10-103-6/+27
* Merge r1530793 from trunk:Jim Jagielski2013-10-101-1/+3
* Merge r1527008 from trunk:Jim Jagielski2013-10-081-2/+9
* Merge r1529449 from trunk:Gregg Lewis Smith2013-10-071-7/+44