granicus.if.org Git - apache/log

]> granicus.if.org Git - apache/log

Jim Jagielski [Thu, 11 Feb 2016 19:03:54 +0000 (19:03 +0000)]

Merge r1725940 from trunk:

handling TIMEUP on SSL inputs by allowing later retries
Submitted by: icing
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Thu, 11 Feb 2016 19:03:04 +0000 (19:03 +0000)]

Merge r1717816 from trunk:

Fix missing Upgrade headers on OPTION * requests, PR58688
Submitted by: wrowe
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Thu, 11 Feb 2016 19:02:29 +0000 (19:02 +0000)]

Merge r1725325 from trunk:

* Since r1724820 two modules, mod_http2 and mod_ssl, call APACHE_CHECK_OPENSSL,
  with mod_http2 doing it first. Because the result of APACHE_CHECK_OPENSSL
  is cached this causes MOD_LDFLAGS and MOD_CFLAGS to remain unset for mod_ssl
  which in turn causes it not to be linked against Openssl which means that
  mod_ssl cannot be loaded if the Openssl libs haven't been loaded by other means
  already.
  Fix this by caching the values for MOD_LDFLAGS and MOD_CFLAGS created during
  the first run and set them in the cached case.

Submitted by: rpluem
Reviewed/backported by: jim

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

commit | commitdiff | tree

Mike Rumph [Thu, 11 Feb 2016 18:27:42 +0000 (18:27 +0000)]

Vote on mod_remoteip proposal

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

commit | commitdiff | tree

William A. Rowe Jr [Thu, 11 Feb 2016 17:38:24 +0000 (17:38 +0000)]

Finally reviewed in detail, this should be backported to close PR 55962

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

commit | commitdiff | tree

Eric Covener [Thu, 11 Feb 2016 16:42:19 +0000 (16:42 +0000)]

add date from announcement

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

commit | commitdiff | tree

Luca Toscano [Wed, 10 Feb 2016 22:45:27 +0000 (22:45 +0000)]

Documentation rebuild

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

commit | commitdiff | tree

Luca Toscano [Wed, 10 Feb 2016 22:41:08 +0000 (22:41 +0000)]

Improved version of the mod_event's doc page.

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

commit | commitdiff | tree

Rainer Jung [Tue, 9 Feb 2016 23:09:24 +0000 (23:09 +0000)]

Add APLOGNO, first chunk (those that were
detected by coccinelle).

There are some more but they are easier to
backport once these here are applied.

Backport of r1725392, r1725394, r1725395
and r1725468 from trunk.

Submitted by: rjung
Reviewed by: jim, ylavic

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

commit | commitdiff | tree

Yann Ylavic [Tue, 9 Feb 2016 22:14:45 +0000 (22:14 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Eric Covener [Tue, 9 Feb 2016 12:56:24 +0000 (12:56 +0000)]

add catch from Yann, also check in some votes I never committed.

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

commit | commitdiff | tree

Gregg Lewis Smith [Mon, 8 Feb 2016 22:06:21 +0000 (22:06 +0000)]

add h2_filter.c

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

commit | commitdiff | tree

Lucien Gentis [Sun, 7 Feb 2016 16:27:31 +0000 (16:27 +0000)]

Rebuild.

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

commit | commitdiff | tree

Lucien Gentis [Sun, 7 Feb 2016 16:26:46 +0000 (16:26 +0000)]

XML updates.

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

commit | commitdiff | tree

Lucien Gentis [Sat, 6 Feb 2016 17:56:37 +0000 (17:56 +0000)]

Rebuild.

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

commit | commitdiff | tree

Lucien Gentis [Sat, 6 Feb 2016 17:50:08 +0000 (17:50 +0000)]

XML updates.

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

commit | commitdiff | tree

Rainer Jung [Thu, 4 Feb 2016 20:03:59 +0000 (20:03 +0000)]

Remove @jim comment. He has voted again.

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

commit | commitdiff | tree

Jim Jagielski [Thu, 4 Feb 2016 19:26:41 +0000 (19:26 +0000)]

Merge r1726888 from trunk:

Fix some duplicate definitions
Submitted by: mrumph
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Thu, 4 Feb 2016 19:26:00 +0000 (19:26 +0000)]

Merge r1725445 from trunk:

No need to search twice for the same value.
Submitted by: jailletc36
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Thu, 4 Feb 2016 19:25:20 +0000 (19:25 +0000)]

