]> granicus.if.org Git - apache/log
apache
10 years agoupdate transformation
André Malo [Mon, 3 Feb 2014 10:15:41 +0000 (10:15 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563821 13f79535-47bb-0310-9956-ffa450edef68

10 years agoupdate a few German translations
André Malo [Mon, 3 Feb 2014 10:02:14 +0000 (10:02 +0000)]
update a few German translations

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563813 13f79535-47bb-0310-9956-ffa450edef68

10 years agoupdate transformation
André Malo [Mon, 3 Feb 2014 09:28:33 +0000 (09:28 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563810 13f79535-47bb-0310-9956-ffa450edef68

10 years agosvn:eol-style = native
André Malo [Mon, 3 Feb 2014 09:12:55 +0000 (09:12 +0000)]
svn:eol-style = native

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563809 13f79535-47bb-0310-9956-ffa450edef68

10 years agoport style changes from trunk
André Malo [Mon, 3 Feb 2014 09:09:07 +0000 (09:09 +0000)]
port style changes from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563808 13f79535-47bb-0310-9956-ffa450edef68

10 years agobuild bootstrap with new xalan
André Malo [Mon, 3 Feb 2014 09:03:55 +0000 (09:03 +0000)]
build bootstrap with new xalan

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563805 13f79535-47bb-0310-9956-ffa450edef68

10 years agoupdate transformation
André Malo [Mon, 3 Feb 2014 09:01:45 +0000 (09:01 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563804 13f79535-47bb-0310-9956-ffa450edef68

10 years agoprepare for upcoming xalan update
André Malo [Sun, 2 Feb 2014 19:53:57 +0000 (19:53 +0000)]
prepare for upcoming xalan update

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563698 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUpdates.
Lucien Gentis [Sun, 2 Feb 2014 15:34:36 +0000 (15:34 +0000)]
Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563637 13f79535-47bb-0310-9956-ffa450edef68

10 years agomsdn url change.
André Malo [Sun, 2 Feb 2014 14:52:55 +0000 (14:52 +0000)]
msdn url change.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563630 13f79535-47bb-0310-9956-ffa450edef68

10 years agobuild bootstrap
André Malo [Sat, 1 Feb 2014 22:32:39 +0000 (22:32 +0000)]
build bootstrap

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563498 13f79535-47bb-0310-9956-ffa450edef68

10 years agoport retirement styles from trunk
André Malo [Sat, 1 Feb 2014 22:31:33 +0000 (22:31 +0000)]
port retirement styles from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563497 13f79535-47bb-0310-9956-ffa450edef68

10 years agoDrop stalled RFC 5878 backport proposals (reverted in trunk with r1468131),
Kaspar Brand [Sat, 1 Feb 2014 15:03:52 +0000 (15:03 +0000)]
Drop stalled RFC 5878 backport proposals (reverted in trunk with r1468131),
as they have been obsoleted through "SSLOpenSSLConfCmd ServerInfoFile"
meanwhile (r1555683, and CT is no longer using SSL_CTX_use_authz_file either).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563425 13f79535-47bb-0310-9956-ffa450edef68

10 years agoadd followup fix to certkeyfile proposal (and reset jorton's vote)
Kaspar Brand [Sat, 1 Feb 2014 14:15:22 +0000 (14:15 +0000)]
add followup fix to certkeyfile proposal (and reset jorton's vote)

add auto-ECDHE curve selection backport proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563421 13f79535-47bb-0310-9956-ffa450edef68

10 years agopropose mod_rewrite fix
Eric Covener [Sat, 1 Feb 2014 14:04:00 +0000 (14:04 +0000)]
propose mod_rewrite fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1563419 13f79535-47bb-0310-9956-ffa450edef68

10 years agokbrand++
Joe Orton [Wed, 29 Jan 2014 22:23:28 +0000 (22:23 +0000)]
kbrand++

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562611 13f79535-47bb-0310-9956-ffa450edef68

10 years agopropose SSLCertificate[Key]File/SSLCertificateChainFile overhaul for mod_ssl
Kaspar Brand [Wed, 29 Jan 2014 16:24:43 +0000 (16:24 +0000)]
propose SSLCertificate[Key]File/SSLCertificateChainFile overhaul for mod_ssl

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562500 13f79535-47bb-0310-9956-ffa450edef68

10 years agovote
Eric Covener [Wed, 29 Jan 2014 16:19:53 +0000 (16:19 +0000)]
vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562496 13f79535-47bb-0310-9956-ffa450edef68

10 years agoupdate transformation
André Malo [Wed, 29 Jan 2014 16:06:09 +0000 (16:06 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562489 13f79535-47bb-0310-9956-ffa450edef68

10 years agofix broken references
André Malo [Wed, 29 Jan 2014 15:59:54 +0000 (15:59 +0000)]
fix broken references

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562488 13f79535-47bb-0310-9956-ffa450edef68

10 years agopropose a WinNT fix
Jeff Trawick [Wed, 29 Jan 2014 15:46:56 +0000 (15:46 +0000)]
propose a WinNT fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562485 13f79535-47bb-0310-9956-ffa450edef68

10 years agobackport debugging
Jim Jagielski [Wed, 29 Jan 2014 15:14:29 +0000 (15:14 +0000)]
backport debugging

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562474 13f79535-47bb-0310-9956-ffa450edef68

10 years agoupdate transformation
André Malo [Wed, 29 Jan 2014 13:33:12 +0000 (13:33 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562439 13f79535-47bb-0310-9956-ffa450edef68

10 years ago- apply various table and formatting fixes, which halted the pdflatex run
André Malo [Wed, 29 Jan 2014 13:28:10 +0000 (13:28 +0000)]
- apply various table and formatting fixes, which halted the pdflatex run
- also add mod_filter_old.png (converted from .gif), required for inclusion in
  latex

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562436 13f79535-47bb-0310-9956-ffa450edef68

10 years agoupdate transformation
André Malo [Wed, 29 Jan 2014 11:28:50 +0000 (11:28 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562415 13f79535-47bb-0310-9956-ffa450edef68

10 years agoapply style updates from trunk.
André Malo [Wed, 29 Jan 2014 11:24:40 +0000 (11:24 +0000)]
apply style updates from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562412 13f79535-47bb-0310-9956-ffa450edef68

10 years agosvn:eol-style = native
André Malo [Wed, 29 Jan 2014 11:21:52 +0000 (11:21 +0000)]
svn:eol-style = native

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562410 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1556206 from trunk:
Jim Jagielski [Tue, 28 Jan 2014 19:40:17 +0000 (19:40 +0000)]
Merge r1556206 from trunk:

avoid a tight busy loop with memory allocations when the [N] flag
isn't making progress.

If backported, probably increase the hard-coded limit to 32k from 10k.

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562174 13f79535-47bb-0310-9956-ffa450edef68

10 years ago(forgotten promotion)
Jeff Trawick [Tue, 28 Jan 2014 18:49:23 +0000 (18:49 +0000)]
(forgotten promotion)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562152 13f79535-47bb-0310-9956-ffa450edef68

10 years agothanks!
Jeff Trawick [Tue, 28 Jan 2014 18:39:44 +0000 (18:39 +0000)]
thanks!

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562145 13f79535-47bb-0310-9956-ffa450edef68

10 years agobump patch to 32k rounds, leave jim's vote since it only got more conservative.
Eric Covener [Tue, 28 Jan 2014 18:20:38 +0000 (18:20 +0000)]
bump patch to 32k rounds, leave jim's vote since it only got more conservative.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562137 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1557317, r1556911, r1556914, r1555259, r1556912, r1556937, r1559351, r1463046...
Jim Jagielski [Tue, 28 Jan 2014 18:11:59 +0000 (18:11 +0000)]
Merge r1557317, r1556911, r1556914, r1555259, r1556912, r1556937, r1559351, r1463046 from trunk:

Style, indentation. No functional change.

As in 'dav_generic_do_refresh', add missing break in 'dav_fs_do_refresh' to avoid useless computation.

Add missing break in 'dav_generic_do_refresh' to avoid useless computation.

Allocate correct size for the array to avoid useless memory allocation and copy

Add missing break.

Oops (fix r1556912)

No need to test for NULL, apr_pstrndup already handles it.

Remove some useless declarations that were shadowing other local
variables of the same name.

Submitted by: jailletc36, sf
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562134 13f79535-47bb-0310-9956-ffa450edef68

10 years agovote, note, promote
Jeff Trawick [Tue, 28 Jan 2014 17:50:02 +0000 (17:50 +0000)]
vote, note, promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562131 13f79535-47bb-0310-9956-ffa450edef68

10 years agoivote
Jim Jagielski [Tue, 28 Jan 2014 13:14:08 +0000 (13:14 +0000)]
ivote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562060 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRemove proposals.
Christophe Jaillet [Tue, 28 Jan 2014 05:26:20 +0000 (05:26 +0000)]
Remove proposals.

I will propose another patch later in order to be able to control at runtime WANT_BASENAME_MATCH, but without changing the current behaviour.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1561942 13f79535-47bb-0310-9956-ffa450edef68

10 years agoEasy proposals
Christophe Jaillet [Tue, 28 Jan 2014 05:21:34 +0000 (05:21 +0000)]
Easy proposals

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1561941 13f79535-47bb-0310-9956-ffa450edef68

10 years agoivote
Jim Jagielski [Mon, 27 Jan 2014 16:58:42 +0000 (16:58 +0000)]
ivote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1561744 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUDS for rewrite patch backport proposal
Jim Jagielski [Mon, 27 Jan 2014 16:52:38 +0000 (16:52 +0000)]
UDS for rewrite patch backport proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1561743 13f79535-47bb-0310-9956-ffa450edef68

10 years agoremove this whole ftok mess.
Jim Jagielski [Sat, 25 Jan 2014 20:43:36 +0000 (20:43 +0000)]
remove this whole ftok mess.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1561398 13f79535-47bb-0310-9956-ffa450edef68

10 years agopropose mod_rewrite loop-breaking patch, fix some formatting.
Eric Covener [Sat, 25 Jan 2014 18:37:14 +0000 (18:37 +0000)]
propose mod_rewrite loop-breaking patch, fix some formatting.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1561365 13f79535-47bb-0310-9956-ffa450edef68

10 years agothese filter tweaks to mod_lua were committed as part
Eric Covener [Sat, 25 Jan 2014 18:23:11 +0000 (18:23 +0000)]
these filter tweaks to mod_lua were committed as part
of r1523974 in 9/2013, so they were in 2.4.7. retcon them
into the bottom of 2.4.7 CHANGES.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1561358 13f79535-47bb-0310-9956-ffa450edef68

10 years agopropose mod_dir option to step out of the way with another handler is configured
Eric Covener [Sat, 25 Jan 2014 18:08:18 +0000 (18:08 +0000)]
propose mod_dir option to step out of the way with another handler is configured

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1561354 13f79535-47bb-0310-9956-ffa450edef68

10 years agobackported in r1560697
Eric Covener [Sat, 25 Jan 2014 18:01:38 +0000 (18:01 +0000)]
backported in r1560697

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1561351 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUpdates.
Lucien Gentis [Sat, 25 Jan 2014 14:07:38 +0000 (14:07 +0000)]
Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1561316 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1560977 from trunk:
Jim Jagielski [Fri, 24 Jan 2014 13:25:27 +0000 (13:25 +0000)]
Merge r1560977 from trunk:

mod_session: When we have a session we were unable to decode, behave as if there was no session at all.

Submitted by: minfrin
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560991 13f79535-47bb-0310-9956-ffa450edef68

10 years agoipromote
Jim Jagielski [Fri, 24 Jan 2014 13:24:32 +0000 (13:24 +0000)]
ipromote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560990 13f79535-47bb-0310-9956-ffa450edef68

10 years agoivote
Jim Jagielski [Fri, 24 Jan 2014 13:24:05 +0000 (13:24 +0000)]
ivote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560988 13f79535-47bb-0310-9956-ffa450edef68

10 years ago+1
Jeff Trawick [Fri, 24 Jan 2014 13:18:30 +0000 (13:18 +0000)]
+1

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560986 13f79535-47bb-0310-9956-ffa450edef68

10 years agoPropose.
Graham Leggett [Fri, 24 Jan 2014 13:08:37 +0000 (13:08 +0000)]
Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560980 13f79535-47bb-0310-9956-ffa450edef68

10 years agosmall amount of trunk r1560738: point to definitive support info
Jeff Trawick [Thu, 23 Jan 2014 20:38:38 +0000 (20:38 +0000)]
small amount of trunk r1560738: point to definitive support info

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560802 13f79535-47bb-0310-9956-ffa450edef68

10 years agofrom trunk r1560729: remove some broken links, point to better resources
Jeff Trawick [Thu, 23 Jan 2014 16:33:11 +0000 (16:33 +0000)]
from trunk r1560729: remove some broken links, point to better resources

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560730 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1559828 from trunk:
Jim Jagielski [Thu, 23 Jan 2014 14:34:18 +0000 (14:34 +0000)]
Merge r1559828 from trunk:

mod_session: Fix problems interpreting the SessionInclude and
SessionExclude configuration.

PR: 56038
Submitted by: Erik Pearson <erik adaptations.com>
Reviewed by: trawick

Submitted by: trawick
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560698 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1557641, r1559394, r1559398 from trunk:
Jim Jagielski [Thu, 23 Jan 2014 14:33:09 +0000 (14:33 +0000)]
Merge r1557641, r1559394, r1559398 from trunk:

don't search for directory indexes/directoryslashes if a URL is in the
middle of being rewritten [in per-dir context]. PR53929

followups to r1557641 suggested by nd -- add
prefix to both the macro and the handler name
itself.

no make depend in sandbox, fix bld break from r1559394

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560697 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1546692 from trunk:
Jim Jagielski [Thu, 23 Jan 2014 14:31:36 +0000 (14:31 +0000)]
Merge r1546692 from trunk:

Axe dead code: It wouldn't have been needed ever since httpd 2.0.35
was released in April 2002... it was fixed in the [unreleased]
SSLeay 0.9.1b, which was the basis for the initial OpenSSL 0.9.1c
release in December 1998 (specifically, it's this change to ssl_set_pkey():
https://cvs.openssl.org/filediff?f=openssl/ssl/ssl_rsa.c&v1=1.1.1.2&v2=1.1.1.3)

Submitted by: kbrand
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560696 13f79535-47bb-0310-9956-ffa450edef68

10 years agoipromote
Jim Jagielski [Thu, 23 Jan 2014 14:30:44 +0000 (14:30 +0000)]
ipromote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560695 13f79535-47bb-0310-9956-ffa450edef68

10 years agoivote
Jim Jagielski [Thu, 23 Jan 2014 14:30:13 +0000 (14:30 +0000)]
ivote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560694 13f79535-47bb-0310-9956-ffa450edef68

10 years agoVote.
Graham Leggett [Thu, 23 Jan 2014 13:52:34 +0000 (13:52 +0000)]
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560687 13f79535-47bb-0310-9956-ffa450edef68

10 years agoVote.
Graham Leggett [Thu, 23 Jan 2014 13:49:15 +0000 (13:49 +0000)]
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560686 13f79535-47bb-0310-9956-ffa450edef68

10 years agomerge r1560679 from trunk:
Jeff Trawick [Thu, 23 Jan 2014 13:22:08 +0000 (13:22 +0000)]
merge r1560679 from trunk:

httpd allocates separate AF_INET/AF_INET6 sockets automatically
when v4-mapped addresses are disabled

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560680 13f79535-47bb-0310-9956-ffa450edef68

10 years agopropose
Jeff Trawick [Tue, 21 Jan 2014 22:22:15 +0000 (22:22 +0000)]
propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560211 13f79535-47bb-0310-9956-ffa450edef68

10 years ago+1!
Jeff Trawick [Tue, 21 Jan 2014 20:25:15 +0000 (20:25 +0000)]
+1!

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560171 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUpdated patch
Jim Jagielski [Tue, 21 Jan 2014 20:01:56 +0000 (20:01 +0000)]
Updated patch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560162 13f79535-47bb-0310-9956-ffa450edef68

10 years agoxforms
Jim Jagielski [Tue, 21 Jan 2014 16:59:44 +0000 (16:59 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560097 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1518269 from trunk:
Jim Jagielski [Tue, 21 Jan 2014 16:55:04 +0000 (16:55 +0000)]
Merge r1518269 from trunk:

Expires in a 304 is not a contradiction in terms of r1487118:

     - Expires, Cache-Control, and/or Vary, if the field-value might
        differ from that sent in any previous response for the same
        variant

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560093 13f79535-47bb-0310-9956-ffa450edef68

10 years agoipromote2
Daniel Gruno [Tue, 21 Jan 2014 16:50:14 +0000 (16:50 +0000)]
ipromote2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560087 13f79535-47bb-0310-9956-ffa450edef68

10 years agocomment
Jim Jagielski [Tue, 21 Jan 2014 16:46:02 +0000 (16:46 +0000)]
comment

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560085 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1534890 from trunk:
Jim Jagielski [Tue, 21 Jan 2014 16:45:27 +0000 (16:45 +0000)]
Merge r1534890 from trunk:

axe attempt to close a previously-closed apr socket
(clang scan-build says "uninitialized", but it doesn't know
how apr_sockaddr_info_get() reports errors)

Submitted by: trawick
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560084 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1558483 from trunk:
Jim Jagielski [Tue, 21 Jan 2014 16:45:04 +0000 (16:45 +0000)]
Merge r1558483 from trunk:

follow-up to r1554161, r1554168, r1554170, r1554175, r1554188, and r1554195:

axe unnecessary initialization/pool allocation

Submitted by: trawick
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560083 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1544774, r1544812 from trunk:
Jim Jagielski [Tue, 21 Jan 2014 16:44:48 +0000 (16:44 +0000)]
Merge r1544774, r1544812 from trunk:

Address a todo listed in
https://mail-archives.apache.org/mod_mbox/httpd-dev/200205.mbox/%3CPine.LNX.4.33.0205292300380.27841-100000%40mako.covalent.net%3E
"init functions should return status code rather than ssl_die()"

For diagnostic purposes, ssl_die() is still there, but instead
of abruptly exit(1)ing, it will return APR_EGENERAL to the
ssl_init_* callers in ssl_engine_init.c, and these will propagate
the status back to ssl_init_Module.

Followup to r1544774: do not ignore failures from ssl_server_import_{cert,key}
in ssl_init_server_certs

Submitted by: kbrand
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560082 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1451633, r1451905, r1451921, r1452259, r1453981, r1501913, r1513508, r1531340...
Jim Jagielski [Tue, 21 Jan 2014 16:44:04 +0000 (16:44 +0000)]
Merge r1451633, r1451905, r1451921, r1452259, r1453981, r1501913, r1513508, r1531340, r1531370, r1531962, r1533065, r1540052 from trunk:

Add in rough uds support (Bugx 54101) from Blaise Tarr <blaise.tarr@gmail.com>

Make AF_UNIX aware... fix Windows/Netware??

Follow-up to r1451905 to fix NetWare/Windows compilation.

apr trunk-able

message tag for dom sock

Note about new UDS support

UDS subsequent request on a connection fix

Reformat the UDS support inline with a new naming structure.
Use a flag for speed for testing.

syntax sugar... if the worker is associated w/ a UDS,
then make sure the log reporting has a visual clue.

Ensure that userland format of UDS is the same as how it is
configured, no matter how we store and use it internally.

Eclipse code analysis warning

UDS urls need to be desockified when configuring...
Submitted by: jim, fuankg, jim, jim, druggeri, druggeri, jim, jim, jim, jim, jim
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560081 13f79535-47bb-0310-9956-ffa450edef68

10 years agoipromote
Jim Jagielski [Tue, 21 Jan 2014 16:39:31 +0000 (16:39 +0000)]
ipromote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560079 13f79535-47bb-0310-9956-ffa450edef68

10 years agoivote
Jim Jagielski [Tue, 21 Jan 2014 16:38:51 +0000 (16:38 +0000)]
ivote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560078 13f79535-47bb-0310-9956-ffa450edef68

10 years agoVote + Promote
Daniel Gruno [Tue, 21 Jan 2014 16:03:01 +0000 (16:03 +0000)]
Vote + Promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560052 13f79535-47bb-0310-9956-ffa450edef68

10 years agovote, propose
Jeff Trawick [Mon, 20 Jan 2014 21:05:16 +0000 (21:05 +0000)]
vote, propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1559829 13f79535-47bb-0310-9956-ffa450edef68

10 years agoupdate transformation
André Malo [Mon, 20 Jan 2014 09:02:57 +0000 (09:02 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1559650 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1517406 from trunk:
Eric Covener [Mon, 20 Jan 2014 00:31:19 +0000 (00:31 +0000)]
Merge r1517406 from trunk:

PR55352: mention in the <Proxy> manual that the matching is a prefix only, not
the same context-root / segment-aware matching done by <Location>.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1559612 13f79535-47bb-0310-9956-ffa450edef68

10 years agotry to grok mod_speling
Eric Covener [Sat, 18 Jan 2014 20:40:17 +0000 (20:40 +0000)]
try to grok mod_speling

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1559411 13f79535-47bb-0310-9956-ffa450edef68

10 years agoexplain the change, not the bug
Eric Covener [Sat, 18 Jan 2014 20:24:48 +0000 (20:24 +0000)]
explain the change, not the bug

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1559410 13f79535-47bb-0310-9956-ffa450edef68

10 years agopropose a fix for the mod_dir vs mod_rewrite issues
Eric Covener [Sat, 18 Jan 2014 19:46:05 +0000 (19:46 +0000)]
propose a fix for the mod_dir vs mod_rewrite issues

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1559404 13f79535-47bb-0310-9956-ffa450edef68

10 years agocherrypick some easy votes
Eric Covener [Sat, 18 Jan 2014 19:07:33 +0000 (19:07 +0000)]
cherrypick some easy votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1559393 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUpdates.
Lucien Gentis [Sat, 18 Jan 2014 15:32:27 +0000 (15:32 +0000)]
Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1559355 13f79535-47bb-0310-9956-ffa450edef68

10 years agoaxe my comment on the prefork fix (note just added to the old
Jeff Trawick [Wed, 15 Jan 2014 19:35:07 +0000 (19:35 +0000)]
axe my comment on the prefork fix (note just added to the old
"2.4.4 graceful restart taking long time [PATCH]" thread

fix some missing +1s on proposals from me

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1558543 13f79535-47bb-0310-9956-ffa450edef68

10 years agovote, propose
Jeff Trawick [Wed, 15 Jan 2014 18:41:04 +0000 (18:41 +0000)]
vote, propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1558502 13f79535-47bb-0310-9956-ffa450edef68

10 years agopropose ssl_die improvement for config (re)init
Kaspar Brand [Wed, 15 Jan 2014 16:46:02 +0000 (16:46 +0000)]
propose ssl_die improvement for config (re)init

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1558461 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1557617:
Stefan Fritsch [Sun, 12 Jan 2014 22:08:00 +0000 (22:08 +0000)]
Merge r1557617:

make reference to <If > a link

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1557618 13f79535-47bb-0310-9956-ffa450edef68

10 years ago2 proposals against mod_speling
Christophe Jaillet [Sun, 12 Jan 2014 18:45:54 +0000 (18:45 +0000)]
2 proposals against mod_speling

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1557590 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUpdates.
Lucien Gentis [Sun, 12 Jan 2014 13:55:52 +0000 (13:55 +0000)]
Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1557533 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1554995 from trunk:
Jim Jagielski [Thu, 9 Jan 2014 14:32:47 +0000 (14:32 +0000)]
Merge r1554995 from trunk:

Providers defined in <AuthnProviderAlias have not been usable under
in virtual hosts since migrating from mod_authn_alias to mod_authn_core.
PR 55622.

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1556818 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1556428 from trunk:
Jim Jagielski [Thu, 9 Jan 2014 14:29:47 +0000 (14:29 +0000)]
Merge r1556428 from trunk:

SECURITY: CVE-2013-6438 (cve.mitre.org)
mod_dav: Keep track of length of cdata properly when removing leading spaces.

* modules/dav/main/util.c
  (dav_xml_get_cdata): reduce len variable when increasing cdata pointer.

Submitted by: Amin Tora <Amin.Tora neustar.biz>

Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1556816 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1524368, r1524388 from trunk:
Jim Jagielski [Thu, 9 Jan 2014 14:28:39 +0000 (14:28 +0000)]
Merge r1524368, r1524388 from trunk:

Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.

Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.

Document r1524368 in CHANGES.

Submitted by: jkaluza
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1556815 13f79535-47bb-0310-9956-ffa450edef68

10 years agocomment
Jim Jagielski [Thu, 9 Jan 2014 14:25:50 +0000 (14:25 +0000)]
comment

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1556813 13f79535-47bb-0310-9956-ffa450edef68

10 years agoconfused?
Jeff Trawick [Wed, 8 Jan 2014 19:24:59 +0000 (19:24 +0000)]
confused?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1556612 13f79535-47bb-0310-9956-ffa450edef68

10 years agovote/promote
Eric Covener [Wed, 8 Jan 2014 17:51:31 +0000 (17:51 +0000)]
vote/promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1556587 13f79535-47bb-0310-9956-ffa450edef68

10 years agovote/note/promote/etc.
Jeff Trawick [Wed, 8 Jan 2014 13:09:47 +0000 (13:09 +0000)]
vote/note/promote/etc.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1556524 13f79535-47bb-0310-9956-ffa450edef68

10 years ago* STATUS: Nominate r1556428 for backport to 2.4.x
Ben Reser [Wed, 8 Jan 2014 03:03:23 +0000 (03:03 +0000)]
* STATUS: Nominate r1556428 for backport to 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1556430 13f79535-47bb-0310-9956-ffa450edef68

10 years agoBackport r1544784 from trunk:
Kaspar Brand [Tue, 7 Jan 2014 17:52:34 +0000 (17:52 +0000)]
Backport r1544784 from trunk:

Remove SSLPKCS7CertificateFile support:

- was never documented, so very unlikely that it was ever used

- adds complexity without apparent benefit; PKCS#7 files can
  be trivially converted to a file for use with SSLCertificateChainFile
  (concatenated X509 CERTIFICATE chunks, openssl pkcs7 -print_certs...)

- only supports PKCS7 files with PEM encoding, i.e. relies on a
  non-standardized PEM header (cf. RFC 2315 and draft-josefsson-pkix-textual)

- issues pointed out in http://mail-archives.apache.org/mod_mbox/httpd-dev/200607.mbox/%3C20060723093125.GA19423@redhat.com%3E
  were never fully addressed (cf. r424707 and r424735)

- has never worked in vhost context due to a cfgMergeString
  call missing from modssl_ctx_cfg_merge

Proposed by: kbrand
Reviewed by: covener, druggeri

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1556290 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1556102 from trunk:
Eric Covener [Tue, 7 Jan 2014 01:56:52 +0000 (01:56 +0000)]
Merge r1556102 from trunk:

add some information about setenvif vs. subrequests for PR55957

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1556104 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFix a few typo in doc that have only been corrected on trunk
Christophe Jaillet [Mon, 6 Jan 2014 19:52:28 +0000 (19:52 +0000)]
Fix a few typo in doc  that have only been corrected on trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1555999 13f79535-47bb-0310-9956-ffa450edef68

10 years agoeasy votes
Daniel Ruggeri [Mon, 6 Jan 2014 18:17:15 +0000 (18:17 +0000)]
easy votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1555958 13f79535-47bb-0310-9956-ffa450edef68

10 years agoevent fdq fix proposal.
Jim Jagielski [Mon, 6 Jan 2014 17:04:32 +0000 (17:04 +0000)]
event fdq fix proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1555920 13f79535-47bb-0310-9956-ffa450edef68