]>
granicus.if.org Git - apache/log
Eric Covener [Sun, 2 Dec 2012 14:08:08 +0000 (14:08 +0000)]
add sf's revision, no votes invalidated.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1416179 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 2 Dec 2012 14:06:15 +0000 (14:06 +0000)]
vote+promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1416178 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 2 Dec 2012 11:39:56 +0000 (11:39 +0000)]
vote/comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1416161 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 2 Dec 2012 11:14:40 +0000 (11:14 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1416157 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 2 Dec 2012 11:13:35 +0000 (11:13 +0000)]
vote, comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1416154 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 1 Dec 2012 19:56:48 +0000 (19:56 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1416046 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 1 Dec 2012 14:28:42 +0000 (14:28 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1416002 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Sat, 1 Dec 2012 09:56:51 +0000 (09:56 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1415963 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Sat, 1 Dec 2012 09:53:54 +0000 (09:53 +0000)]
merge r1415960
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1415961 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Fri, 30 Nov 2012 09:11:39 +0000 (09:11 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1415552 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Fri, 30 Nov 2012 09:09:33 +0000 (09:09 +0000)]
merge r1415549
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1415551 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Thu, 29 Nov 2012 08:40:12 +0000 (08:40 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1415083 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Thu, 29 Nov 2012 08:19:11 +0000 (08:19 +0000)]
merge r1415075
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1415078 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 29 Nov 2012 01:41:35 +0000 (01:41 +0000)]
question myself on startup failure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1415027 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 29 Nov 2012 01:38:58 +0000 (01:38 +0000)]
propose Include /path/to/dir fix
back-to-back valid PR's submitted in the same minute.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1415026 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 28 Nov 2012 16:34:25 +0000 (16:34 +0000)]
Some backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1414798 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 28 Nov 2012 16:33:18 +0000 (16:33 +0000)]
Merge r1374874 from trunk:
WinNT MPM: Fix thread-safety issue in worker_main(). All
workers were allocating from pchild without holding '
child_lock. Allocate from ptrans instead.
Related to: PR 52196
The reporter suggests that the apr_thread_t for r->connection->current_thread
should have a unique pool. This revision handles that for WinNT MPM,
but not for other MPMs.
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1414796 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Tue, 27 Nov 2012 21:48:12 +0000 (21:48 +0000)]
Zombie translations must die now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1414411 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 27 Nov 2012 21:34:37 +0000 (21:34 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1414405 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Tue, 27 Nov 2012 10:30:25 +0000 (10:30 +0000)]
merge r1414094
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1414098 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 25 Nov 2012 20:52:23 +0000 (20:52 +0000)]
Adding .fr translation for a number of program documentations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1413413 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 24 Nov 2012 13:40:08 +0000 (13:40 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1413185 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Fri, 23 Nov 2012 18:56:05 +0000 (18:56 +0000)]
Adding .fr translation for some support program documentation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1413029 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Fri, 23 Nov 2012 17:45:29 +0000 (17:45 +0000)]
Adding two documents translated to french
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1413000 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 20 Nov 2012 02:06:55 +0000 (02:06 +0000)]
Update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1411511 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 20 Nov 2012 02:05:12 +0000 (02:05 +0000)]
Ensure that mod_ssl is loaded in the SSL example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1411510 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 19 Nov 2012 21:36:19 +0000 (21:36 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1411431 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 19 Nov 2012 20:02:52 +0000 (20:02 +0000)]
vote, propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1411379 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 18 Nov 2012 18:09:35 +0000 (18:09 +0000)]
propose r1408958 (+ style issue) backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1410947 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 18 Nov 2012 14:43:04 +0000 (14:43 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1410894 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 18 Nov 2012 13:19:00 +0000 (13:19 +0000)]
bump minor
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1410884 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 18 Nov 2012 07:47:35 +0000 (07:47 +0000)]
Typo in comment (r1407526 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1410848 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 18 Nov 2012 07:41:57 +0000 (07:41 +0000)]
Typo in comment (r1374856 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1410846 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 18 Nov 2012 07:17:09 +0000 (07:17 +0000)]
Backport proposal for small things to keep 2.4.x in line with trunk as much as possible.
Cumulative patch available and tested.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1410842 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 17 Nov 2012 03:03:33 +0000 (03:03 +0000)]
add rewritebase proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1410683 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 17 Nov 2012 02:41:42 +0000 (02:41 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1410678 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 17 Nov 2012 02:40:25 +0000 (02:40 +0000)]
Remove a silly paragraph that recommends doing something stupid.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1410676 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 17 Nov 2012 02:20:43 +0000 (02:20 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1410670 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 15 Nov 2012 19:02:47 +0000 (19:02 +0000)]
Found a couple more trunk fixes that were "forgotten" to
be backported...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1409931 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 15 Nov 2012 18:49:17 +0000 (18:49 +0000)]
* core: Add in ap_get_sload() and ap_get_loadavg().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1409924 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 15 Nov 2012 18:38:51 +0000 (18:38 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1409916 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 15 Nov 2012 13:50:36 +0000 (13:50 +0000)]
Pushed one (sorry for that screwup, all LDAP-on-Windows users), add one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1409779 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 15 Nov 2012 13:47:46 +0000 (13:47 +0000)]
Merge
1408402 from trunk:
followup to r1348036, MSSDK's WinLdap.h uses an enum for LDAP_* status codes, so the block is not included
Submitted by: covener
Reviewed by: covener, trawick, igalic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1409773 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Wed, 14 Nov 2012 16:29:17 +0000 (16:29 +0000)]
easy votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1409247 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 13 Nov 2012 14:21:34 +0000 (14:21 +0000)]
Merge r1399708 from trunk:
only write the first len chars to syslog, as the buffer may have additional
text added speculatively
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408743 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 13 Nov 2012 14:20:20 +0000 (14:20 +0000)]
Merge r1397172 from trunk:
"Iterate" directives: Report an error if no arguments are provided.
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408742 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 12 Nov 2012 22:07:00 +0000 (22:07 +0000)]
Vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408471 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 12 Nov 2012 20:01:25 +0000 (20:01 +0000)]
+1 for MS SDK fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408430 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 12 Nov 2012 18:59:20 +0000 (18:59 +0000)]
propose LDAP_UNAVAILABLE windows fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408407 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Nov 2012 14:19:00 +0000 (14:19 +0000)]
Merge r1407965 from trunk:
Replace an incorrect #if by the correct corresponding #if defined(...)
PR 54133 reported by Teodor Milkov ()
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408296 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Nov 2012 14:18:07 +0000 (14:18 +0000)]
Promote and vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408295 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Nov 2012 13:48:46 +0000 (13:48 +0000)]
backport vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408285 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 12 Nov 2012 12:03:06 +0000 (12:03 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408259 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 12 Nov 2012 11:45:34 +0000 (11:45 +0000)]
easy vote + editorial tweaks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408255 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 11 Nov 2012 19:41:14 +0000 (19:41 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408099 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 11 Nov 2012 19:37:54 +0000 (19:37 +0000)]
Merge r1408093:
Remove SSLv2 stuff that is no longer supported. Add a few newer algorithms
and cipher aliases. This is incomplete, but the openssl 1.0.1c man pages
don't have the complete list either :-(
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408096 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 11 Nov 2012 18:35:48 +0000 (18:35 +0000)]
Correct address of trunk patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408077 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 11 Nov 2012 18:31:50 +0000 (18:31 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408074 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 9 Nov 2012 14:10:45 +0000 (14:10 +0000)]
update list of DefaultRuntimeDir revisions in trunk that need
adjusting for 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1407463 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 8 Nov 2012 03:05:38 +0000 (03:05 +0000)]
s/Options/AllowOverride/ in comment describing AllowOverride
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1406904 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 7 Nov 2012 14:14:32 +0000 (14:14 +0000)]
from trunk r1406646: user-defined needs the hyphen
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1406650 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 7 Nov 2012 13:29:14 +0000 (13:29 +0000)]
from trunk r1406616: comment spelling fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1406618 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 5 Nov 2012 15:42:10 +0000 (15:42 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1405844 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 4 Nov 2012 15:20:20 +0000 (15:20 +0000)]
Another proposal...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1405555 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 4 Nov 2012 15:12:22 +0000 (15:12 +0000)]
More backport proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1405554 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 1 Nov 2012 16:29:03 +0000 (16:29 +0000)]
Just placeholders
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1404661 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 29 Oct 2012 20:43:48 +0000 (20:43 +0000)]
Merge
1403492 :
fix cut'n'paste error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403493 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 29 Oct 2012 20:40:48 +0000 (20:40 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403488 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 29 Oct 2012 20:39:05 +0000 (20:39 +0000)]
Backport r1403476:
Mention string-valued expression in the BNF.
Clarify when header names are added to the Vary header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403486 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Mon, 29 Oct 2012 16:54:25 +0000 (16:54 +0000)]
Adding .fr translation for rewritemap doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403422 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 28 Oct 2012 17:46:03 +0000 (17:46 +0000)]
Adding .fr translation for rewrite's remapping doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403053 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Sun, 28 Oct 2012 17:14:54 +0000 (17:14 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403045 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Sun, 28 Oct 2012 17:09:41 +0000 (17:09 +0000)]
r1403041
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403042 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 28 Oct 2012 17:05:34 +0000 (17:05 +0000)]
Adding .fr translation for rewrite's proxying doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403040 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 28 Oct 2012 15:56:24 +0000 (15:56 +0000)]
Adding .fr translation for socache documentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403025 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 27 Oct 2012 20:44:39 +0000 (20:44 +0000)]
Update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1402865 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 17:16:04 +0000 (17:16 +0000)]
Merge r1400700 from trunk:
Change default for SSLCompression to off, as compression
causes security issues in most setups
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400962 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 17:14:38 +0000 (17:14 +0000)]
Merge r1399413 from trunk:
Export mod_xml2enc.h so that others can use the module.
Submitted by: minfrin
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400961 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 17:14:03 +0000 (17:14 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400960 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 17:13:15 +0000 (17:13 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400959 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 16:56:49 +0000 (16:56 +0000)]
note docco avail
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400953 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 16:56:02 +0000 (16:56 +0000)]
mis-merge
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400952 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 16:54:46 +0000 (16:54 +0000)]
Merge r1387085 from trunk:
Use our private function and just allow for conditonal
concat of .persist suffix
Reviewed/backported by: jim
Merge r1386726 from trunk:
Add debug output when slotmem is persisting shm
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400951 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 16:46:42 +0000 (16:46 +0000)]
Committed revision
1400946
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400947 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 16:46:24 +0000 (16:46 +0000)]
Merge r1395225 from trunk:
Allow forced setting of TLS1.1 and TLS1.2 protocols with
the -f command-line switch, and adapt the output to more accurately
report what SSL/TLS protocol was negotiated (use SSL_get_version()
instead of SSL_CIPHER_get_version()).
PR: 53916
Submitted by: Nicolás Pernas Maradei <nico emutex com>
Reviewed/amended by: Kaspar Brand
Submitted by: kbrand
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400946 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 16:45:29 +0000 (16:45 +0000)]
Merge r1370763 from trunk:
mod_slotmem_plain: make the "filename" key relative to
DefaultRuntimeDir if not absolute
mod_slotmem_plain does not externalize or check the full path
in any way, so this change is just for consistency with other
modules which build paths to run-time artifacts.
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400945 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Mon, 22 Oct 2012 05:56:07 +0000 (05:56 +0000)]
Adding documentation patch link for 'FallbackResource disabled' backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400768 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 22 Oct 2012 00:08:46 +0000 (00:08 +0000)]
easy vote / comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400742 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 21 Oct 2012 19:23:38 +0000 (19:23 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400705 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Oct 2012 14:44:05 +0000 (14:44 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400461 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 19 Oct 2012 12:35:43 +0000 (12:35 +0000)]
promote, propose, etc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400072 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 18 Oct 2012 22:41:37 +0000 (22:41 +0000)]
Typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1399900 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 17 Oct 2012 20:22:38 +0000 (20:22 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1399415 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 16 Oct 2012 01:04:03 +0000 (01:04 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1398594 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Mon, 15 Oct 2012 17:13:13 +0000 (17:13 +0000)]
Voting for my own proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1398391 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 14 Oct 2012 13:02:03 +0000 (13:02 +0000)]
Suggest FallbackResource 'disabled' patch into 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1398074 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 14 Oct 2012 12:45:41 +0000 (12:45 +0000)]
Reverting commits r1398064 (src) and r1398065 (doc) as the approval process was not applied.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1398071 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 14 Oct 2012 12:18:41 +0000 (12:18 +0000)]
Documenting the new 'disabled' argument accepted by FallbackResource
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1398065 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 14 Oct 2012 12:06:10 +0000 (12:06 +0000)]
Adding support for the 'disabled' keyword to FallbackResource
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1398064 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Oct 2012 14:26:51 +0000 (14:26 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1397837 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log