]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Stefan Fritsch [Sat, 3 Sep 2011 15:55:19 +0000 (15:55 +0000)]
Some votes and a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1164878 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 3 Sep 2011 15:35:54 +0000 (15:35 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1164875 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 3 Sep 2011 13:20:16 +0000 (13:20 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1164863 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 3 Sep 2011 03:21:59 +0000 (03:21 +0000)]
upgrade to +1 for dropping log severity, leave discussion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1164799 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 3 Sep 2011 03:19:41 +0000 (03:19 +0000)]
a couple of wishy-washy votes and propose MaxRanges for 2.2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1164798 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 Aug 2011 00:11:53 +0000 (00:11 +0000)]
And we are at 2.2.21-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1163058 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 Aug 2011 00:09:19 +0000 (00:09 +0000)]
prepare to tag 2.2.20
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1163056 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 29 Aug 2011 16:05:30 +0000 (16:05 +0000)]
Wow... hasn't been touched in awhile...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162887 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 29 Aug 2011 15:59:39 +0000 (15:59 +0000)]
Remove dead, wrong code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162885 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 29 Aug 2011 15:53:52 +0000 (15:53 +0000)]
Allow for actual counting...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162881 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 29 Aug 2011 15:40:19 +0000 (15:40 +0000)]
CVE-2011-3192
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162874 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 29 Aug 2011 15:30:53 +0000 (15:30 +0000)]
enough votes... promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162871 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 29 Aug 2011 15:29:07 +0000 (15:29 +0000)]
Add CHANGES entry for r1162852
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162868 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 29 Aug 2011 15:26:39 +0000 (15:26 +0000)]
Merge r1125646 from trunk:
Some LDAP servers (wrongly) return LDAP_CONSTRAINT_VIOLATION if a user is
locked due to too many password retries. This should not cause an internal
server error but be treated as "auth denied".
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162864 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 29 Aug 2011 15:25:12 +0000 (15:25 +0000)]
Merge r1103213 from trunk:
Fix a timed out connection going into the keep-alive state after a timeout
when discarding a request body.
PR: 51103
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162862 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 29 Aug 2011 15:23:36 +0000 (15:23 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162859 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 29 Aug 2011 15:22:22 +0000 (15:22 +0000)]
Merge r958253 from trunk:
Stop compressing if we are doing a HEAD request and the content-length filter
can't determine the content-length anyway.
Submitted by: Ruediger Pluem
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162858 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 29 Aug 2011 15:21:31 +0000 (15:21 +0000)]
And promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162857 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 29 Aug 2011 15:21:03 +0000 (15:21 +0000)]
More votes...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162855 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 29 Aug 2011 15:20:16 +0000 (15:20 +0000)]
PR: 45076
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162854 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 29 Aug 2011 15:19:23 +0000 (15:19 +0000)]
* mod_filter: FilterProvider conditions of type "resp=" (response headers)
do not work for CGI, because headers_out are not populated. We need to use
err_headers_out instead in this case. In trunk this is handled by ap_expr().
Joe recently added fall back to err_headers_out to ap_expr and the proposed
mod_filter patch is analogous to Joe's fix.
The patch fixes the test suite failure for t/modules/filter.t.
Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1090234
2.2.x patch: http://people.apache.org/~rjung/patches/mod_filter-cgi-err_headers_out.patch
+1: rjung, jorton, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162852 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 29 Aug 2011 15:18:18 +0000 (15:18 +0000)]
Votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162850 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 29 Aug 2011 14:58:24 +0000 (14:58 +0000)]
Propose backport of CVE-2011-3192 fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162842 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 28 Aug 2011 20:12:21 +0000 (20:12 +0000)]
respond to comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1162582 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Tue, 23 Aug 2011 21:00:32 +0000 (21:00 +0000)]
Add proposal for AllowOverrideList
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1160885 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Tue, 23 Aug 2011 20:01:27 +0000 (20:01 +0000)]
Add proposal for SSLProxyMachineCertificateChainFile
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1160876 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Tue, 23 Aug 2011 08:09:42 +0000 (08:09 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1160576 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Tue, 23 Aug 2011 08:03:29 +0000 (08:03 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1160574 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 21 Aug 2011 14:30:36 +0000 (14:30 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1159988 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 16 Aug 2011 12:04:37 +0000 (12:04 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1158219 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 15 Aug 2011 14:11:22 +0000 (14:11 +0000)]
Correct this link, rather than linking to a page that links to the right
location.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1157854 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 8 Aug 2011 12:38:12 +0000 (12:38 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1154945 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 8 Aug 2011 12:16:58 +0000 (12:16 +0000)]
Merge r1154940 from trunk:
document implicit limitation in AllowOverride Option=Foo -- this doesn't let you
"lock in" any value since the non +/- syntax can zap whatever it wants.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1154942 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 8 Aug 2011 02:39:33 +0000 (02:39 +0000)]
propose mod_rewrite correction to internal rewrite map initialization.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1154811 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 8 Aug 2011 02:37:15 +0000 (02:37 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1154810 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 8 Aug 2011 02:36:25 +0000 (02:36 +0000)]
get some quick votes in, double-check change of relative-redirect loglevel change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1154809 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 7 Aug 2011 22:43:14 +0000 (22:43 +0000)]
authn_dbd docs: add reference to password formats note
(thanks Tom Browder on users@ for pointing out this is useful in trunk
docs but missing from 2.2).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1154782 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 30 Jul 2011 11:18:43 +0000 (11:18 +0000)]
Add proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1152454 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 19 Jul 2011 21:40:49 +0000 (21:40 +0000)]
vote+promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1148554 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 15 Jul 2011 22:53:18 +0000 (22:53 +0000)]
zap another "myserver" hostname
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1147342 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 15 Jul 2011 21:50:11 +0000 (21:50 +0000)]
s/myserver/example.com/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1147330 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 15 Jul 2011 00:43:52 +0000 (00:43 +0000)]
Updated backport proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1146933 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 12 Jul 2011 16:23:23 +0000 (16:23 +0000)]
Added backport proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1145658 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 12 Jul 2011 13:12:14 +0000 (13:12 +0000)]
Rebuild changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1145580 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 12 Jul 2011 13:09:24 +0000 (13:09 +0000)]
Remove mention of <If> Directive, as per bug id 51501
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1145575 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Thu, 30 Jun 2011 00:17:42 +0000 (00:17 +0000)]
propose trivial bugfix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1141341 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 25 Jun 2011 15:18:53 +0000 (15:18 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1139551 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Thu, 23 Jun 2011 03:34:52 +0000 (03:34 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1138726 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Thu, 23 Jun 2011 03:34:20 +0000 (03:34 +0000)]
update for sync with English doc.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1138725 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 19 Jun 2011 14:49:31 +0000 (14:49 +0000)]
propose a few low hanging fruit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1137373 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 19 Jun 2011 11:45:57 +0000 (11:45 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1137349 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 19 Jun 2011 11:39:40 +0000 (11:39 +0000)]
properties.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1137344 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 15 Jun 2011 22:32:06 +0000 (22:32 +0000)]
vote, add PR
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1136226 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 14 Jun 2011 17:03:21 +0000 (17:03 +0000)]
Sort hooks before running pre-config hook.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1135707 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Jun 2011 15:39:40 +0000 (15:39 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1134675 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 6 Jun 2011 15:43:30 +0000 (15:43 +0000)]
Merge r1132676 from trunk:
TraceEnable is per-virtualhost, not just per-server.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1132677 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Jun 2011 16:54:59 +0000 (16:54 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1131436 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 31 May 2011 08:06:12 +0000 (08:06 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1129551 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Fri, 27 May 2011 06:14:28 +0000 (06:14 +0000)]
Fix the NameVirtualHost and <VirtualHost> examples, by adding a port (:80) after the example IP addresses
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1128161 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 24 May 2011 18:37:30 +0000 (18:37 +0000)]
More goofy text file mistakes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1127209 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 May 2011 11:42:29 +0000 (11:42 +0000)]
Add proposal to fix t/modules/filter.t.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1125920 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 21 May 2011 09:50:58 +0000 (09:50 +0000)]
Enabled NetWare abs build; axed obsolete IDE .def.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1125655 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 20 May 2011 16:56:05 +0000 (16:56 +0000)]
And we are at .20-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1125465 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 20 May 2011 16:54:17 +0000 (16:54 +0000)]
Prepare to tag 2.2.19
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1125463 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 19 May 2011 10:28:44 +0000 (10:28 +0000)]
mention ap_unescape_url_keep2f_ex()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1124670 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 19 May 2011 02:17:37 +0000 (02:17 +0000)]
restore ABI break in r1082630, changed signature of ap_unescape_url_keep2f().
Reviewed By: covener, wrowe, trawick
http://mail-archives.apache.org/mod_mbox/httpd-dev/201105.mbox/%
3C4DD4032F .
1070400 @p6m7g8.com%3E
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1124515 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 18 May 2011 03:07:48 +0000 (03:07 +0000)]
Correct Win64 Servername Identification
PR: 47418
Submitted by: [Jorge Schrauwen <jorge.schrauwen gmail.com>]
Backports: r1104624
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1104673 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 18 May 2011 01:27:40 +0000 (01:27 +0000)]
yeah, vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1104650 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 18 May 2011 00:51:51 +0000 (00:51 +0000)]
ho hum
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1104642 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 17 May 2011 23:23:13 +0000 (23:23 +0000)]
Suggest
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1104629 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sat, 14 May 2011 07:02:28 +0000 (07:02 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1102964 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sat, 14 May 2011 06:56:23 +0000 (06:56 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1102963 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sat, 14 May 2011 06:54:28 +0000 (06:54 +0000)]
fixed validation error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1102962 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 9 May 2011 20:07:31 +0000 (20:07 +0000)]
Plenty of text here
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1101198 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 9 May 2011 20:00:30 +0000 (20:00 +0000)]
Text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1101190 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 9 May 2011 19:58:55 +0000 (19:58 +0000)]
Another text file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1101189 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 9 May 2011 17:02:29 +0000 (17:02 +0000)]
rpm spec file: Remove reference to ssl.key and ssl.crt directories in line
with httpd-trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1101112 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 9 May 2011 16:29:35 +0000 (16:29 +0000)]
rpm spec file: Remove requirement for /usr/share/magic.mime, we don't reference
this file anywhere within the package.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1101092 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 9 May 2011 15:32:45 +0000 (15:32 +0000)]
rpm spec file: Remove corrupted %changelog entry:
error: bad date in %changelog: See http://www.apache.org/dist/httpd/CHANGES_2.2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1101065 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 9 May 2011 13:17:01 +0000 (13:17 +0000)]
Rebuilds various language transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1101015 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 9 May 2011 13:11:06 +0000 (13:11 +0000)]
Missing line breaks. via couleurfofuca gmail.com
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1101011 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 9 May 2011 03:02:00 +0000 (03:02 +0000)]
Noted these win32 build files were missing from -win32-src on unix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1100868 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 8 May 2011 06:49:48 +0000 (06:49 +0000)]
Bump after tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1100690 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 8 May 2011 06:47:03 +0000 (06:47 +0000)]
Prepare for 2.2.18 tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1100688 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 7 May 2011 21:35:15 +0000 (21:35 +0000)]
No showstoppers, 1.4.4 and 1.3.11 are both approved en-route to release.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1100633 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 7 May 2011 11:39:29 +0000 (11:39 +0000)]
Merge r1100511 from trunk:
use APR_STATUS_IS_TIMEUP() instead of direct comparison with APR_TIMEUP.
Submitted By: Ruediger Pluem
Reviewed By: wrowe, rjung, covener
http://mail-archives.apache.org/mod_mbox/httpd-dev/201105.mbox/%
3C4DC4D6A8 .
7070804 @apache.org%3E
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1100512 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 7 May 2011 04:37:47 +0000 (04:37 +0000)]
Regenerate dependencies; fixes an issue noted by Bert on the
apr project (abspath includes in RSC targets), and add srclib
targets to the system INCLUDE path so that these are excluded
from the dependencies; seperate builds will work without the
srclib/ files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1100447 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 7 May 2011 04:37:24 +0000 (04:37 +0000)]
Regenerate dependencies; fixes an issue noted by Bert on the
apr project (abspath includes in RSC targets), and add srclib
targets to the system INCLUDE path so that these are excluded
from the dependencies; seperate builds will work without the
srclib/ files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1100446 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 7 May 2011 04:36:03 +0000 (04:36 +0000)]
Regenerate dependencies; fixes an issue noted by Bert on the
apr project (abspath includes in RSC targets), and add srclib
targets to the system INCLUDE path so that these are excluded
from the dependencies; seperate builds will work without the
srclib/ files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1100445 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 7 May 2011 04:15:27 +0000 (04:15 +0000)]
Not possible; you don't declare a variable const and then
maniuplate it.
Backports: r1100443
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1100444 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 6 May 2011 17:28:00 +0000 (17:28 +0000)]
Going forwards, keep win32 build in svn once a tree is stable.
Visual Studio 2010 users cannot convert our .dsp files, and
ddk toolchain users couldn't either.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1100294 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 6 May 2011 16:26:09 +0000 (16:26 +0000)]
Revert unreviewed status item with insufficient explanation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1100264 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 6 May 2011 13:51:38 +0000 (13:51 +0000)]
Grab these from trunk:
r1091079 fix const-ness mismatch in call to mpm_nt_eventlog_stderr_open()
r1091076 match expected type of arg to StartService()
r1089600 cleanups to function signatures, prototypes, visibility
r1089605 yank some dead code and variables
(only a small part of the patch to service.c was applicable)
r1089614 Log the OS socket (int) instead of the apr_socket_t *.
r1089624 can't format time_t with %d; cast this small interval time to int
r1089639 HANDLE is PVOID which is reasonably formatted by %pp, but not by %d
r1089659 format string fixes: DWORD is unsigned long and needs %lu instead of %d or %i
r1089688 axe ap_registry_get_server_root(), which seems to have been unused after httpd 1.3
r1089689 get prototype for ap_os_create_privileged_process()
r1089690 axe a couple of unused vars, mark a function as static
r1089857-equivalent Fix format string for pid in "Child: <pid>" messages
r1040220 subset (fuangk) Fixed some win32 types.
mod_win32.c changes aren't needed
"DWORD tid" is "unsigned tid" due to use of different thread create fn
r1025492 subset (fuangk) get prototypes for time(), _beginthreadex()
remove cast from apr_getopt_init() call to fix warning,
fix const-ness of service_name
r983412 (fuangk) ap_regkey.c: Added casts to silent compiler warnings.
No direct trunk equiv since code was rewritten or removed:
. util_script.c warnings for assignent+truth value
. missing const from signature of set_disable_acceptex()
Reviewed by: wrowe, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1100216 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 6 May 2011 13:35:49 +0000 (13:35 +0000)]
Grab r1090634 from trunk:
don't try to shut down child if it wasn't created
(or, fix warning about reference to uninitialized variable
child_exit_event)
Reviewed by: wrowe, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1100211 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 6 May 2011 13:14:27 +0000 (13:14 +0000)]
Merge r820760, r919323, r937858, r938265 from trunk:
Reviewed By: sf, trawick, covener
core: Treat timeout reading request as 408 error, not 400.
Log 408 errors in access log as was done in Apache 1.3.x.
PR: 39785
Submitted by: Nobutaka Mantani, Stefan Fritsch
Reviewed and added to by: Dan Poirier
* Only log a 408 if it is no keepalive timeout.
PR: 39785
Submitted by: Mark Montague <markmont umich.edu>, rpluem
Reviewed by: rpluem
PR49167, unexpected 413 and double-errordoc during a timeout reading a
chunk-size.
Use the more specific 408 (timed out) instead of a generic 400 during a timeout
reading a chunk-length.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1100200 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 6 May 2011 13:04:17 +0000 (13:04 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1100196 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 5 May 2011 13:34:59 +0000 (13:34 +0000)]
Add BSD-specific note about core dumping. (Via mi+apache aldan.algebra.com)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1099787 13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Tue, 3 May 2011 20:17:34 +0000 (20:17 +0000)]
yes, mime.types is CTR -- done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1099229 13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Tue, 3 May 2011 20:13:58 +0000 (20:13 +0000)]
sync with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1099223 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 3 May 2011 11:56:47 +0000 (11:56 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1099029 13f79535 -47bb-0310-9956-
ffa450edef68