promote

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

commit | commitdiff | tree

Jim Jagielski [Thu, 4 Feb 2016 19:24:39 +0000 (19:24 +0000)]

some votes

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

commit | commitdiff | tree

Jim Jagielski [Thu, 4 Feb 2016 19:23:24 +0000 (19:23 +0000)]

Put in a placeholder

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

commit | commitdiff | tree

Jim Jagielski [Thu, 4 Feb 2016 19:21:58 +0000 (19:21 +0000)]

Not really needed to backport

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

commit | commitdiff | tree

Ruediger Pluem [Wed, 3 Feb 2016 19:56:38 +0000 (19:56 +0000)]

* Add a proposal

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

commit | commitdiff | tree

Ruediger Pluem [Wed, 3 Feb 2016 19:45:47 +0000 (19:45 +0000)]

* Add a proposal

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

commit | commitdiff | tree

Eric Covener [Tue, 2 Feb 2016 17:00:26 +0000 (17:00 +0000)]

merged patch

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

commit | commitdiff | tree

Rich Bowen [Tue, 2 Feb 2016 11:11:33 +0000 (11:11 +0000)]

Resolves comment about how regex matches, at
http://httpd.apache.org/docs/current/mod/mod_rewrite.html#comments_thread

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

commit | commitdiff | tree

Rich Bowen [Tue, 2 Feb 2016 10:53:37 +0000 (10:53 +0000)]

Fix weird indentation

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

commit | commitdiff | tree

Rich Bowen [Tue, 2 Feb 2016 09:51:49 +0000 (09:51 +0000)]

Rebuild All The Things.

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

commit | commitdiff | tree

Rich Bowen [Tue, 2 Feb 2016 09:50:10 +0000 (09:50 +0000)]

mod_rewrite doc enhancements from trunk.

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

commit | commitdiff | tree

Luca Toscano [Mon, 1 Feb 2016 22:33:57 +0000 (22:33 +0000)]

Backporting documentation changes from trunk related to mod_cgi/cgid and mod_deflate

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

commit | commitdiff | tree

Lucien Gentis [Sat, 30 Jan 2016 16:50:05 +0000 (16:50 +0000)]

Rebuild.

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

commit | commitdiff | tree

Lucien Gentis [Sat, 30 Jan 2016 16:49:19 +0000 (16:49 +0000)]

XML updates.

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 29 Jan 2016 22:01:02 +0000 (22:01 +0000)]

xforms

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 29 Jan 2016 22:00:16 +0000 (22:00 +0000)]

Fix examples

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 29 Jan 2016 21:51:15 +0000 (21:51 +0000)]

xforms

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 29 Jan 2016 21:49:37 +0000 (21:49 +0000)]

Take into account an old comment from Thomas.
Add an example using regex

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 29 Jan 2016 20:18:09 +0000 (20:18 +0000)]

xforms

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 29 Jan 2016 20:17:45 +0000 (20:17 +0000)]

Small visual tweak

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 29 Jan 2016 19:53:47 +0000 (19:53 +0000)]

xforms

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 29 Jan 2016 19:52:15 +0000 (19:52 +0000)]

Fix doc as spotted by Shane Roberts in online doc
+ synch with trunk

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

commit | commitdiff | tree

Rainer Jung [Fri, 29 Jan 2016 15:48:04 +0000 (15:48 +0000)]

Fix proposal, restart vote.
Thanks Stefan.

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

commit | commitdiff | tree

Stefan Eissing [Fri, 29 Jan 2016 13:44:53 +0000 (13:44 +0000)]

