summaryrefslogtreecommitdiff
path: root/server
Commit message (Expand)AuthorAgeFilesLines
* Merge r1719252, r1719254, r1719255, r1720996 from trunk:Jim Jagielski2016-01-192-16/+6
* Merge r1719018, r1719189, r1719190 from trunk:Jim Jagielski2016-01-192-11/+13
* Merge r1719016 from trunk:Jim Jagielski2016-01-191-2/+1
* Merge r1715567, r1715568, r1715570, r1715571, r1715572, r1715576, r1715581, r...Jim Jagielski2015-12-292-2/+0
* Merge r1710095, r1710105, r1711902 from trunk:Jim Jagielski2015-11-261-7/+12
* update merge of changes in 2.4.xStefan Eissing2015-11-191-2/+3
|\
| * Merge r1711553, r1713040, r1683881 from trunk:Jim Jagielski2015-11-181-2/+3
* | merge of 1708107,1709587,1709602,1709995,1710231,1710419,1710572,1710583 from...Stefan Eissing2015-11-042-4/+85
|/
* core: Fix scoreboard crash (SIGBUS) on hardware requiring strict 64bitGraham Leggett2015-11-031-10/+15
* Merge r1710380, r1710391 from trunk:Jim Jagielski2015-11-032-13/+34
* Merge r1706918 from trunk:Jim Jagielski2015-10-061-2/+2
* Merge r1629916 from trunk:Jim Jagielski2015-10-061-1/+1
* Follow up to r1705672.Yann Ylavic2015-09-282-15/+14
* Merge r1697855, r1697339, r1696428, r1696266, r1696264, r1695874, r1695727, r...Jim Jagielski2015-09-283-0/+386
* mod_slotmem_shm: Fix slots/SHM files names on restart for systems thatGraham Leggett2015-09-261-2/+18
* util_script: Make REDIRECT_URL a complete URL (where set).Graham Leggett2015-09-261-2/+15
* MPMs: Support SO_REUSEPORT to create multiple duplicated listenerGraham Leggett2015-09-267-178/+704
* Merge r1602978, r1683044, r1683884, r1673368, r1701717, r1683047 from trunk:Jim Jagielski2015-09-162-5/+4
* Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326, r...Jim Jagielski2015-09-082-7/+6
* Backport r1690120.Christophe Jaillet2015-07-112-2/+2
* Backport r1690122.Christophe Jaillet2015-07-111-1/+1
* core: Avoid a possible truncation of the faulty header included in theWilliam A. Rowe Jr2015-07-081-3/+6
* Merge r1684057 from trunk:Eric Covener2015-06-191-1/+1
* SECURITY: CVE-2015-3185 (cve.mitre.org)William A. Rowe Jr2015-06-091-18/+56
* Merge r1682482 from trunk:Jim Jagielski2015-06-011-2/+19
* core, modules: Avoid error response/document handling by the core if someWilliam A. Rowe Jr2015-05-294-2/+6
* Merge r1666998 from trunk:Jim Jagielski2015-05-221-5/+6
* Merge r1664133, r1643284, r1621417 from trunk:Jim Jagielski2015-05-072-3/+3
* Merge r1666468, r1666618, r1674697 from trunk:Jim Jagielski2015-04-201-15/+19
* Merge r1674606 from trunk:Jim Jagielski2015-04-191-1/+1
* Merge r1642847 and r1673155 from trunk so that yesterday's ApacheCon talk is ...Jeff Trawick2015-04-152-1/+21
* Remove an empty line at the end of the file to synch with trunk.Christophe Jaillet2015-04-131-1/+0
* Merge r1661486 from trunk:Jeff Trawick2015-04-131-2/+0
* Merge r1669289, r1669292 from trunk:Jim Jagielski2015-03-311-1/+1
* Merge r1664071, r1664299 from trunk:Jim Jagielski2015-03-311-82/+217
* Merge r1668532, r1668535, r1668553 from trunk:Jim Jagielski2015-03-312-4/+13
* Merge r1661448 from trunk:Jim Jagielski2015-03-311-29/+57
* Merge r1664205 from trunk:Eric Covener2015-03-241-2/+2
* Merge r1663017 from trunk:Jim Jagielski2015-03-051-8/+8
* Merge r1657692, r1660800 from trunkChristophe Jaillet2015-02-272-2/+6
* Merge r1657685 from trunk:Rainer Jung2015-02-241-1/+26
* Merge r1611979, r1611725, r1588448, r1642803, r1657949, r1451108 (part of it),Christophe Jaillet2015-02-242-2/+5
* revert r1642852 for 2.4.x release purposes. It appears to breakEric Covener2015-01-192-8/+0
* As noted by Yann, this resulted in a dead var assignment. Preinit won'tWilliam A. Rowe Jr2015-01-151-1/+1
* mpm_winnt: Accept utf-8 (Unicode) service names and descriptions forWilliam A. Rowe Jr2015-01-151-74/+402
* mpm_winnt service.c: Normalize error and status messages, clean upWilliam A. Rowe Jr2015-01-151-60/+82
* Merge r1651088 from trunk:Eric Covener2015-01-141-0/+2
* Merge r1648394 from trunk:Eric Covener2015-01-141-15/+15
* Merge r1512819, r1513461 (part of it), r1565777, r1643538 from trunk:Jim Jagielski2015-01-121-0/+138
* Merge r1643825 from trunk:Jim Jagielski2015-01-121-0/+1