]> granicus.if.org Git - apache/log
apache
10 years agovote/promote remote_ip
Eric Covener [Sat, 15 Feb 2014 17:48:21 +0000 (17:48 +0000)]
vote/promote remote_ip

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

10 years agoUpdates.
Lucien Gentis [Sat, 15 Feb 2014 13:19:43 +0000 (13:19 +0000)]
Updates.

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

10 years agoRebuild
Rich Bowen [Thu, 13 Feb 2014 16:11:53 +0000 (16:11 +0000)]
Rebuild

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

10 years agoRebuild mod_deflate docs. (Remove Netscape 4 advice.)
Rich Bowen [Thu, 13 Feb 2014 16:10:50 +0000 (16:10 +0000)]
Rebuild mod_deflate docs. (Remove Netscape 4 advice.)

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

10 years agoRemove configurations referring to browsers from the dim and distant past.
Rich Bowen [Thu, 13 Feb 2014 15:47:21 +0000 (15:47 +0000)]
Remove configurations referring to browsers from the dim and distant past.

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

10 years agoMerge r1567221 from trunk:
Eric Covener [Tue, 11 Feb 2014 19:35:52 +0000 (19:35 +0000)]
Merge r1567221 from trunk:

mod_lua: Fix r:setcookie() to add, rather than replace,
the Set-Cookie header. PR56105

Submitted By: Kevin J Walters <kjw ms com>, Edward Lu <Chaosed0 gmail com>
Committed By: covener

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

10 years agoupdate transformation
André Malo [Tue, 11 Feb 2014 08:01:41 +0000 (08:01 +0000)]
update transformation

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

10 years agovote + easy proposal
Christophe Jaillet [Mon, 10 Feb 2014 20:45:25 +0000 (20:45 +0000)]
vote +  easy proposal

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

10 years agosome votes
Jim Jagielski [Mon, 10 Feb 2014 18:56:17 +0000 (18:56 +0000)]
some votes

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

10 years agoMerge r1563418 from trunk:
Jim Jagielski [Mon, 10 Feb 2014 18:54:23 +0000 (18:54 +0000)]
Merge r1563418 from trunk:

Add %{CONN_REMOTE_ADDR} to mod_rewrite. PR56094

Submitted By: Edward Lu <Chaosed0 gmail com>
Committed By: covener

Submitted by: covener
Reviewed/backported by: jim

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

10 years agoUpdates.
Lucien Gentis [Sat, 8 Feb 2014 15:19:06 +0000 (15:19 +0000)]
Updates.

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

10 years agoVote.
Stephen Henson [Sat, 8 Feb 2014 14:50:05 +0000 (14:50 +0000)]
Vote.

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

10 years agopromote mod_rewrite fix
Mike Rumph [Sat, 8 Feb 2014 14:36:27 +0000 (14:36 +0000)]
promote mod_rewrite fix

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

10 years agoUpdates.
Lucien Gentis [Fri, 7 Feb 2014 17:41:32 +0000 (17:41 +0000)]
Updates.

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

10 years agoupdate transformation
André Malo [Thu, 6 Feb 2014 16:54:51 +0000 (16:54 +0000)]
update transformation

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

10 years agoupdate German translation
André Malo [Thu, 6 Feb 2014 16:51:54 +0000 (16:51 +0000)]
update German translation

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

10 years agoupdate transformation
André Malo [Thu, 6 Feb 2014 16:47:40 +0000 (16:47 +0000)]
update transformation

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

10 years agoadd example containers
André Malo [Thu, 6 Feb 2014 16:45:29 +0000 (16:45 +0000)]
add example containers

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

10 years agoupdate transformation
André Malo [Thu, 6 Feb 2014 11:39:53 +0000 (11:39 +0000)]
update transformation

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

10 years agoport style and dtd changes from trunk
André Malo [Thu, 6 Feb 2014 11:28:55 +0000 (11:28 +0000)]
port style and dtd changes from trunk

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

10 years agoupdate certkeyfile proposal with SSL_CTX_set_current_cert stapling init loop
Kaspar Brand [Thu, 6 Feb 2014 05:34:08 +0000 (05:34 +0000)]
update certkeyfile proposal with SSL_CTX_set_current_cert stapling init loop

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

10 years agoVote for mod_rewrite fix.
Mike Rumph [Wed, 5 Feb 2014 21:49:10 +0000 (21:49 +0000)]
Vote for mod_rewrite fix.

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