adding missing change for APLOGNO

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

commit | commitdiff | tree

Stefan Eissing [Fri, 29 Jan 2016 13:41:42 +0000 (13:41 +0000)]

proposing backport of pre_close_connection hook

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

commit | commitdiff | tree

Stefan Eissing [Fri, 29 Jan 2016 10:05:47 +0000 (10:05 +0000)]

regresssions as test parse debug log

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

commit | commitdiff | tree

Stefan Eissing [Fri, 29 Jan 2016 09:57:58 +0000 (09:57 +0000)]

disable any openssl use until configure fix is backported, linking gets messed up when multiple places have openssl

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

commit | commitdiff | tree

Stefan Eissing [Fri, 29 Jan 2016 09:22:55 +0000 (09:22 +0000)]

vote

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

commit | commitdiff | tree

Stefan Eissing [Fri, 29 Jan 2016 09:21:19 +0000 (09:21 +0000)]

vote

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

commit | commitdiff | tree

Mike Rumph [Thu, 28 Jan 2016 20:42:24 +0000 (20:42 +0000)]

Backport proposal

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

commit | commitdiff | tree

Stefan Eissing [Thu, 28 Jan 2016 16:44:36 +0000 (16:44 +0000)]

proposing APACHE_CHECK_OPENSSL twice invocation fix for backport

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

commit | commitdiff | tree

Stefan Eissing [Thu, 28 Jan 2016 16:29:47 +0000 (16:29 +0000)]

backport of r1718514,1721313

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

commit | commitdiff | tree

Stefan Eissing [Thu, 28 Jan 2016 16:21:27 +0000 (16:21 +0000)]

missed author

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

commit | commitdiff | tree

Stefan Eissing [Thu, 28 Jan 2016 16:19:10 +0000 (16:19 +0000)]

vote

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

commit | commitdiff | tree

Stefan Eissing [Thu, 28 Jan 2016 16:13:54 +0000 (16:13 +0000)]

backport of r1723122,1723143

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

commit | commitdiff | tree

Stefan Eissing [Thu, 28 Jan 2016 16:12:23 +0000 (16:12 +0000)]

vote

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

commit | commitdiff | tree

Jim Jagielski [Thu, 28 Jan 2016 14:58:06 +0000 (14:58 +0000)]

Some backport votes

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

commit | commitdiff | tree

Jeff Trawick [Thu, 28 Jan 2016 12:12:21 +0000 (12:12 +0000)]

make docs

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

commit | commitdiff | tree

Jeff Trawick [Thu, 28 Jan 2016 12:10:40 +0000 (12:10 +0000)]

Merge r1727317 from trunk:

Update Perl FCGI examples to work with current version of module

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

commit | commitdiff | tree

Christophe Jaillet [Wed, 27 Jan 2016 20:43:19 +0000 (20:43 +0000)]

Proposal

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

commit | commitdiff | tree

Christophe Jaillet [Wed, 27 Jan 2016 06:28:33 +0000 (06:28 +0000)]

xforms

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

commit | commitdiff | tree

Christophe Jaillet [Wed, 27 Jan 2016 06:25:33 +0000 (06:25 +0000)]

Fix typo spotted by noodl in online doc + synch with trunk

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

commit | commitdiff | tree

Yann Ylavic [Tue, 26 Jan 2016 14:34:57 +0000 (14:34 +0000)]

mod_http2: merge r1726798 from trunk.
Fix warnings:
modules/http2/h2_util.c|174| warning: suggest parentheses around ‘+’ in operand of ‘&’
modules/http2/h2_util.c|176| warning: suggest parentheses around ‘+’ in operand of ‘&’

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

commit | commitdiff | tree

Lucien Gentis [Sat, 23 Jan 2016 14:40:11 +0000 (14:40 +0000)]

Rebuild.

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

commit | commitdiff | tree

Lucien Gentis [Sat, 23 Jan 2016 14:39:09 +0000 (14:39 +0000)]

XML updates.

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

commit | commitdiff | tree

