]>
granicus.if.org Git - apache/log
Jim Jagielski [Tue, 3 Apr 2012 12:37:57 +0000 (12:37 +0000)]
Merge r1294306 from trunk:
Initialize EC temporary key on server startup, as for DH and
RSA. This fixes a race condition that could lead to a crash with threaded
MPMs.
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308862 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Apr 2012 12:35:57 +0000 (12:35 +0000)]
Promote backports w/ 3+ +1s
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308857 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Apr 2012 12:35:31 +0000 (12:35 +0000)]
And cast another
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308856 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Apr 2012 12:35:13 +0000 (12:35 +0000)]
cast vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308854 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Tue, 3 Apr 2012 11:44:22 +0000 (11:44 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308828 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Tue, 3 Apr 2012 11:38:36 +0000 (11:38 +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.4.x@
1308826 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Tue, 3 Apr 2012 10:14:28 +0000 (10:14 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308803 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 3 Apr 2012 09:35:18 +0000 (09:35 +0000)]
Typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308781 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 3 Apr 2012 06:47:24 +0000 (06:47 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308721 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 3 Apr 2012 06:47:12 +0000 (06:47 +0000)]
Merge r1308718 from trunk:
Added a note about MySQL's reconnect option and its effects on prepared statements
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308720 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 3 Apr 2012 05:47:57 +0000 (05:47 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308710 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 3 Apr 2012 05:47:16 +0000 (05:47 +0000)]
Merge r1308707 from trunk:
Add five little words to clear up that we mean in a .htaccess context
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308709 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 2 Apr 2012 21:30:52 +0000 (21:30 +0000)]
fix typo (ty André)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308580 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 2 Apr 2012 20:00:44 +0000 (20:00 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308516 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 2 Apr 2012 20:00:13 +0000 (20:00 +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.4.x@
1308514 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 2 Apr 2012 18:55:38 +0000 (18:55 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308464 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 2 Apr 2012 18:54:47 +0000 (18:54 +0000)]
Merge r1308459 from trunk:
Adjust the output section since the example output is no longer present.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308463 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 2 Apr 2012 18:53:45 +0000 (18:53 +0000)]
Yepprs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308462 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 2 Apr 2012 16:00:40 +0000 (16:00 +0000)]
Fix typo (Thanks to Daniel Shahaf)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308407 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 2 Apr 2012 13:26:11 +0000 (13:26 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308346 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 2 Apr 2012 12:53:49 +0000 (12:53 +0000)]
Merge r1308327 from trunk:
remove the example output because <pre> and <note> cause fatal XSLT when
creating the manpage version of apxs. This seems to not run for some other
folks. (also, move new decsription stuff so it precedes bugs)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308330 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 2 Apr 2012 11:22:50 +0000 (11:22 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308305 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 2 Apr 2012 11:22:25 +0000 (11:22 +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.4.x@
1308304 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 2 Apr 2012 04:51:15 +0000 (04:51 +0000)]
deleted (rearranging sections)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308237 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 2 Apr 2012 03:19:38 +0000 (03:19 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308231 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 2 Apr 2012 03:18:15 +0000 (03:18 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308230 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 1 Apr 2012 15:41:31 +0000 (15:41 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1308141 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 31 Mar 2012 15:40:36 +0000 (15:40 +0000)]
Merge r1306409:
* Add the forcerecovery balancer parameter that determines if recovery for
balancer workers without considering the retry value of workers is enforced.
There might be cases where an already overloaded backend can get into deeper
trouble if the recovery of all workers is enforced without considering the
retry parameter of each worker
Committed by: rpluem
Reviewed by: rpluem, covener, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307835 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 31 Mar 2012 15:38:42 +0000 (15:38 +0000)]
vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307834 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 31 Mar 2012 15:34:59 +0000 (15:34 +0000)]
Merge r1303201, r1303435, r1303827:
* Revert r1294936 (Jeff's revert) and fix NetWare / Win32 build.
Added the missing AP_DECLARE* decorations for the function
implementations and variables.
* Fix changes in parameter names in function definitions done in r1303201
* Partly revert r1303435 and rename pconf back to in_pconf to avoid shadowing
the global variable with the same name and create a bogus assignment.
Pointed out by: Eric Covener
Committed by: fuankg, rpluem
Reviewed by: fuankg, minfrin, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307828 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 31 Mar 2012 15:14:08 +0000 (15:14 +0000)]
Merge r1302444, r1302483:
* Correctly save the reverse proxy worker in all virtual host proxy configs.
PR: 52935
Obtained from: Petter Berntsen <petterb gmail.com>
Committed by: rpluem
Reviewed by: covener, minfrin, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307825 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 31 Mar 2012 15:09:11 +0000 (15:09 +0000)]
vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307823 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 31 Mar 2012 13:21:31 +0000 (13:21 +0000)]
Fix XML error and rebuild html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307798 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 31 Mar 2012 12:52:53 +0000 (12:52 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307794 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 31 Mar 2012 12:51:54 +0000 (12:51 +0000)]
Merge r1307790 from trunk:
Add example ab output
Submitted by: druggeri
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307793 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 31 Mar 2012 12:04:58 +0000 (12:04 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307780 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 31 Mar 2012 12:03:51 +0000 (12:03 +0000)]
Note that if/else flow is easier with the <If>, </Else> directives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307779 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 31 Mar 2012 10:02:35 +0000 (10:02 +0000)]
Fix a broken link to mod_auth_dbm and rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307753 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 31 Mar 2012 08:12:58 +0000 (08:12 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307736 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 31 Mar 2012 08:12:28 +0000 (08:12 +0000)]
Merge r1307733 from trunk:
Clarify the [Skip] flag and add an if-then-else example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307735 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 31 Mar 2012 07:24:16 +0000 (07:24 +0000)]
Rebuild html for mod_ssl
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307730 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 31 Mar 2012 07:22:39 +0000 (07:22 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307729 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 31 Mar 2012 07:21:47 +0000 (07:21 +0000)]
Merge r1307726 from trunk:
Note that some browsers may erroneously convert POST into GET on redirect.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307728 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 31 Mar 2012 02:28:37 +0000 (02:28 +0000)]
Correct SSLCipherSuite + documentation (move rather than add)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307699 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 30 Mar 2012 13:47:07 +0000 (13:47 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307419 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 30 Mar 2012 13:35:46 +0000 (13:35 +0000)]
* Add a proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307406 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 30 Mar 2012 13:12:02 +0000 (13:12 +0000)]
Merge r1307394 from trunk:
PR37194: give a hint about capturing something more like "initial" header
values when a %{foo}i might have been set or changed by a module.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307396 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 30 Mar 2012 11:38:09 +0000 (11:38 +0000)]
Rebuild various.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307371 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 30 Mar 2012 11:37:42 +0000 (11:37 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307369 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 30 Mar 2012 11:34:24 +0000 (11:34 +0000)]
Use more standard syntax notation, as per https://issues.apache.org/bugzilla/show_bug.cgi?id=52112
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307367 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 30 Mar 2012 11:25:24 +0000 (11:25 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307361 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 30 Mar 2012 08:49:24 +0000 (08:49 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307312 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 30 Mar 2012 08:48:54 +0000 (08:48 +0000)]
Merge r1307308 from trunk:
Add some examples of how expressions might be used.
This should probably be extended at some point.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307311 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 30 Mar 2012 02:02:33 +0000 (02:02 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307216 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 30 Mar 2012 01:58:26 +0000 (01:58 +0000)]
It's not very kind to tell me all about how to do it, and then tell me
it's deprecated. Move note up.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307213 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 29 Mar 2012 21:20:26 +0000 (21:20 +0000)]
forgot my vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307114 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 29 Mar 2012 21:19:00 +0000 (21:19 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1307113 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 27 Mar 2012 16:12:44 +0000 (16:12 +0000)]
Merge r1305880 from trunk and rebuild:
Fix link: Require belongs to mod_authz_core, not core.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305882 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 27 Mar 2012 12:32:12 +0000 (12:32 +0000)]
Backport:
mod_sed: Don't define PATH_MAX to a potentially undefined value, causing
compile problems on GNU hurd.
Submitted by: sf
Reviewed by: minfrin, fuankg
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305822 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 27 Mar 2012 12:31:14 +0000 (12:31 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305821 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 26 Mar 2012 23:41:41 +0000 (23:41 +0000)]
vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305676 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 26 Mar 2012 21:05:46 +0000 (21:05 +0000)]
comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305596 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 26 Mar 2012 10:11:51 +0000 (10:11 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305292 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 26 Mar 2012 10:05:41 +0000 (10:05 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305289 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 26 Mar 2012 01:36:51 +0000 (01:36 +0000)]
Fixed broken *_DECLARE_DATA section.
Seems our preprocessor is some crazy and inserts a blank
after replacing a define which made the awk script fail.
Patch submitted by: normw gknw net (Backport r1301281).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305192 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 26 Mar 2012 01:26:06 +0000 (01:26 +0000)]
ask ...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305191 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 26 Mar 2012 01:20:51 +0000 (01:20 +0000)]
propose backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305188 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 22:37:12 +0000 (22:37 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305168 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 22:25:23 +0000 (22:25 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305165 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 22:24:13 +0000 (22:24 +0000)]
Backport:
core: Add ap_runtime_dir_relative() and DefaultRuntimeDir.
Submitted by: trawick
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305164 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 22:18:24 +0000 (22:18 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305163 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 21:58:01 +0000 (21:58 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305159 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 21:46:59 +0000 (21:46 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305158 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 21:40:25 +0000 (21:40 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305153 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 21:27:29 +0000 (21:27 +0000)]
Backport:
core: Fix breakage of Listen directives with MPMs that use a
per-directory config. PR 52904.
Submitted by: sf
Reviewed by: covener, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305145 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 21:25:45 +0000 (21:25 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305144 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 25 Mar 2012 21:19:54 +0000 (21:19 +0000)]
propose two more
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305140 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 21:11:13 +0000 (21:11 +0000)]
Backport:
core: Disallow directives in AllowOverrideList which are only allowed
in VirtualHost or server context. These are usually not prepared to be
called in .htaccess files.
Submitted by: sf
Reviewed by: covener, druggeri
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305137 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 21:04:11 +0000 (21:04 +0000)]
Backport:
core: In AllowOverrideList, do not allow 'None' together with other
directives. PR 52823.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305132 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 21:02:46 +0000 (21:02 +0000)]
Remove stray svn:mergeinfo property.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305131 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 20:57:52 +0000 (20:57 +0000)]
Backport:
mod_slotmem_shm: Support DEFAULT_REL_RUNTIMEDIR for file-based shm.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305127 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 20:54:06 +0000 (20:54 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305125 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 25 Mar 2012 20:13:46 +0000 (20:13 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305114 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sun, 25 Mar 2012 16:40:43 +0000 (16:40 +0000)]
Votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305076 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 25 Mar 2012 12:27:27 +0000 (12:27 +0000)]
more votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305019 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 25 Mar 2012 12:05:39 +0000 (12:05 +0000)]
Submitted by: sf
Reviewed by sf, trawick, druggeri
Merge r1304855 from trunk:
Downgrade log message about adjusted IP address to trace1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305016 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 25 Mar 2012 12:03:30 +0000 (12:03 +0000)]
Submitted by: sf
Reviewed by: sf, trawick, covener
Merge r1304852 from trunk:
Fix merging of AllowOverrideList and ContentDigest.
Remove some useless code.
Pointed out by covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305014 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 25 Mar 2012 11:57:13 +0000 (11:57 +0000)]
Submitted by: covener
Reviewed by: covener, igalic, sf
Merge r1304641 from trunk:
PR52981: mod_request: fix check for bad KeptBodySize argument
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305012 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 25 Mar 2012 11:51:08 +0000 (11:51 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305011 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 25 Mar 2012 07:00:28 +0000 (07:00 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304988 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 25 Mar 2012 06:57:57 +0000 (06:57 +0000)]
Merge r1304985 from trunk:
Mention SSL certificate checks are now enabled by default, as opposed to disabled in 2.2.
Submitted by: Petter Berntsen (petterb@gmail.com)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304987 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 24 Mar 2012 22:43:45 +0000 (22:43 +0000)]
Add vote for remote_ip log change proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304953 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 22:04:49 +0000 (22:04 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304944 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 22:03:06 +0000 (22:03 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304942 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 24 Mar 2012 18:06:53 +0000 (18:06 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304876 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 24 Mar 2012 17:12:24 +0000 (17:12 +0000)]
vote for some simple fixes from sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304866 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 24 Mar 2012 16:49:51 +0000 (16:49 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304856 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 24 Mar 2012 16:35:06 +0000 (16:35 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304853 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 24 Mar 2012 16:17:08 +0000 (16:17 +0000)]
vote+promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304841 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 24 Mar 2012 15:02:41 +0000 (15:02 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304819 13f79535 -47bb-0310-9956-
ffa450edef68