10 years agoCorrect the PR # in proposal.
Mike Rumph [Wed, 5 Feb 2014 18:00:55 +0000 (18:00 +0000)]
Correct the PR # in proposal.

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

10 years agorename zh-cn html files and update transformation
André Malo [Wed, 5 Feb 2014 15:38:24 +0000 (15:38 +0000)]
rename zh-cn html files and update transformation

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

10 years agobuild bootstrap
André Malo [Wed, 5 Feb 2014 15:33:58 +0000 (15:33 +0000)]
build bootstrap

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

10 years agoadd utf8 extension to zh-cn html files
André Malo [Wed, 5 Feb 2014 15:33:24 +0000 (15:33 +0000)]
add utf8 extension to zh-cn html files

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

10 years agofix tr docs charset
André Malo [Wed, 5 Feb 2014 13:35:16 +0000 (13:35 +0000)]
fix tr docs charset

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

10 years agopropose, tidy up
Jeff Trawick [Wed, 5 Feb 2014 13:07:24 +0000 (13:07 +0000)]
propose, tidy up

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

10 years agoBackport r1564727: Fix support for uploading files by using pushlstring instead of...
Daniel Gruno [Wed, 5 Feb 2014 12:13:11 +0000 (12:13 +0000)]
Backport r1564727: Fix support for uploading files by using pushlstring instead of pushstring when pushing binary data.

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

10 years agopropose mod_remoteip fix
Mike Rumph [Tue, 4 Feb 2014 21:01:47 +0000 (21:01 +0000)]
propose mod_remoteip fix

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

10 years agoupdate transformation
André Malo [Tue, 4 Feb 2014 20:07:41 +0000 (20:07 +0000)]
update transformation

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

10 years agoupdate German translation
André Malo [Tue, 4 Feb 2014 20:06:50 +0000 (20:06 +0000)]
update German translation

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

10 years agoMerge r1523387 from trunk:
Jim Jagielski [Tue, 4 Feb 2014 14:22:18 +0000 (14:22 +0000)]
Merge r1523387 from trunk:

In 2.4, the MPM leaves a copy of the non-disconnected FD sitting in
context->accept_socket. This FD will be closed a second time, often
shortly after a worker picks it up in this same FD being reused.  The
first recv fails with WSAENOTSOCK since the same FD was closed in the
listener thread while the worker was pulling it off the queue

(The second close is of the underlying FD/socket, not a shared
apr_socket_t, so it's not short-circuited)

This patch makes it a bit more 2.2.x-ish and solves my problem -- the
context->accept_socket gets zapped at the bottom of the loop if
!disconnected.

Submitted by: covener
Reviewed/backported by: jim

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

10 years agoipromote
Jim Jagielski [Tue, 4 Feb 2014 14:20:56 +0000 (14:20 +0000)]
ipromote

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

10 years agoivote
Jim Jagielski [Tue, 4 Feb 2014 14:20:33 +0000 (14:20 +0000)]
ivote

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

10 years agoupdate transformation
André Malo [Mon, 3 Feb 2014 21:42:53 +0000 (21:42 +0000)]
update transformation

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

10 years agofix sitemap c&p error
André Malo [Mon, 3 Feb 2014 21:38:21 +0000 (21:38 +0000)]
fix sitemap c&p error

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

10 years agod'oh. module name fixes.
André Malo [Mon, 3 Feb 2014 21:31:28 +0000 (21:31 +0000)]
d'oh. module name fixes.

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

10 years agopropose mod_remoteip fix
Mike Rumph [Mon, 3 Feb 2014 21:23:21 +0000 (21:23 +0000)]
propose mod_remoteip fix

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

10 years agobuild bootstrap
André Malo [Mon, 3 Feb 2014 21:08:32 +0000 (21:08 +0000)]
build bootstrap

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

10 years agoactivate chm build
André Malo [Mon, 3 Feb 2014 21:07:44 +0000 (21:07 +0000)]
activate chm build

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

10 years agoupdate transformation
André Malo [Mon, 3 Feb 2014 21:02:05 +0000 (21:02 +0000)]
update transformation

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

10 years agourl fixes
André Malo [Mon, 3 Feb 2014 20:58:36 +0000 (20:58 +0000)]
url fixes

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

10 years agoport latex/pdf changes from trunk
André Malo [Mon, 3 Feb 2014 14:17:36 +0000 (14:17 +0000)]
port latex/pdf changes from trunk

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

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