summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-01-02release 2.2.3-4+etch2debian/2.2.3-4+etch2Stefan Fritsch1-2/+2
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@455 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02fix CVE-2007-3304: parent process could be forced to kill other processesStefan Fritsch3-0/+165
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@453 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Ship /usr/lib/cgi-binStefan Fritsch2-0/+2
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@441 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02update NEWSStefan Fritsch1-3/+7
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@440 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02ship conf.d/apache2-docStefan Fritsch5-4/+26
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@425 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02fix typoStefan Fritsch1-1/+1
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@424 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02add security patches from upstream svnStefan Fritsch4-0/+133
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@423 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02update NEWSStefan Fritsch1-1/+2
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@422 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02point to upgrading howto in NEWSStefan Fritsch2-0/+18
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@413 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Display warning when NO_START=1 even with VERBOSE=noStefan Fritsch2-1/+3
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@397 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02chmod o-rx suexecStefan Fritsch2-1/+3
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@396 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Followup to r393: replace == with = in test statements.Peter Samuelson1-2/+2
== is a bashism. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@394 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Fix regression breaking /etc/init.d/apache when /bin/sh is not bashStefan Fritsch2-2/+4
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@393 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02backport /var/lock/apache2 owner fix to etchStefan Fritsch2-1/+8
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@379 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02use stable in changelogdebian/2.2.3-4+etch1Stefan Fritsch1-1/+1
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@350 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02adjust changelog wordingStefan Fritsch1-2/+3
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@349 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02when restarting, wait for apache to die before starting it againStefan Fritsch2-2/+31
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@348 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Ship apache2(8) manpageStefan Fritsch2-5/+7
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@347 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02adjust changelog and NEWS.Debian for etchStefan Fritsch2-8/+13
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@346 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Merge from trunk to 2.2.3-4+etch1:Stefan Fritsch6-2/+177
r325: document restart during logrotate in README.Debian r333: readd info about config dir layout r341: comment out CacheEnable and add documentation and warnings r342: adjust wording of NEWS.Debian git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@345 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02On etch branch: *really* prepare for upload.debian/2.2.3-4Peter Samuelson1-0/+2
(Forgot a bit of changelog magic earlier.) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@307 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02On etch branch: prepare for 2.2.3-4 upload.Peter Samuelson2-3/+3
Also add myself to Uploaders. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@306 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02On etch branch: final tweaks to apache2.2-common:Peter Samuelson1-4/+9
* New function mod_is_enabled for readability * Fix logic for the bulk of the a2enmod calls - make them happen for new installs as well as upgrades. That seems to have been the original intent, and I agree that it is the Right Thing. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@305 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02On etch branch: simplify apache2-common -> apache2.2-common upgradePeter Samuelson1-10/+10
messiness yet again, this time with $UPGRADE = {new_install | from_2_0 | from_2_2}. Still trying to figure out whether the right a2enmods are happening in the right cases. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@304 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02On etch branch: Merge r296 and r297 from trunk, in order to fixPeter Samuelson2-2/+32
#396782, #407171, #415775. And I'm still playing with exactly how to express what we want. The existing postinst code doesn't make the intentions clear at all. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@303 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02On etch branch: 2.2.3-3.3 NMU by vorlon.Peter Samuelson2-1/+10
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@302 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02On etch branch: 2.2.3-3.2 NMU by aba.Peter Samuelson3-0/+29
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@301 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02On etch branch: The rest of the 2.2.3-3.1 NMU - doh!Peter Samuelson3-0/+3
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@300 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02On etch branch: 2.2.3-3.1 NMU by aba.Peter Samuelson3-3/+15
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@299 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Target to unstabledebian/2.2.3-3Tollef Fog Heen1-1/+1
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@261 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Add { and } around the usage format in the init script to make the init scriptTollef Fog Heen2-1/+3
bash completion happier. Closes: #350606 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@260 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Close relevant bug for last commitTollef Fog Heen1-1/+1
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@259 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Add default deflate.conf compressing text/html, text/plain and text/xml.Tollef Fog Heen2-0/+5
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@258 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02On reload, make the init script exit 1 with an error message if theTollef Fog Heen2-2/+9
configuration is broken. Closes: #316858 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@257 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Ubuntu RedirectMatch confusion.Adam Conrad2-0/+6
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@256 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Fix whitespace typo in init scriptAdam Conrad1-1/+1
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@255 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02apache2 dependency fixAdam Conrad2-1/+3
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@254 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Add alternate dependency from apache to apache2-mpm-eventTollef Fog Heen2-1/+2
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@253 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Make sure -I flags are included tooTollef Fog Heen2-4/+5
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@252 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Provide dir.conf. Closes: #392356Tollef Fog Heen2-0/+6
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@251 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Provide sample disk and memory cache configurations. Closes: #278564Tollef Fog Heen4-0/+15
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@250 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Warn when not starting HTTPD due to missing apache binary. Closes: #384128Tollef Fog Heen2-0/+3
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@249 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Clean up CPPFLAGS and CFLAGS, including making all of CFLAGS a superset ofTollef Fog Heen2-0/+13
CPPFLAGS. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@248 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02fix for #393277Thom May2-2/+2
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@247 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Merge a2enmod.8 + a2dismod.8, expand them a bit, ship them in a2.2-common.Peter Samuelson4-44/+49
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@246 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02fix 391918 - suexec not setuidThom May2-2/+5
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@245 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02If a module is already disabled, exit 0 (but not if it does not exist)Tollef Fog Heen2-3/+10
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@244 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Set default IndexWidth to *.Tollef Fog Heen2-1/+2
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@243 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Enable the same list of modules as we had in 2.0 (by default) and do that forTollef Fog Heen2-2/+13
all older versions than 2.2.3-3 to fix upgrade issues people have had. Closes: #392349 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@242 01b336ce-410b-0410-9a02-a0e7f243c266
2012-01-02Urgency medium since it fixes RC bugsTollef Fog Heen1-1/+1
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@241 01b336ce-410b-0410-9a02-a0e7f243c266