summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-07-05Merge remote-tracking branch 'origin/upstream'Stefan Fritsch973-12254/+21970
2016-07-05Imported Upstream version 2.4.23upstreamStefan Fritsch973-12254/+21970
2016-07-05Revert "Fix conffiles from wheezy upgrade"Stefan Fritsch6-169/+1
Revert fix for now. Will upload 2.4.23 first and then include the fix in a later upload when it got more testing. This reverts commit be57de2935c807f7fef290d96ce699fc160f0036.
2016-06-14Use 'Require method' instead of in userdir.confStefan Fritsch2-6/+2
Limit/LimitExcept is broken by design.
2016-06-04Fix spelling typoJean-Michel Vourgère1-1/+1
2016-05-29Re-introduce mod_imagemap and mod_cern_metaStefan Fritsch4-1/+4
2016-05-29dh_apache2: add missing options to the help summaryStefan Fritsch1-0/+1
2016-05-29set SHELL=/bin/bash during configure for reproducible buildsStefan Fritsch2-1/+3
2016-05-29Fix conffiles from wheezy upgradeStefan Fritsch6-1/+174
Some conffile may have got the wrong content during upgrade from wheezy to early jessie versions. In order to fix this without dpkg prompting the user, we need to replace those conffiles during preinst. Unfortunately, in preinst the package is not yet unpacked so we cannot access any of its files. Therefore, the correct conffile content is embedded in a base64 encoded tarball in the preinst script.
2016-05-28release 2.4.20-2Stefan Fritsch1-2/+2
2016-05-28fix postrm check for index.htmlStefan Fritsch2-1/+6
And check the check during build.
2016-05-28add ref to upstream commitStefan Fritsch1-0/+1
2016-05-28Fix segfault with logresolve -cStefan Fritsch3-0/+14
2016-05-28Bump Standards-VersionStefan Fritsch2-1/+2
2016-05-28Fix a2enmod to run on perl 5.14 to simplify backportsStefan Fritsch2-2/+3
2016-05-28Remove links to manpages.debian.org in default index.htmlStefan Fritsch4-9/+35
While there, add some rel="nofollow" to other links. Also update problematic index.html files in postinst.
2016-05-28Fix race condition and logical error in init scriptStefan Fritsch2-5/+12
2016-05-28Fix crash in ap_get_useragent_hostStefan Fritsch3-0/+22
2016-04-10release 2.4.20-1Stefan Fritsch1-2/+2
2016-04-10Use pthread mutexes on linuxStefan Fritsch5-3/+22
kfreebsd/hurd lack robust pthred mutexes. Therefore we need to keep using fcntl there. For fcnl, we need to specify the directory in apache2.conf explicitly, to support multi-instance setups. To achieve this, we add a marker to apache2.conf that is removed or replaced by a '#' during build, depending on the OS.
2016-04-10fix forking.conf install pathStefan Fritsch1-1/+1
2016-04-10Give some hints to systemd-sysv-generatorStefan Fritsch3-0/+7
this fixes 'systemctl status'
2016-04-09Adjust for 2.4.20Stefan Fritsch3-17/+3
- adjust changelog - drop backported prefork_single_process_crash.patch
2016-04-09Merge branch 'upstream'Stefan Fritsch1236-10419/+79469
2016-04-09Imported Upstream version 2.4.20Stefan Fritsch1236-10419/+79469
2016-04-09Build against lua 5.2Stefan Fritsch2-1/+7
2016-03-28Release 2.4.18-2Stefan Fritsch1-2/+2
2016-03-28stop apache2 before upgradeStefan Fritsch1-1/+1
otherwise htcacheclean may be left running
2016-03-28Bump Standards-VersionStefan Fritsch2-1/+2
2016-03-28rework htcacheclean integrationStefan Fritsch13-102/+257
* split into separate init script * activate/deactivate with a2enmod/a2dismo cache_disk * don't run as root * add test
2016-03-28duplicate-module-load test: use $ADTTMPStefan Fritsch1-9/+7
2016-03-27Merge autopkgtests from UbuntuStefan Fritsch5-0/+138
And fix duplicate-module-load test
2016-03-27Merge cross-compile tweaks for debian/rules from ubuntuStefan Fritsch2-2/+5
2016-03-26styleStefan Fritsch1-1/+2
2016-03-26style tweaksStefan Fritsch1-9/+11
no logic change
2016-03-26Don't treat mod_access_compat as essentialStefan Fritsch2-1/+3
2016-03-25add hint about systemd in README.multiple-instancesStefan Fritsch2-1/+4
2016-02-28remove MSIE ssl work-aroundsStefan Fritsch2-5/+5
2016-01-09README.backtrace: note that dir must be owned by www-dataStefan Fritsch2-3/+7
2016-01-09close a2query bug in changelogStefan Fritsch1-0/+7
2016-01-09a2query: whitespace fixesStefan Fritsch1-6/+6
2016-01-09a2query: replace C-ish for with perlish foreachStefan Fritsch1-2/+2
2016-01-09apache2-maintscript-helper: Add some quotesStefan Fritsch1-7/+7
The ones in [ "$CUR_MPM" != "$MPM" ] are really necessary if a2query fails. Add some more fore safety.
2016-01-09a2query: Fix regex for extracting MPMStefan Fritsch1-1/+1
2015-12-19release 2.4.18-1Stefan Fritsch1-2/+2
2015-12-19Adapt patches + changelogStefan Fritsch4-58/+7
Remove obsolete patches: - mod_http2_log_protocol.patch - revert-REDIRECT_URL.patch
2015-12-19Merge branch 'upstream'Stefan Fritsch122-5040/+9335
2015-12-19Imported Upstream version 2.4.18Stefan Fritsch122-5040/+9335
2015-11-23release 2.4.17-3Stefan Fritsch1-2/+2
2015-11-23mpm_prefork: Fix segfault if started with -XStefan Fritsch3-0/+22
Seems like worker/event are not affected. See also https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?r1=1712521&r2=1712520&pathrev=1712521