Eric Covener [Fri, 22 Jan 2016 15:32:09 +0000 (15:32 +0000)]

per ML feedback, make setHandler expression interp
implicit.

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

commit | commitdiff | tree

Rainer Jung [Thu, 21 Jan 2016 20:17:14 +0000 (20:17 +0000)]

Fix typo in comment (s/patterm/pattern/).

Backport of r1726086 from trunk.

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

commit | commitdiff | tree

Christophe Jaillet [Thu, 21 Jan 2016 18:45:54 +0000 (18:45 +0000)]

Fix typo in comment

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

commit | commitdiff | tree

Jim Jagielski [Thu, 21 Jan 2016 16:52:58 +0000 (16:52 +0000)]

votes

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

commit | commitdiff | tree

Jim Jagielski [Thu, 21 Jan 2016 16:52:20 +0000 (16:52 +0000)]

Merge r1724857 from trunk:

  *) mod_proxy_fcgi: Suppress HTTP error 503 and message 01075,
     "Error dispatching request", when the cause appears to be
     the client closing the connection.

PR58118.

Submitted By: Tobias Adolph <adolph lrz.de>
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@1726019 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Thu, 21 Jan 2016 16:51:13 +0000 (16:51 +0000)]

Merge r1724847, r1725516 from trunk:

flush errors are TRACE1 in the core output filter now.

Remove APLOGNO after moving log message to
TRACE1 in r1724847.

Submitted by: covener, rjung
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Thu, 21 Jan 2016 16:49:48 +0000 (16:49 +0000)]

Merge r1724656 from trunk:

  *) mod_rewrite: Avoid looping on relative substitutions that
     result in the same filename we started with. PR 58854.
     [Eric Covener]

Previously, the comparison of old and new filename happened before
some prefixes might be added.

Submitted by: covener
Reviewed/backported by: jim

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

commit | commitdiff | tree

Stefan Eissing [Thu, 21 Jan 2016 13:17:42 +0000 (13:17 +0000)]

propsing ssl timeout fix

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

commit | commitdiff | tree

Jim Jagielski [Wed, 20 Jan 2016 18:04:33 +0000 (18:04 +0000)]

prep

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

commit | commitdiff | tree

Rainer Jung [Tue, 19 Jan 2016 15:58:23 +0000 (15:58 +0000)]

Propose.

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

commit | commitdiff | tree

Rainer Jung [Tue, 19 Jan 2016 13:42:03 +0000 (13:42 +0000)]

Promote.

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

commit | commitdiff | tree

Rainer Jung [Tue, 19 Jan 2016 13:41:15 +0000 (13:41 +0000)]

Vote

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

commit | commitdiff | tree

Jim Jagielski [Tue, 19 Jan 2016 12:58:52 +0000 (12:58 +0000)]

Merge r1723567 from trunk:

Add common extension "m4a" for MPEG 4 Audio to
mime.types.

As a reference see Wikipedia:
https://en.wikipedia.org/wiki/MPEG-4_Part_14#.MP4_versus_.M4A

PR: 57895

Submitted by: rjung
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Tue, 19 Jan 2016 12:57:16 +0000 (12:57 +0000)]

Merge r1719257 from trunk:

Do not use the magic string "directory". Use the corresponding global variable as in all other places of the module.
Submitted by: jailletc36
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Tue, 19 Jan 2016 12:56:57 +0000 (12:56 +0000)]

Merge r1719252, r1719254, r1719255, r1720996 from trunk:

Use 'ap_array_str_contains' to simplify code.

Use 'ap_array_str_contains' to simplify code.

Use 'ap_array_str_contains' to simplify code.

Use 'ap_array_str_contains' to simplify code.
Submitted by: jailletc36
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Tue, 19 Jan 2016 12:56:11 +0000 (12:56 +0000)]

Merge r1719018, r1719189, r1719190 from trunk:

Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order to save a few cycles.

Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order to save a few cycles.

Fix some minor style issue.
Submitted by: jailletc36
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Tue, 19 Jan 2016 12:55:38 +0000 (12:55 +0000)]

Merge r1719016 from trunk:

There is no need to duplicate some memory here, the 'path' given to ap_parse_htaccess is never modified.
Submitted by: jailletc36
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Tue, 19 Jan 2016 12:55:14 +0000 (12:55 +0000)]

promote

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

commit | commitdiff | tree

Jim Jagielski [Tue, 19 Jan 2016 12:54:29 +0000 (12:54 +0000)]

votes

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

commit | commitdiff | tree

Stefan Eissing [Tue, 19 Jan 2016 12:51:21 +0000 (12:51 +0000)]

updated changes after mod_http2 backport from trunk

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

commit | commitdiff | tree

Stefan Eissing [Mon, 18 Jan 2016 19:33:27 +0000 (19:33 +0000)]

no check for openssl until fix from trunk is backported

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

commit | commitdiff | tree

Stefan Eissing [Mon, 18 Jan 2016 16:22:57 +0000 (16:22 +0000)]

mod_http2 v1.2.2 from trunk

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

commit | commitdiff | tree

Eric Covener [Sun, 17 Jan 2016 23:45:07 +0000 (23:45 +0000)]

sethandler expr=backport

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

commit | commitdiff | tree

Eric Covener [Sun, 17 Jan 2016 17:58:48 +0000 (17:58 +0000)]

Merge r1725106 from trunk:

clarify a butchered sentence about missing ServerName, which
is a regular early step in "my directive didn't do anything".

This describes ap_get_local_host()

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

commit | commitdiff | tree

Eric Covener [Sun, 17 Jan 2016 16:47:46 +0000 (16:47 +0000)]

Merge r1725102 from trunk:

update syntax to allow for non-FQDN domains or IP addresses in ServerName.

Since UseCanonicalName defaults to OFF, name-based vhosts isn't really an
"additional" purpose of a ServerName. Also update the syntax to not insist
on an FQDN -- generally the ServerName needs to be something the client
and server can both resolve, but it's not required to be an FQDN or even
a domain name.

Leave the example as www.example.com

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

commit | commitdiff | tree

Eric Covener [Fri, 15 Jan 2016 18:46:38 +0000 (18:46 +0000)]

another pass of votes

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

commit | commitdiff | tree

Eric Covener [Fri, 15 Jan 2016 16:53:31 +0000 (16:53 +0000)]

two quick proposals for flush error severity

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

commit | commitdiff | tree

Eric Covener [Thu, 14 Jan 2016 17:09:48 +0000 (17:09 +0000)]

add rewrite fix, vote

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

commit | commitdiff | tree

Rich Bowen [Tue, 12 Jan 2016 16:31:35 +0000 (16:31 +0000)]

rebuild

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

commit | commitdiff | tree

Rich Bowen [Tue, 12 Jan 2016 16:15:51 +0000 (16:15 +0000)]

Distinguish between 'deflate' and 'gzip' encoding.

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

commit | commitdiff | tree

Rich Bowen [Tue, 12 Jan 2016 16:11:24 +0000 (16:11 +0000)]

rebuild

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

commit | commitdiff | tree

Rich Bowen [Tue, 12 Jan 2016 16:07:51 +0000 (16:07 +0000)]

Applying Luca's patch from bz 58744

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

commit | commitdiff | tree

Lucien Gentis [Mon, 11 Jan 2016 13:50:39 +0000 (13:50 +0000)]

XML update.

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

commit | commitdiff | tree

Christophe Jaillet [Mon, 11 Jan 2016 06:34:28 +0000 (06:34 +0000)]

re-build

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

commit | commitdiff | tree

Christophe Jaillet [Mon, 11 Jan 2016 06:32:09 +0000 (06:32 +0000)]

Fix doc as spotted by A. Gh. in online doc

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

commit | commitdiff | tree

Lucien Gentis [Sat, 9 Jan 2016 16:04:49 +0000 (16:04 +0000)]

Rebuild.

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

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom